Ver Fonte

Discord-rpc has resolved the issue with the timeout function, updating to beta 10. Updating to node.js 8.11.x.

Daniel Scalzi há 7 anos atrás
pai
commit
ae387757bc
5 ficheiros alterados com 37 adições e 43 exclusões
  1. 1 1
      README.md
  2. 1 1
      app/assets/js/mojang.js
  3. 1 1
      index.js
  4. 32 38
      package-lock.json
  5. 2 2
      package.json

+ 1 - 1
README.md

@@ -1,7 +1,7 @@
 # Getting Started #
 
 System Requirements:
-* [Node.js](https://nodejs.org/en/) v8.9.0+
+* [Node.js](https://nodejs.org/en/) v8.11.0+
 
 This repository is dedicated to the development of the new custom launcher for the [WesterosCraft](http://www.westeroscraft.com/) server. This project is developed primarily with [Node.js](https://nodejs.org/en/) and the [Electron](https://electron.atom.io/) framework. For further reference you may view [the repository of the new launcher written in JavaFX/Java](https://gitlab.com/westeroscraft/WesteroscraftNewLauncher) which was discontinued. You may also view the repository of the [current launcher](https://gitlab.com/westeroscraft/westeroscraftlaunchercore), a modified fork of MCUpdater.
 

+ 1 - 1
app/assets/js/mojang.js

@@ -41,7 +41,7 @@ const statuses = [
 /**
  * Converts a Mojang status color to a hex value. Valid statuses
  * are 'green', 'yellow', 'red', and 'grey'. Grey is a custom status
- * to our project which represends an unknown status.
+ * to our project which represents an unknown status.
  * 
  * @param {string} status A valid status code.
  * @returns {string} The hex color of the status code.

+ 1 - 1
index.js

@@ -22,7 +22,7 @@ function createWindow() {
     ejse.data('bkid', Math.floor((Math.random() * fs.readdirSync(path.join(__dirname, 'app', 'assets', 'images', 'backgrounds')).length)))
 
     win.loadURL(url.format({
-        pathname: path.join(__dirname, 'app', 'app.ejs'),
+        pathname: path.join(__dirname, 'app', 'index.ejs'),
         protocol: 'file:',
         slashes: true
     }))

+ 32 - 38
package-lock.json

@@ -706,28 +706,42 @@
       "dev": true
     },
     "discord-rpc": {
-      "version": "3.0.0-beta.8",
-      "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.8.tgz",
-      "integrity": "sha512-oKy8k54GB7SzBeTEjk4FlUk9Oqw/4Dw6Innr7uHy014lIM3O5UiQMnbPX5lKeFf1+qp9ILQyJX7sOjGP34mtzA==",
+      "version": "3.0.0-beta.10",
+      "resolved": "https://registry.npmjs.org/discord-rpc/-/discord-rpc-3.0.0-beta.10.tgz",
+      "integrity": "sha512-b0G6O0WJkxoLQSopyNRqByXCrpBL68HXPMULVZXLjRgj+sStwOmbABM+HwBDJWF6s/uhkB/+cAgq+19x4w0SPA==",
       "requires": {
-        "discord.js": "github:hydrabolt/discord.js#e9bdd3ad7eb73aac8b52e4cbc141e7a7764f39e4",
-        "snekfetch": "3.6.1"
-      }
-    },
-    "discord.js": {
-      "version": "github:hydrabolt/discord.js#e9bdd3ad7eb73aac8b52e4cbc141e7a7764f39e4",
-      "requires": {
-        "pako": "1.0.6",
-        "prism-media": "0.0.2",
-        "snekfetch": "3.6.1",
-        "tweetnacl": "1.0.0",
-        "ws": "3.3.3"
+        "discord.js": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900",
+        "snekfetch": "3.6.4"
       },
       "dependencies": {
+        "discord.js": {
+          "version": "github:discordjs/discord.js#a5e8f05d01e34b69b80736688704ee594b4d0900",
+          "requires": {
+            "pako": "1.0.6",
+            "prism-media": "0.2.1",
+            "snekfetch": "3.6.4",
+            "tweetnacl": "1.0.0",
+            "ws": "4.1.0"
+          }
+        },
+        "prism-media": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.2.1.tgz",
+          "integrity": "sha512-Kfp1+6gzjY6X8mqKHa6D3brX+BtMUPFwzAkz4zgtVPgbkA2XxhITROdfQXVurU4fuJsylFRwqo7ciQlQCm9hAw=="
+        },
         "tweetnacl": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.0.tgz",
           "integrity": "sha1-cT2LgY2kIGh0C/aDhtBHnmb8ins="
+        },
+        "ws": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
+          "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
+          "requires": {
+            "async-limiter": "1.0.0",
+            "safe-buffer": "5.1.1"
+          }
         }
       }
     },
@@ -2179,11 +2193,6 @@
         "meow": "3.7.0"
       }
     },
-    "prism-media": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.0.2.tgz",
-      "integrity": "sha512-L6yc8P5NVG35ivzvfI7bcTYzqFV+K8gTfX9YaJbmIFfMXTs71RMnAupvTQPTCteGsiOy9QcNLkQyWjAafY/hCQ=="
-    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -2472,9 +2481,9 @@
       }
     },
     "snekfetch": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.1.tgz",
-      "integrity": "sha512-aLEvf1YR440pINb0LEo/SL2Q2s/A26+YEqPlx09A0XpGH7qWp8iqIFFolVILHn2yudWXJne9QWyQu+lzDp+ksQ=="
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz",
+      "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw=="
     },
     "sntp": {
       "version": "2.1.0",
@@ -2740,11 +2749,6 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="
-    },
     "unique-string": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
@@ -2928,16 +2932,6 @@
         "signal-exit": "3.0.2"
       }
     },
-    "ws": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-      "requires": {
-        "async-limiter": "1.0.0",
-        "safe-buffer": "5.1.1",
-        "ultron": "1.1.1"
-      }
-    },
     "xdg-basedir": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",

+ 2 - 2
package.json

@@ -13,7 +13,7 @@
     "dist:all": "npm run dist -- -wl --x64"
   },
   "engines": {
-    "node": "8.9.x"
+    "node": "8.11.x"
   },
   "repository": {
     "type": "git",
@@ -28,7 +28,7 @@
   "dependencies": {
     "adm-zip": "^0.4.7",
     "async": "^2.6.0",
-    "discord-rpc": "^3.0.0-beta.8",
+    "discord-rpc": "^3.0.0-beta.10",
     "ejs": "^2.5.7",
     "ejs-electron": "^2.0.1",
     "jquery": "^3.3.1",