diff --git a/appasar/stable/app_bootstrap/Constants.js b/appasar/stable/app_bootstrap/Constants.js deleted file mode 100644 index 880fa94..0000000 --- a/appasar/stable/app_bootstrap/Constants.js +++ /dev/null @@ -1,28 +0,0 @@ -'use strict'; - -// bootstrap constants -// after startup, these constants will be merged into core module constants -// since they are used in both locations (see app/Constants.js) - -const { releaseChannel } = require('./buildInfo'); -const { getSettings } = require('./appSettings'); - -const settings = getSettings(); - -function capitalizeFirstLetter(s) { - return s.charAt(0).toUpperCase() + s.slice(1); -} - -const APP_NAME = 'Discord' + (releaseChannel === 'stable' ? '' : capitalizeFirstLetter(releaseChannel)); -const APP_ID_BASE = 'com.squirrel'; -const APP_ID = `${APP_ID_BASE}.${APP_NAME}.${APP_NAME}`; - -const API_ENDPOINT = settings.get('API_ENDPOINT') || 'https://discordapp.com/api'; -const UPDATE_ENDPOINT = settings.get('UPDATE_ENDPOINT') || API_ENDPOINT; - -module.exports = { - APP_NAME, - APP_ID, - API_ENDPOINT, - UPDATE_ENDPOINT -}; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/GPUSettings.js b/appasar/stable/app_bootstrap/GPUSettings.js deleted file mode 100644 index f208526..0000000 --- a/appasar/stable/app_bootstrap/GPUSettings.js +++ /dev/null @@ -1,17 +0,0 @@ -"use strict"; - -// this file is here for two reasons: -// 1. web requires ./GPUSettings file from electron app (bad!), and requires are -// relative to process.main (bootstrap's index.js) -// 2. GPUSettings has been refactored into GPUSettings, and because we want to -// be able to update GPUSettings OTA, we will have the core module provide -// us with the GPUSettings -// so tl;dr this is core module's GPUSettings, providing compat for web - -exports.replace = function (GPUSettings) { - // replacing module.exports directly would have no effect, since requires are cached - // so we mutate the existing object - for (const name of Object.keys(GPUSettings)) { - exports[name] = GPUSettings[name]; - } -}; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/appSettings.js b/appasar/stable/app_bootstrap/appSettings.js deleted file mode 100644 index 2d880a8..0000000 --- a/appasar/stable/app_bootstrap/appSettings.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.init = init; -exports.getSettings = getSettings; - -var _Settings = require('../common/Settings'); - -var _Settings2 = _interopRequireDefault(_Settings); - -var _paths = require('../common/paths'); - -var paths = _interopRequireWildcard(_paths); - -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -let settings; - -function init() { - settings = new _Settings2.default(paths.getUserData()); -} - -function getSettings() { - return settings; -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/appUpdater.js b/appasar/stable/app_bootstrap/appUpdater.js deleted file mode 100644 index ca7af7f..0000000 --- a/appasar/stable/app_bootstrap/appUpdater.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.update = update; -exports.focusSplash = focusSplash; - -var _moduleUpdater = require('../common/moduleUpdater'); - -var moduleUpdater = _interopRequireWildcard(_moduleUpdater); - -var _splashScreen = require('./splashScreen'); - -var splashScreen = _interopRequireWildcard(_splashScreen); - -var _appSettings = require('./appSettings'); - -var _Constants = require('./Constants'); - -var _buildInfo = require('./buildInfo'); - -var _buildInfo2 = _interopRequireDefault(_buildInfo); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } - -function update(startMinimized, doneCallback, showCallback) { - const settings = (0, _appSettings.getSettings)(); - moduleUpdater.init(_Constants.UPDATE_ENDPOINT, settings, _buildInfo2.default); - - splashScreen.initSplash(startMinimized); - splashScreen.events.once(splashScreen.APP_SHOULD_LAUNCH, doneCallback); - splashScreen.events.once(splashScreen.APP_SHOULD_SHOW, showCallback); -} - -function focusSplash() { - splashScreen.focusWindow(); -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/autoStart/darwin.js b/appasar/stable/app_bootstrap/autoStart/darwin.js deleted file mode 100644 index 954818c..0000000 --- a/appasar/stable/app_bootstrap/autoStart/darwin.js +++ /dev/null @@ -1,24 +0,0 @@ -"use strict"; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.install = install; -exports.update = update; -exports.isInstalled = isInstalled; -exports.uninstall = uninstall; -function install(callback) { - return callback(); -} - -function update(callback) { - return callback(); -} - -function isInstalled(callback) { - return callback(false); -} - -function uninstall(callback) { - return callback(); -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/autoStart/index.js b/appasar/stable/app_bootstrap/autoStart/index.js deleted file mode 100644 index 012f895..0000000 --- a/appasar/stable/app_bootstrap/autoStart/index.js +++ /dev/null @@ -1,3 +0,0 @@ -'use strict'; - -module.exports = require('./' + process.platform); \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/autoStart/linux.js b/appasar/stable/app_bootstrap/autoStart/linux.js deleted file mode 100644 index e1895f1..0000000 --- a/appasar/stable/app_bootstrap/autoStart/linux.js +++ /dev/null @@ -1,88 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.install = install; -exports.update = update; -exports.isInstalled = isInstalled; -exports.uninstall = uninstall; - -var _fs = require('fs'); - -var _fs2 = _interopRequireDefault(_fs); - -var _path = require('path'); - -var _path2 = _interopRequireDefault(_path); - -var _electron = require('electron'); - -var _buildInfo = require('../buildInfo'); - -var _buildInfo2 = _interopRequireDefault(_buildInfo); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -// TODO: We should use Constant's APP_NAME, but only once -// we set up backwards compat with this. -const appName = _path2.default.basename(process.execPath, '.exe'); -const exePath = _electron.app.getPath('exe'); -const exeDir = _path2.default.dirname(exePath); -const iconPath = _path2.default.join(exeDir, 'discord.png'); -const autostartDir = _path2.default.join(_electron.app.getPath('appData'), 'autostart'); -const electronAppName = _electron.app.name ? _electron.app.name : _electron.app.getName(); -const autostartFileName = _path2.default.join(autostartDir, electronAppName + '-' + _buildInfo2.default.releaseChannel + '.desktop'); -const desktopFile = `[Desktop Entry] -Type=Application -Exec=${exePath} -Hidden=false -NoDisplay=false -Name=${appName} -Icon=${iconPath} -Comment=Text and voice chat for gamers. -X-GNOME-Autostart-enabled=true -`; - -function ensureDir() { - try { - _fs2.default.mkdirSync(autostartDir); - return true; - } catch (e) { - // catch for when it already exists. - } - return false; -} - -function install(callback) { - // TODO: This could fail. We should read its return value - ensureDir(); - try { - return _fs2.default.writeFile(autostartFileName, desktopFile, callback); - } catch (e) { - // I guess we don't autostart then - return callback(); - } -} - -function update(callback) { - // TODO: We might need to implement this later on - return callback(); -} - -function isInstalled(callback) { - try { - _fs2.default.stat(autostartFileName, (err, stats) => { - if (err) { - return callback(false); - } - return callback(stats.isFile()); - }); - } catch (e) { - return callback(false); - } -} - -function uninstall(callback) { - return _fs2.default.unlink(autostartFileName, callback); -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/autoStart/win32.js b/appasar/stable/app_bootstrap/autoStart/win32.js deleted file mode 100644 index 3350c17..0000000 --- a/appasar/stable/app_bootstrap/autoStart/win32.js +++ /dev/null @@ -1,67 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.install = install; -exports.update = update; -exports.isInstalled = isInstalled; -exports.uninstall = uninstall; - -var _path = require('path'); - -var _path2 = _interopRequireDefault(_path); - -var _windowsUtils = require('../windowsUtils'); - -var windowsUtils = _interopRequireWildcard(_windowsUtils); - -var _appSettings = require('../appSettings'); - -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -const settings = (0, _appSettings.getSettings)(); - -// TODO: We should use Constant's APP_NAME, but only once -// we set up backwards compat with this. -const appName = _path2.default.basename(process.execPath, '.exe'); - -function install(callback) { - const startMinimized = settings.get('START_MINIMIZED', false); - let { execPath } = process; - if (startMinimized) { - execPath = `${execPath} --start-minimized`; - } - const queue = [['HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run', '/v', appName, '/d', execPath]]; - - windowsUtils.addToRegistry(queue, callback); -} - -function update(callback) { - isInstalled(installed => { - if (installed) { - install(callback); - } else { - callback(); - } - }); -} - -function isInstalled(callback) { - const queryValue = ['HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run', '/v', appName]; - queryValue.unshift('query'); - windowsUtils.spawnReg(queryValue, (error, stdout) => { - const doesOldKeyExist = stdout.indexOf(appName) >= 0; - callback(doesOldKeyExist); - }); -} - -function uninstall(callback) { - const queryValue = ['HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Run', '/v', appName, '/f']; - queryValue.unshift('delete'); - windowsUtils.spawnReg(queryValue, (error, stdout) => { - callback(); - }); -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/bootstrap.js b/appasar/stable/app_bootstrap/bootstrap.js deleted file mode 100644 index 2083fb4..0000000 --- a/appasar/stable/app_bootstrap/bootstrap.js +++ /dev/null @@ -1,144 +0,0 @@ -'use strict'; - -// bootstrap, or what runs before the rest of desktop does -// responsible for handling updates and updating modules before continuing startup - -if (process.platform === 'linux') { - // Some people are reporting audio problems on Linux that are fixed by setting - // an environment variable PULSE_LATENCY_MSEC=30 -- the "real" fix is to see - // what conditions require this and set this then (also to set it directly in - // our webrtc setup code rather than here) but this should fix the bug for now. - if (process.env.PULSE_LATENCY_MSEC === undefined) { - process.env.PULSE_LATENCY_MSEC = 30; - } -} - -const { app, Menu } = require('electron'); - -const buildInfo = require('./buildInfo'); -app.setVersion(buildInfo.version); - -// expose releaseChannel to a global, since it's used by splash screen -global.releaseChannel = buildInfo.releaseChannel; - -const errorHandler = require('./errorHandler'); -errorHandler.init(); - -const paths = require('../common/paths'); -paths.init(buildInfo); - -global.modulePath = paths.getModulePath(); - -const appSettings = require('./appSettings'); -appSettings.init(); - -const Constants = require('./Constants'); -const GPUSettings = require('./GPUSettings'); - -function setupHardwareAcceleration() { - const settings = appSettings.getSettings(); - const electronMajor = parseInt(process.versions.electron.split('.')[0]); - const allowed = process.env.DISCORD_ENABLE_HARDWARE_ACCELERATION || buildInfo.releaseChannel === 'development' || !(electronMajor === 7 && process.platform === 'darwin'); - // TODO: this is a copy of gpuSettings.getEnableHardwareAcceleration - if (!allowed || !settings.get('enableHardwareAcceleration', true)) { - app.disableHardwareAcceleration(); - } -} - -setupHardwareAcceleration(); - -// [adill] work around chrome 66 disabling autoplay by default -app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required'); - -function hasArgvFlag(flag) { - return (process.argv || []).slice(1).includes(flag); -} - -console.log(`${Constants.APP_NAME} ${app.getVersion()}`); - -let preventStartup = false; -if (process.platform === 'win32') { - // this tells Windows (in particular Windows 10) which icon to associate your app with, important for correctly - // pinning app to task bar. - app.setAppUserModelId(Constants.APP_ID); - - const { handleStartupEvent } = require('./squirrelUpdate'); - // TODO: Isn't using argv[1] fragile? - const squirrelCommand = process.argv[1]; - // TODO: Should `Discord` be a constant in this case? It's a protocol. - // TODO: Is protocol case sensitive? - if (handleStartupEvent('Discord', app, squirrelCommand)) { - preventStartup = true; - } -} - -const singleInstance = require('./singleInstance'); -const appUpdater = require('./appUpdater'); -const moduleUpdater = require('../common/moduleUpdater'); -const splashScreen = require('./splashScreen'); -const autoStart = require('./autoStart'); -const requireNative = require('./requireNative'); -let coreModule; - -function startUpdate() { - console.log('Starting updater.'); - const startMinimized = hasArgvFlag('--start-minimized'); - - appUpdater.update(startMinimized, () => { - try { - coreModule = requireNative('discord_desktop_core'); - coreModule.startup({ - paths, - splashScreen, - moduleUpdater, - autoStart, - buildInfo, - appSettings, - Constants, - GPUSettings - }); - } catch (err) { - return errorHandler.fatal(err); - } - }, () => { - coreModule.setMainWindowVisible(!startMinimized); - }); -} - -function startApp() { - console.log('Starting app.'); - paths.cleanOldVersions(buildInfo); - const startupMenu = require('./startupMenu'); - Menu.setApplicationMenu(startupMenu); - - const multiInstance = hasArgvFlag('--multi-instance'); - - if (multiInstance) { - startUpdate(); - } else { - singleInstance.create(startUpdate, args => { - // TODO: isn't relying on index 0 awfully fragile? - if (args != null && args.length > 0 && args[0] === '--squirrel-uninstall') { - app.quit(); - return; - } - - if (coreModule) { - coreModule.handleSingleInstance(args); - } else { - appUpdater.focusSplash(); - } - }); - } -} - -if (preventStartup) { - console.log('Startup prevented.'); - // TODO: shouldn't we exit out? -} else { - if (app.isReady()) { - startApp(); - } else { - app.once('ready', startApp); - } -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/buildInfo.js b/appasar/stable/app_bootstrap/buildInfo.js deleted file mode 100644 index 0e77420..0000000 --- a/appasar/stable/app_bootstrap/buildInfo.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _path = require('path'); - -var _path2 = _interopRequireDefault(_path); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -const buildInfo = require(_path2.default.join(process.resourcesPath, 'build_info.json')); - -exports.default = buildInfo; -module.exports = exports.default; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/data/quotes_copy.json b/appasar/stable/app_bootstrap/data/quotes_copy.json deleted file mode 100644 index fc33384..0000000 --- a/appasar/stable/app_bootstrap/data/quotes_copy.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - "Upsorbing the Contents", - "Additive Parsing the Load", - "Commence Monosaturated Goodening", - "Kick Off the Multi-Core Widening", - "Bastening the Game Turkey", - "Abstracting the Rummage Disc", - "Undecerealenizing the Process", - "Postrefragmenting the Widget Layer", - "Satisfying the Constraints", - "Abnoramalzing Some of the Matrices", - "Optimizing the People", - "Proclaigerizing the Network" -] diff --git a/appasar/stable/app_bootstrap/errorHandler.js b/appasar/stable/app_bootstrap/errorHandler.js deleted file mode 100644 index cac1672..0000000 --- a/appasar/stable/app_bootstrap/errorHandler.js +++ /dev/null @@ -1,43 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.init = init; -exports.fatal = fatal; - -var _electron = require('electron'); - -function isErrorSafeToSuppress(error) { - return (/attempting to call a function in a renderer window/i.test(error.message) - ); -} - -function init() { - process.on('uncaughtException', error => { - const stack = error.stack ? error.stack : String(error); - const message = `Uncaught exception:\n ${stack}`; - console.warn(message); - - if (!isErrorSafeToSuppress(error)) { - _electron.dialog.showErrorBox('A JavaScript error occurred in the main process', message); - } - }); -} - -// show a similar error message to the error handler, except exit out the app -// after the error message has been closed -function fatal(err) { - const options = { - type: 'error', - message: 'A fatal Javascript error occured', - detail: err && err.stack ? err.stack : String(err) - }; - const callback = _ => _electron.app.quit(); - const electronMajor = parseInt(process.versions.electron.split('.')[0]); - if (electronMajor >= 6) { - _electron.dialog.showMessageBox(null, options).then(callback); - } else { - _electron.dialog.showMessageBox(options, callback); - } -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/hostUpdater.js b/appasar/stable/app_bootstrap/hostUpdater.js deleted file mode 100644 index f5d7b0c..0000000 --- a/appasar/stable/app_bootstrap/hostUpdater.js +++ /dev/null @@ -1,198 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _electron = require('electron'); - -var _events = require('events'); - -var _request = require('./request'); - -var _request2 = _interopRequireDefault(_request); - -var _squirrelUpdate = require('./squirrelUpdate'); - -var squirrelUpdate = _interopRequireWildcard(_squirrelUpdate); - -function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } - -function versionParse(verString) { - return verString.split('.').map(i => parseInt(i)); -} - -function versionNewer(verA, verB) { - let i = 0; - while (true) { - const a = verA[i]; - const b = verB[i]; - i++; - if (a === undefined) { - return false; - } else { - if (b === undefined || a > b) { - return true; - } - if (a < b) { - return false; - } - } - } -} - -class AutoUpdaterWin32 extends _events.EventEmitter { - constructor() { - super(); - - this.updateUrl = null; - this.updateVersion = null; - } - - setFeedURL(updateUrl) { - this.updateUrl = updateUrl; - } - - quitAndInstall() { - if (squirrelUpdate.updateExistsSync()) { - squirrelUpdate.restart(_electron.app, this.updateVersion || _electron.app.getVersion()); - } else { - require('auto-updater').quitAndInstall(); - } - } - - downloadAndInstallUpdate(callback) { - squirrelUpdate.spawnUpdateInstall(this.updateUrl, progress => { - this.emit('update-progress', progress); - }).catch(err => callback(err)).then(() => callback()); - } - - checkForUpdates() { - if (this.updateUrl == null) { - throw new Error('Update URL is not set'); - } - - this.emit('checking-for-update'); - - if (!squirrelUpdate.updateExistsSync()) { - this.emit('update-not-available'); - return; - } - - squirrelUpdate.spawnUpdate(['--check', this.updateUrl], (error, stdout) => { - if (error != null) { - this.emit('error', error); - return; - } - - try { - // Last line of the output is JSON details about the releases - const json = stdout.trim().split('\n').pop(); - const releasesFound = JSON.parse(json).releasesToApply; - if (releasesFound == null || releasesFound.length == 0) { - this.emit('update-not-available'); - return; - } - - const update = releasesFound.pop(); - this.emit('update-available'); - this.downloadAndInstallUpdate(error => { - if (error != null) { - this.emit('error', error); - return; - } - - this.updateVersion = update.version; - - this.emit('update-downloaded', {}, update.release, update.version, new Date(), this.updateUrl, this.quitAndInstall.bind(this)); - }); - } catch (error) { - error.stdout = stdout; - this.emit('error', error); - } - }); - } -} - -// todo -class AutoUpdaterLinux extends _events.EventEmitter { - constructor() { - super(); - this.updateUrl = null; - } - - setFeedURL(url) { - this.updateUrl = url; - } - - quitAndInstall() { - // Just restart. The splash screen will hit the update manually state and - // prompt the user to download the new package. - _electron.app.relaunch(); - _electron.app.quit(); - } - - checkForUpdates() { - var _this = this; - - return _asyncToGenerator(function* () { - const currVersion = versionParse(_electron.app.getVersion()); - _this.emit('checking-for-update'); - - try { - const response = yield _request2.default.get(_this.updateUrl); - - if (response.statusCode === 204) { - // you are up to date - _this.emit('update-not-available'); - return; - } - - let latestVerStr = ''; - let latestVersion = []; - try { - const latestMetadata = JSON.parse(response.body); - latestVerStr = latestMetadata.name; - latestVersion = versionParse(latestVerStr); - } catch (_) {} - - if (versionNewer(latestVersion, currVersion)) { - console.log('[Updates] You are out of date!'); - // you need to update - _this.emit('update-manually', latestVerStr); - } else { - console.log('[Updates] You are living in the future!'); - _this.emit('update-not-available'); - } - } catch (err) { - console.error('[Updates] Error fetching ' + _this.updateUrl + ': ' + err.message); - _this.emit('error', err); - } - })(); - } -} - -let autoUpdater; - -// TODO -// events: checking-for-update, update-available, update-not-available, update-manually, update-downloaded, error -// also, checkForUpdates, setFeedURL, quitAndInstall -// also, see electron.autoUpdater, and its API -switch (process.platform) { - case 'darwin': - autoUpdater = require('electron').autoUpdater; - break; - case 'win32': - autoUpdater = new AutoUpdaterWin32(); - break; - case 'linux': - autoUpdater = new AutoUpdaterLinux(); - break; -} - -exports.default = autoUpdater; -module.exports = exports.default; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/images/img_lucky_dice.png b/appasar/stable/app_bootstrap/images/img_lucky_dice.png deleted file mode 100644 index 909b729..0000000 Binary files a/appasar/stable/app_bootstrap/images/img_lucky_dice.png and /dev/null differ diff --git a/appasar/stable/app_bootstrap/index.js b/appasar/stable/app_bootstrap/index.js deleted file mode 100644 index 8f37857..0000000 --- a/appasar/stable/app_bootstrap/index.js +++ /dev/null @@ -1,23 +0,0 @@ -'use strict'; - -const buildInfo = require('./buildInfo'); -const paths = require('../common/paths'); -paths.init(buildInfo); -const moduleUpdater = require('../common/moduleUpdater'); -moduleUpdater.initPathsOnly(buildInfo); -const requireNative = require('./requireNative'); - -function getAppMode() { - if (process.argv && process.argv.includes('--overlay-host')) { - return 'overlay-host'; - } - - return 'app'; -} - -const mode = getAppMode(); -if (mode === 'app') { - require('./bootstrap'); -} else if (mode === 'overlay-host') { - requireNative('discord_overlay2/standalone_host.js'); -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/installDevTools.js b/appasar/stable/app_bootstrap/installDevTools.js deleted file mode 100644 index e840307..0000000 --- a/appasar/stable/app_bootstrap/installDevTools.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -// used in devtools to hook in additional dev tools -// require('electron').remote.require('./installDevTools')() - -function installDevTools() { - console.log(`Installing Devtron`); - const devtron = require('devtron'); - devtron.uninstall(); - devtron.install(); - console.log(`Installed Devtron`); -} - -exports.default = installDevTools; -module.exports = exports.default; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/ipcMain.js b/appasar/stable/app_bootstrap/ipcMain.js deleted file mode 100644 index a4091b0..0000000 --- a/appasar/stable/app_bootstrap/ipcMain.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _electron = require('electron'); - -exports.default = { - on: (event, callback) => _electron.ipcMain.on(`DISCORD_${event}`, callback), - removeListener: (event, callback) => _electron.ipcMain.removeListener(`DISCORD_${event}`, callback) -}; -module.exports = exports.default; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/request.js b/appasar/stable/app_bootstrap/request.js deleted file mode 100644 index f56dcc3..0000000 --- a/appasar/stable/app_bootstrap/request.js +++ /dev/null @@ -1,182 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); - -var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; - -let electronRequest = (() => { - var _ref = _asyncToGenerator(function* ({ method, url, headers, qs, timeout, body, stream }) { - yield _electron.app.whenReady(); - - const { net, session } = require('electron'); - const req = net.request({ - method, - url: `${url}${qs != null ? `?${_querystring2.default.stringify(qs)}` : ''}`, - redirect: 'follow', - session: session.defaultSession - }); - - if (headers != null) { - for (const headerKey of Object.keys(headers)) { - req.setHeader(headerKey, headers[headerKey]); - } - } - - if (body != null) { - req.write(body, 'utf-8'); - } - - return new Promise(function (resolve, reject) { - const reqTimeout = setTimeout(function () { - req.abort(); - reject(new Error(`network timeout: ${url}`)); - }, timeout != null ? timeout : DEFAULT_REQUEST_TIMEOUT); - - req.on('login', function (authInfo, callback) { - return callback(); - }); - - req.on('response', function (response) { - clearTimeout(reqTimeout); - handleHTTPResponse(resolve, reject, response, stream); - }); - - req.on('error', function (err) { - clearTimeout(reqTimeout); - reject(err); - }); - - req.end(); - }); - }); - - return function electronRequest(_x) { - return _ref.apply(this, arguments); - }; -})(); - -let requestWithMethod = (() => { - var _ref2 = _asyncToGenerator(function* (method, options) { - if (typeof options === 'string') { - options = { url: options }; - } - - options = _extends({}, options, { method }); - - try { - return yield electronRequest(options); - } catch (err) { - console.log(`Error downloading with electron net: ${err.message}`); - console.log('Falling back to node net library..'); - } - - return nodeRequest(options); - }); - - return function requestWithMethod(_x2, _x3) { - return _ref2.apply(this, arguments); - }; -})(); - -// only supports get for now, since retrying is non-idempotent and -// we'd want to grovel the errors to make sure it's safe to retry - - -var _electron = require('electron'); - -var _querystring = require('querystring'); - -var _querystring2 = _interopRequireDefault(_querystring); - -var _request = require('request'); - -var _request2 = _interopRequireDefault(_request); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; } - -const DEFAULT_REQUEST_TIMEOUT = 30000; - -function makeHTTPResponse({ method, url, headers, statusCode, statusMessage }, body) { - return { - method, - url, - headers, - statusCode, - statusMessage, - body - }; -} - -function makeHTTPStatusError(response) { - const err = new Error(`HTTP Error: Status Code ${response.statusCode}`); - err.response = response; - return err; -} - -function handleHTTPResponse(resolve, reject, response, stream) { - const totalBytes = parseInt(response.headers['content-length'] || 1, 10); - let receivedBytes = 0; - const chunks = []; - - // don't stream response if it's a failure - if (response.statusCode >= 300) { - stream = null; - } - - response.on('data', chunk => { - if (stream != null) { - receivedBytes += chunk.length; - stream.write(chunk); - stream.emit('progress', { totalBytes, receivedBytes }); - return; - } - - chunks.push(chunk); - }); - - response.on('end', () => { - if (stream != null) { - stream.on('finish', () => resolve(makeHTTPResponse(response, null))); - stream.end(); - return; - } - - const res = makeHTTPResponse(response, Buffer.concat(chunks)); - - if (res.statusCode >= 300) { - reject(makeHTTPStatusError(res)); - return; - } - - resolve(res); - }); -} - -function nodeRequest({ method, url, headers, qs, timeout, body, stream }) { - return new Promise((resolve, reject) => { - const req = (0, _request2.default)({ - method, - url, - qs, - headers, - followAllRedirects: true, - encoding: null, - timeout: timeout != null ? timeout : DEFAULT_REQUEST_TIMEOUT, - body - }); - - req.on('response', response => handleHTTPResponse(resolve, reject, response, stream)); - req.on('error', err => reject(err)); - }); -} - -for (const method of ['get']) { - requestWithMethod[method] = requestWithMethod.bind(null, method.toUpperCase()); -} - -exports.default = requestWithMethod; -module.exports = exports.default; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/requireNative.js b/appasar/stable/app_bootstrap/requireNative.js deleted file mode 100644 index c18c0c0..0000000 --- a/appasar/stable/app_bootstrap/requireNative.js +++ /dev/null @@ -1,5 +0,0 @@ -"use strict"; - -// require(), with paths specialized for requiring only native modules. -module.paths = []; -module.exports = require; \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/singleInstance.js b/appasar/stable/app_bootstrap/singleInstance.js deleted file mode 100644 index 03cf578..0000000 --- a/appasar/stable/app_bootstrap/singleInstance.js +++ /dev/null @@ -1,130 +0,0 @@ -'use strict'; - -Object.defineProperty(exports, "__esModule", { - value: true -}); -exports.create = create; -exports.pipeCommandLineArgs = pipeCommandLineArgs; - -var _electron = require('electron'); - -var _net = require('net'); - -var _net2 = _interopRequireDefault(_net); - -var _path = require('path'); - -var _path2 = _interopRequireDefault(_path); - -var _fs = require('fs'); - -var _fs2 = _interopRequireDefault(_fs); - -var _os = require('os'); - -var _os2 = _interopRequireDefault(_os); - -var _buildInfo = require('./buildInfo'); - -var _buildInfo2 = _interopRequireDefault(_buildInfo); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - -function deleteSocketFile(socketPath) { - if (process.platform === 'win32') { - return; - } - - if (_fs2.default.existsSync(socketPath)) { - try { - _fs2.default.unlinkSync(socketPath); - } catch (error) { - // Ignore ENOENT errors in case the file was deleted between the exists - // check and the call to unlink sync. This occurred occasionally on CI - // which is why this check is here. - if (error.code !== 'ENOENT') { - throw error; - } - } - } -} - -/** - * Creates server to listen for additional atom application launches. - * - * You can run the command multiple times, but after the first launch - * the other launches will just pass their information to this server and then - * close immediately. - */ -function listenForArgumentsFromNewProcess(socketPath, callback) { - deleteSocketFile(socketPath); - - const server = _net2.default.createServer(connection => { - connection.on('data', data => { - const args = JSON.parse(data); - callback(args); - }); - }); - server.listen(socketPath); - server.on('error', error => console.error('Application server failed', error)); - return server; -} - -function tryStart(socketPath, callback, otherAppFound) { - // FIXME: Sometimes when socketPath doesn't exist, net.connect would strangely - // take a few seconds to trigger 'error' event, it could be a bug of node - // or atom-shell, before it's fixed we check the existence of socketPath to - // speedup startup. - if (process.platform !== 'win32' && !_fs2.default.existsSync(socketPath)) { - callback(); - return; - } - - const client = _net2.default.connect({ path: socketPath }, () => { - client.write(JSON.stringify(process.argv.slice(1)), () => { - client.end(); - otherAppFound(); - }); - }); - client.on('error', callback); -} - -function makeSocketPath() { - let name = _electron.app.name ? _electron.app.name : _electron.app.getName(); - if (_buildInfo2.default.releaseChannel !== 'stable') { - name += _buildInfo2.default.releaseChannel; - } - - if (process.platform === 'win32') { - return '\\\\.\\pipe\\' + name + '-sock'; - } else { - return _path2.default.join(_os2.default.tmpdir(), name + '.sock'); - } -} - -function create(startCallback, newProcessCallback) { - const socketPath = makeSocketPath(); - - tryStart(socketPath, () => { - const server = listenForArgumentsFromNewProcess(socketPath, newProcessCallback); - - _electron.app.on('will-quit', () => { - server.close(); - deleteSocketFile(socketPath); - }); - - _electron.app.on('will-exit', () => { - server.close(); - deleteSocketFile(socketPath); - }); - - startCallback(); - }, () => { - console.log('Another instance exists. Quitting.'); - _electron.app.exit(0); - }); -} - -function pipeCommandLineArgs(noOtherAppFoundCallback, otherAppFound) { - tryStart(makeSocketPath(), noOtherAppFoundCallback, otherAppFound); -} \ No newline at end of file diff --git a/appasar/stable/app_bootstrap/splash/a934ab008c7f6a2274ec441f6be0696a.woff b/appasar/stable/app_bootstrap/splash/a934ab008c7f6a2274ec441f6be0696a.woff deleted file mode 100644 index 98aa239..0000000 Binary files a/appasar/stable/app_bootstrap/splash/a934ab008c7f6a2274ec441f6be0696a.woff and /dev/null differ diff --git a/appasar/stable/app_bootstrap/splash/abddffb32a4a35627c3857a06c751424.png b/appasar/stable/app_bootstrap/splash/abddffb32a4a35627c3857a06c751424.png deleted file mode 100644 index 909b729..0000000 Binary files a/appasar/stable/app_bootstrap/splash/abddffb32a4a35627c3857a06c751424.png and /dev/null differ diff --git a/appasar/stable/app_bootstrap/splash/d153359b5d87601d2b9c708b7ae2db02.woff b/appasar/stable/app_bootstrap/splash/d153359b5d87601d2b9c708b7ae2db02.woff deleted file mode 100644 index 2a2f65a..0000000 Binary files a/appasar/stable/app_bootstrap/splash/d153359b5d87601d2b9c708b7ae2db02.woff and /dev/null differ diff --git a/appasar/stable/app_bootstrap/splash/index.html b/appasar/stable/app_bootstrap/splash/index.html deleted file mode 100644 index 5dec1de..0000000 --- a/appasar/stable/app_bootstrap/splash/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - -
- -L(A/m)&&T("overflow"),h*=m}var v=t.length+1;i=Q(s-c,v,0==c),L(s/v)>A-o&&T("overflow"),o+=L(s/v),s%=v,t.splice(s++,0,o)}return String.fromCodePoint.apply(String,t)},u=function(e){var r=[],t=(e=N(e)).length,a=128,s=0,o=72,i=!0,n=!1,l=void 0;try{for(var u,c=e[Symbol.iterator]();!(i=(u=c.next()).done);i=!0){var h=u.value;h<128&&r.push(z(h))}}catch(e){n=!0,l=e}finally{try{!i&&c.return&&c.return()}finally{if(n)throw l}}var d=r.length,f=d;for(d&&r.push("-");f