|
|
|
'use strict';
|
|
|
|
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
// eslint-disable-next-line no-redeclare
|
|
|
|
const io = require('socket.io-client');
|
|
|
|
// eslint-disable-next-line no-redeclare
|
|
|
|
const $ = require('jquery');
|
|
|
|
|
|
|
|
app = window.app || {};
|
|
|
|
|
|
|
|
(function () {
|
|
|
|
let reconnecting = false;
|
|
|
|
|
|
|
|
const ioParams = {
|
|
|
|
reconnectionAttempts: config.maxReconnectionAttempts,
|
|
|
|
reconnectionDelay: config.reconnectionDelay,
|
|
|
|
transports: config.socketioTransports,
|
|
|
|
path: config.relative_path + '/socket.io',
|
|
|
|
};
|
|
|
|
|
Webpack5 (#10311)
* feat: webpack 5 part 1
* fix: gruntfile fixes
* fix: fix taskbar warning
add app.importScript
copy public/src/modules to build folder
* refactor: remove commented old code
* feat: reenable admin
* fix: acp settings pages, fix sortable on manage categories
embedded require in html not allowed
* fix: bundle serialize/deserizeli so plugins dont break
* test: fixe util tests
* test: fix require path
* test: more test fixes
* test: require correct utils module
* test: require correct utils
* test: log stack
* test: fix db require blowing up tests
* test: move and disable bundle test
* refactor: add aliases
* test: disable testing route
* fix: move webpack modules necessary for build, into `dependencies`
* test: fix one more test
remove 500-embed.tpl
* fix: restore use of assets/nodebb.min.js, at least for now
* fix: remove unnecessary line break
* fix: point to proper ACP bundle
* test: maybe fix build test
* test: composer
* refactor: dont need dist
* refactor: more cleanup
use everything from build/public folder
* get rid of conditional import in app.js
* fix: ace
* refactor: cropper alias
* test: lint and test fixes
* lint: fix
* refactor: rename function to app.require
* refactor: go back to using app.require
* chore: use github branch
* chore: use webpack branch
* feat: webpack webinstaller
* feat: add chunkFile name with contenthash
* refactor: move hooks to top
* refactor: get rid of template500Function
* fix(deps): use webpack5 branch of 2factor plugin
* chore: tagging v2.0.0-beta.0 pre-release version :boom: :shipit: :tada: :rocket:
* refactor: disable cache on templates
loadTemplate is called once by benchpress and the result is cache internally
* refactor: add server side helpers.js
* feat: deprecate /plugins shorthand route, closes #10343
* refactor: use build/public for webpack
* test: fix filename
* fix: more specific selector
* lint: ignore
* refactor: fix comments
* test: add debug for random failing test
* refactor: cleanup
remove test page, remove dupe functions in utils.common
* lint: use relative path for now
* chore: bump prerelease version
* feat: add translateKeys
* fix: optional params
* fix: get rid of extra timeago files
* refactor: cleanup, require timeago locale earlier
remove translator.prepareDOM, it is in header.tpl html tag
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels (#10378)
* refactor: privileges system to use a Map in the backend instead of separate objects for keys and labels
- Existing hooks are preserved (to be deprecated at a later date, possibly)
- New init hooks are called on NodeBB start, and provide a one-stop shop to add new privileges, instead of having to add to four different hooks
* docs: fix typo in comment
* test: spec changes
* feat: allow app.require('bootbox'/'benchpressjs')
* refactor: require server side utils
* test: jquery ready
* change istaller to use build/public
* test: use document.addEventListener
* refactor: closes #10301
* refactor: generateTopicClass
* fix: column counts for other privileges
* fix: #10443, regression where sorted-list items did not render into the DOM in the predicted order [breaking]
* fix: typo in hook name
* refactor: introduce a generic autocomplete.init() method that can be called to add nodebb-style autocompletion but using different data sources (e.g. not user/groups/tags)
* fix: crash if `delay` not passed in (as it cannot be destructured)
* refactor: replace substr
* feat: set --panel-offset style in html element based on stored value in localStorage
* refactor: addDropupHandler() logic to be less naive
- Take into account height of the menu
- Don't apply dropUp logic if there's nothing in the dropdown
- Remove 'hidden' class (added by default in Persona for post tools) when menu items are added
closes #10423
* refactor: simplify utils.params [breaking]
Retrospective analysis of the usage of this method suggests that the options passed in are superfluous, and that only `url` is required. Using a browser built-in makes more sense to accomplish what this method sets out to do.
* feat: add support for returning full URLSearchParams for utils.params
* fix: utils.params() fallback handling
* fix: default empty obj for params()
* fix: remove \'loggedin\' and \'register\' qs parameters once they have been used, delay invocation of messages until ajaxify.end
* fix: utils.params() not allowing relative paths to be passed in
* refactor(DRY): new assertPasswordValidity utils method
* fix: incorrect error message returned on insufficient privilege on flag edit
* fix: read/update/delete access to flags API should be limited for moderators to only post flags in categories they moderate
- added failing tests and patched up middleware.assert.flags to fix
* refactor: flag api v3 tests to create new post and flags on every round
* fix: missing error:no-flag language key
* refactor: flags.canView to check flag existence, simplify middleware.assert.flag
* feat: flag deletion API endpoint, #10426
* feat: UI for flag deletion, closes #10426
* chore: update plugin versions
* chore: up emoji
* chore: update markdown
* chore: up emoji-android
* fix: regression caused by utils.params() refactor, supports arrays and pipes all values through utils.toType, adjusts tests to type check
Co-authored-by: Julian Lam <[email protected]>
3 years ago
|
|
|
window.socket = io(config.websocketAddress, ioParams);
|
|
|
|
|
|
|
|
const oEmit = socket.emit;
|
|
|
|
socket.emit = function (event, data, callback) {
|
|
|
|
if (typeof data === 'function') {
|
|
|
|
callback = data;
|
|
|
|
data = null;
|
|
|
|
}
|
|
|
|
if (typeof callback === 'function') {
|
|
|
|
oEmit.apply(socket, [event, data, callback]);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
return new Promise(function (resolve, reject) {
|
|
|
|
oEmit.apply(socket, [event, data, function (err, result) {
|
|
|
|
if (err) reject(err);
|
|
|
|
else resolve(result);
|
|
|
|
}]);
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
|
|
|
let hooks;
|
|
|
|
require(['hooks'], function (_hooks) {
|
|
|
|
hooks = _hooks;
|
|
|
|
if (parseInt(app.user.uid, 10) >= 0) {
|
|
|
|
addHandlers();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
window.app.reconnect = () => {
|
|
|
|
if (socket.connected) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const reconnectEl = $('#reconnect');
|
|
|
|
$('#reconnect-alert')
|
|
|
|
.removeClass('alert-danger pointer')
|
|
|
|
.addClass('alert-warning')
|
|
|
|
.find('p')
|
|
|
|
.translateText(`[[global:reconnecting-message, ${config.siteTitle}]]`);
|
|
|
|
|
|
|
|
reconnectEl.html('<i class="fa fa-spinner fa-spin"></i>');
|
|
|
|
socket.connect();
|
|
|
|
};
|
|
|
|
|
|
|
|
function addHandlers() {
|
|
|
|
socket.on('connect', onConnect);
|
|
|
|
|
|
|
|
socket.on('disconnect', onDisconnect);
|
|
|
|
|
|
|
|
socket.io.on('reconnect_failed', function () {
|
|
|
|
const reconnectEl = $('#reconnect');
|
|
|
|
reconnectEl.html('<i class="fa fa-plug text-danger"></i>');
|
|
|
|
|
|
|
|
$('#reconnect-alert')
|
|
|
|
.removeClass('alert-warning')
|
|
|
|
.addClass('alert-danger pointer')
|
|
|
|
.find('p')
|
|
|
|
.translateText('[[error:socket-reconnect-failed]]')
|
|
|
|
.one('click', app.reconnect);
|
|
|
|
|
|
|
|
$(window).one('focus', app.reconnect);
|
|
|
|
});
|
|
|
|
|
|
|
|
socket.on('checkSession', function (uid) {
|
|
|
|
if (parseInt(uid, 10) !== parseInt(app.user.uid, 10)) {
|
|
|
|
handleSessionMismatch();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
socket.on('event:invalid_session', () => {
|
|
|
|
handleInvalidSession();
|
|
|
|
});
|
|
|
|
|
|
|
|
socket.on('setHostname', function (hostname) {
|
|
|
|
app.upstreamHost = hostname;
|
|
|
|
});
|
|
|
|
|
|
|
|
socket.on('event:banned', onEventBanned);
|
|
|
|
socket.on('event:unbanned', onEventUnbanned);
|
|
|
|
socket.on('event:logout', function () {
|
|
|
|
require(['logout'], function (logout) {
|
|
|
|
logout();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
socket.on('event:alert', function (params) {
|
|
|
|
require(['alerts'], function (alerts) {
|
|
|
|
alerts.alert(params);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
socket.on('event:deprecated_call', function (data) {
|
|
|
|
console.warn('[socket.io] ', data.eventName, 'is now deprecated in favour of', data.replacement);
|
|
|
|
});
|
|
|
|
|
|
|
|
socket.removeAllListeners('event:nodebb.ready');
|
|
|
|
socket.on('event:nodebb.ready', function (data) {
|
|
|
|
if ((data.hostname === app.upstreamHost) && (!app.cacheBuster || app.cacheBuster !== data['cache-buster'])) {
|
|
|
|
app.cacheBuster = data['cache-buster'];
|
|
|
|
require(['alerts'], function (alerts) {
|
|
|
|
alerts.alert({
|
|
|
|
alert_id: 'forum_updated',
|
|
|
|
title: '[[global:updated.title]]',
|
|
|
|
message: '[[global:updated.message]]',
|
|
|
|
clickfn: function () {
|
|
|
|
window.location.reload();
|
|
|
|
},
|
|
|
|
type: 'warning',
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
socket.on('event:livereload', function () {
|
|
|
|
if (app.user.isAdmin && !ajaxify.currentPage.match(/admin/)) {
|
|
|
|
window.location.reload();
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function handleInvalidSession() {
|
|
|
|
socket.disconnect();
|
|
|
|
require(['messages', 'logout'], function (messages, logout) {
|
|
|
|
logout(false);
|
|
|
|
messages.showInvalidSession();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function handleSessionMismatch() {
|
|
|
|
if (app.flags._login || app.flags._logout) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
socket.disconnect();
|
|
|
|
require(['messages'], function (messages) {
|
|
|
|
messages.showSessionMismatch();
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function onConnect() {
|
|
|
|
if (!reconnecting) {
|
|
|
|
hooks.fire('action:connected');
|
|
|
|
}
|
|
|
|
|
|
|
|
if (reconnecting) {
|
|
|
|
const reconnectEl = $('#reconnect');
|
|
|
|
const reconnectAlert = $('#reconnect-alert');
|
|
|
|
|
|
|
|
reconnectEl.tooltip('destroy');
|
|
|
|
reconnectEl.html('<i class="fa fa-check text-success"></i>');
|
|
|
|
reconnectAlert.addClass('hide');
|
|
|
|
reconnecting = false;
|
|
|
|
|
|
|
|
reJoinCurrentRoom();
|
|
|
|
|
|
|
|
socket.emit('meta.reconnected');
|
|
|
|
|
|
|
|
hooks.fire('action:reconnected');
|
|
|
|
|
|
|
|
setTimeout(function () {
|
|
|
|
reconnectEl.removeClass('active').addClass('hide');
|
|
|
|
}, 3000);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function reJoinCurrentRoom() {
|
|
|
|
if (app.currentRoom) {
|
|
|
|
const current = app.currentRoom;
|
|
|
|
app.currentRoom = '';
|
|
|
|
app.enterRoom(current);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function onReconnecting() {
|
|
|
|
reconnecting = true;
|
|
|
|
const reconnectEl = $('#reconnect');
|
|
|
|
const reconnectAlert = $('#reconnect-alert');
|
|
|
|
|
|
|
|
if (!reconnectEl.hasClass('active')) {
|
|
|
|
reconnectEl.html('<i class="fa fa-spinner fa-spin"></i>');
|
|
|
|
reconnectAlert.removeClass('hide');
|
|
|
|
}
|
|
|
|
|
|
|
|
reconnectEl.addClass('active').removeClass('hide').tooltip({
|
|
|
|
placement: 'bottom',
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function onDisconnect() {
|
|
|
|
setTimeout(function () {
|
|
|
|
if (socket.disconnected) {
|
|
|
|
onReconnecting();
|
|
|
|
}
|
|
|
|
}, 2000);
|
|
|
|
|
|
|
|
hooks.fire('action:disconnected');
|
|
|
|
}
|
|
|
|
|
|
|
|
function onEventBanned(data) {
|
|
|
|
require(['bootbox', 'translator'], function (bootbox, translator) {
|
|
|
|
const message = data.until ?
|
|
|
|
translator.compile('error:user-banned-reason-until', (new Date(data.until).toLocaleString()), data.reason) :
|
|
|
|
'[[error:user-banned-reason, ' + data.reason + ']]';
|
|
|
|
translator.translate(message, function (message) {
|
|
|
|
bootbox.alert({
|
|
|
|
title: '[[error:user-banned]]',
|
|
|
|
message: message,
|
|
|
|
closeButton: false,
|
|
|
|
callback: function () {
|
|
|
|
window.location.href = config.relative_path + '/';
|
|
|
|
},
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
function onEventUnbanned() {
|
|
|
|
require(['bootbox'], function (bootbox) {
|
|
|
|
bootbox.alert({
|
|
|
|
title: '[[global:alert.unbanned]]',
|
|
|
|
message: '[[global:alert.unbanned.message]]',
|
|
|
|
closeButton: false,
|
|
|
|
callback: function () {
|
|
|
|
window.location.href = config.relative_path + '/';
|
|
|
|
},
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if (
|
|
|
|
config.socketioOrigins &&
|
|
|
|
config.socketioOrigins !== '*:*' &&
|
|
|
|
config.socketioOrigins.indexOf(location.hostname) === -1
|
|
|
|
) {
|
|
|
|
console.error(
|
|
|
|
'You are accessing the forum from an unknown origin. This will likely result in websockets failing to connect. \n' +
|
|
|
|
'To fix this, set the `"url"` value in `config.json` to the URL at which you access the site. \n' +
|
|
|
|
'For more information, see this FAQ topic: https://community.nodebb.org/topic/13388'
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}());
|