Skip to content

Commit 9c014a4

Browse files
committed
Added request as a parameter to plugins to avoid errors
1 parent e186b7c commit 9c014a4

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

app/main.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
const { app, BrowserWindow, ipcMain } = require('electron');
22
const fs = require('fs');
33
const ncp = require('ncp').ncp;
4-
const path = require('path');
4+
const request = require('request');
55
const storage = require('electron-json-storage');
66
const _ = require('lodash');
77
const SWProxy = require('./proxy/SWProxy');
88

9+
const path = require('path');
10+
const url = require('url');
11+
912
let win;
1013
let defaultConfig = {
1114
Config: {
@@ -83,7 +86,11 @@ function createWindow () {
8386
autoHideMenuBar: true,
8487
titleBarStyle: 'hidden-inset'
8588
});
86-
win.loadURL(`file://${__dirname}/index.html`);
89+
win.loadURL(url.format({
90+
pathname: path.join(__dirname, 'index.html'),
91+
protocol: 'file:',
92+
slashes: true
93+
}))
8794
}
8895

8996
function loadPlugins() {
@@ -113,7 +120,7 @@ function loadPlugins() {
113120
// Initialize plugins
114121
plugins.forEach(function(plug) {
115122
config[plug.pluginName] = _.merge(plug.defaultConfig, config[plug.pluginName]);
116-
plug.init(proxy, config[plug.pluginName]);
123+
plug.init(proxy, config[plug.pluginName], request);
117124
})
118125

119126
return plugins;

app/plugins/swag-logger.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
1-
const request = require('request');
2-
31
module.exports = {
42
defaultConfig: {
53
enabled: true
64
},
75
pluginName: 'SwagLogger',
86
log_url: 'https://gw.swop.one/data/upload/',
9-
init(proxy, config) {
7+
init(proxy, config, request) {
108
proxy.on('GetGuildWarBattleLogByGuildId', (req, resp) => {
119
if (config.enabled)
12-
this.log(proxy, req, resp);
10+
this.log(proxy, req, resp, request);
1311
});
1412
proxy.on('GetGuildWarBattleLogByWizardId', (req, resp) => {
1513
if (config.enabled)
16-
this.log(proxy, req, resp);
14+
this.log(proxy, req, resp, request);
1715
});
1816
},
1917

20-
log(proxy, req, resp) {
18+
log(proxy, req, resp, request) {
2119
const {command} = req;
2220

2321
let options = {

app/plugins/swarfarm-logger.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
const request = require('request');
2-
31
module.exports = {
42
defaultConfig: {
53
enabled: true
@@ -8,7 +6,7 @@ module.exports = {
86
commands_url: 'https://swarfarm.com/data/log/accepted_commands/',
97
log_url: 'https://swarfarm.com/data/log/upload/',
108
accepted_commands: false,
11-
init(proxy) {
9+
init(proxy, config, request) {
1210
this.proxy = proxy;
1311
let options = {
1412
method: 'get',
@@ -25,11 +23,11 @@ module.exports = {
2523
});
2624
proxy.on('apiCommand', (req, resp) => {
2725
if (config.enabled)
28-
this.log(proxy, req, resp);
26+
this.log(proxy, req, resp, request);
2927
});
3028
},
3129

32-
log(proxy, req, resp) {
30+
log(proxy, req, resp, request) {
3331
const {command} = req;
3432

3533
if (!this.accepted_commands || !this.accepted_commands[command])

packager.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ packager({
66
dir: '.',
77
out: 'dist',
88
//all: true,
9-
platform: 'win32,darwin,linux',
9+
platform: 'win32',
1010
arch: 'x64',
1111
ignore: ['/plugins($|/)'],
1212
overwrite: true,
13-
asar: true,
13+
asar: {
14+
unpack: '*.node'
15+
},
1416
win32metadata: {
1517
CompanyName: 'SW Exporter Company',
1618
FileDescription: 'Summoners War Exporter',

0 commit comments

Comments
 (0)