lightcordwarez
/
BetterDiscordApp-v2
mirror of https://github.com/JsSucks/BetterDiscordApp
1
0
Fork 0
Code Issues 3 Releases Wiki Activity

Remove IterableWeakCollections and deactivate keybind settings when possible

This commit is contained in:
Samuel Elliott 2018-08-01 21:08:45 +01:00
parent 8826a7b984
commit 16bb32b86c
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
4 changed files with 13 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/index.js
View File

@ -11,7 +11,7 @@
import { DOM, BdUI, BdMenu, Modals, Reflection, Toasts } from 'ui';
import BdCss from './styles/index.scss';
import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, WebpackModules, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi } from 'modules';
import { ClientLogger as Logger, ClientIPC, Utils, IterableWeakCollections, IterableWeakMap, IterableWeakSet } from 'common';
import { ClientLogger as Logger, ClientIPC, Utils } from 'common';
import { EmoteModule } from 'builtin';
import electron from 'electron';
import path from 'path';
@ -37,7 +37,6 @@ class BetterDiscord {
EmoteModule,
Logger, ClientIPC, Utils,
IterableWeakCollections, IterableWeakMap, IterableWeakSet,
plugins: PluginManager.localContent,
themes: ThemeManager.localContent,

15
client/src/structs/settings/types/keybind.js
View File

@ -8,12 +8,11 @@
* LICENSE file in the root directory of this source tree.
*/
import { IterableWeakSet } from 'common';
import Combokeys from 'combokeys';
import CombokeysGlobalBind from 'combokeys/plugins/global-bind';
import Setting from './basesetting';
const instances = new IterableWeakSet();
const instances = new Set();
let keybindsPaused = false;
export default class KeybindSetting extends Setting {
@ -21,7 +20,17 @@ export default class KeybindSetting extends Setting {
constructor(args, ...merge) {
super(args, ...merge);
instances.add(this);
// When adding a keybind-activated listener, add the keybind setting to the set of active keybind settings
// This creates a reference to the keybind setting, which may cause memory leaks
this.on('newListener', (event, listener) => {
if (event === 'keybind-activated') instances.add(this);
});
// When there are no more keybind-activated listeners, remove the keybind setting from the set of active keybind settings
// Always remember to unbind keybind-activated listeners!
this.on('removeListener', (event, listener) => {
if (!this.listenerCount('keybind-activated')) instances.remove(this);
});
this.__keybind_activated = this.__keybind_activated.bind(this);

1
common/modules/common.js
View File

@ -3,4 +3,3 @@ export { default as Filters } from './filters';
export { default as Logger, ClientLogger } from './logger';
export { default as ClientIPC } from './bdipc';
export { default as AsyncEventEmitter } from './async-eventemitter';
export * from './iterable-weak-collections';

171
common/modules/iterable-weak-collections.js
View File

@ -1,171 +0,0 @@
/**
* BetterDiscord Iterable Weak Collections
* Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
* All rights reserved.
* https://betterdiscord.net
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import process from 'process';
export class IterableWeakMap extends WeakMap {
[Symbol.iterator]() {
return this.entries();
}
entries() {
return IterableWeakCollections.getWeakMapEntries(this).values();
}
keys() {
return IterableWeakCollections.getWeakMapEntries(this).map(e => e[0]).values();
}
values() {
return IterableWeakCollections.getWeakMapEntries(this).map(e => e[1]).values();
}
forEach(callback, thisArg) {
for (let [key, value] of this) {
callback.call(thisArg, value, key, this);
}
}
clear() {
for (let key of this.keys()) {
this.delete(key);
}
}
get size() {
return IterableWeakCollections.getWeakMapEntries(this).length;
}
get [Symbol.toStringTag]() {
return 'IterableWeakMap';
}
static get [Symbol.species]() {
return IterableWeakMap;
}
}
export class IterableWeakSet extends WeakSet {
[Symbol.iterator]() {
return this.values();
}
values() {
return IterableWeakCollections.getWeakSetValues(this).values();
}
forEach(callback, thisArg) {
for (let value of this) {
callback.call(thisArg, value, value, this);
}
}
clear() {
for (let value of this) {
this.delete(value);
}
}
get size() {
return IterableWeakCollections.getWeakSetValues(this).length;
}
static get [Symbol.species]() {
return IterableWeakSet;
}
}
export class IterableWeakCollections {
/**
* Returns a WeakMap's entries.
* @param {WeakMap} weakmap
* @return {Array}
*/
static getWeakMapEntries(wm) {
const keysAndValues = this._getWeakMapEntries(wm);
const entries = [];
while (keysAndValues.length) {
const key = keysAndValues.shift();
const value = keysAndValues.shift();
entries.push([key, value]);
}
return entries;
}
static mapFromWeakMap(wm) {
return new Map(this.getWeakMapEntries(wm));
}
/**
* Returns a WeakSet's values.
* @param {WeakSet} weakset
* @return {Array}
*/
static getWeakSetValues(ws) {
return this._getWeakSetValues(ws);
}
static setFromWeakSet(ws) {
return new Set(this.getWeakSetValues(ws));
}
static _init() {
this._natives_syntax = process.execArgv.some(s => /^--allow[-_]natives[-_]syntax$/.test(s));
// Use eval otherwise webpack will throw a syntax error
// eslint-disable-next-line no-eval
this._getWeakMapEntries = eval(`this._callWithNativesSyntax.bind(this, function (wm, max) {
// Retrieve all WeakMap instance key / value pairs up to \`max\`. \`max\` limits the
// number of key / value pairs returned. Make sure it is a positive number,
// otherwise V8 aborts. Passing through \`0\` returns all elements.
if (!(wm instanceof WeakMap)) throw new Error('weakmap must be an instance of WeakMap');
return %GetWeakMapEntries(wm, typeof max === 'number' && max > 0 ? max : 0);
}, this)`);
// eslint-disable-next-line no-eval
this._getWeakSetValues = eval(`this._callWithNativesSyntax.bind(this, function (ws, max) {
// Retrieve all WeakSet instance values up to \`max\`. \`max\` limits the
// number of values returned. Make sure it is a positive number,
// otherwise V8 aborts. Passing through \`0\` returns all elements.
if (!(ws instanceof WeakSet)) throw new Error('weakset must be an instance of WeakSet');
return %GetWeakSetValues(ws, typeof max === 'number' && max > 0 ? max : 0);
}, this)`);
}
static _callWithNativesSyntax(f, bind, ...args) {
const v8 = process.binding('v8');
// Enable natives syntax
v8.setFlagsFromString('--allow_natives_syntax');
try {
const r = f.apply(bind, args);
// Disable --allow_natives_syntax again unless it was explicitly
// specified on the command line
if (!this._natives_syntax) v8.setFlagsFromString('--noallow_natives_syntax');
return r;
} catch (err) {
// Disable --allow_natives_syntax again unless it was explicitly
// specified on the command line
if (!this._natives_syntax) v8.setFlagsFromString('--noallow_natives_syntax');
throw err;
}
}
}
IterableWeakCollections._callWithNativesSyntax(IterableWeakCollections._init, IterableWeakCollections);