diff --git a/app/assets/js/assetexec.js b/app/assets/js/assetexec.js index 04d6289..d6951f8 100644 --- a/app/assets/js/assetexec.js +++ b/app/assets/js/assetexec.js @@ -1,5 +1,7 @@ const { AssetGuard } = require('./assetguard') +process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0' + const tracker = new AssetGuard(process.argv[2], process.argv[3]) console.log('AssetExec Started') @@ -31,7 +33,7 @@ process.on('message', (msg) => { res.then((v) => { process.send({result: v, context: func}) }).catch((err) => { - process.send({result: err, context: func}) + process.send({result: err.message, context: func}) }) } else { process.send({result: res, context: func}) diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js index 85f9ee1..51fae98 100644 --- a/app/assets/js/scripts/landing.js +++ b/app/assets/js/scripts/landing.js @@ -569,6 +569,11 @@ function dlAsync(login = true){ } } else if(m.context === 'validateEverything'){ + // If these properties are not defined it's likely an error. + if(m.result.forgeData == null || m.result.versionData == null){ + console.error(m.result) + } + forgeData = m.result.forgeData versionData = m.result.versionData diff --git a/package-lock.json b/package-lock.json index 30d42aa..956c7dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "westeroscraftlauncher", - "version": "0.0.1-alpha.15", + "version": "0.0.1-alpha.16", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -123,22 +123,22 @@ "dev": true }, "app-builder-lib": { - "version": "20.24.5", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.24.5.tgz", - "integrity": "sha512-nk9VCpJ8/OFQGsbCUlY5h4SLU85fh2eVEdIwm4e+TwrcnXNOoAsSPe6H6dLio+SybhW+C7GNk+aYIg2l+JVRXA==", + "version": "20.25.0", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.25.0.tgz", + "integrity": "sha512-jOvX5myrzYy5vPAgI8/hRYer0ee06DRUmGFXFKTLyNvmi96d02DgEFERFc1BLHOCmGe1RxsDVTuiz+qoSqcjkQ==", "dev": true, "requires": { "7zip-bin": "~4.0.2", "app-builder-bin": "1.11.4", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.5", - "builder-util": "5.18.1", + "builder-util": "5.19.0", "builder-util-runtime": "4.4.1", "chromium-pickle-js": "^0.2.0", "debug": "^3.1.0", "ejs": "^2.6.1", "electron-osx-sign": "0.4.10", - "electron-publish": "20.24.2", + "electron-publish": "20.25.0", "env-paths": "^1.0.0", "fs-extra-p": "^4.6.1", "hosted-git-info": "^2.7.1", @@ -463,9 +463,9 @@ "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==" }, "builder-util": { - "version": "5.18.1", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.18.1.tgz", - "integrity": "sha512-wfffo0HyDY2FReYU9Uc5Rj9HqK3wANeBaj8LIgjmg/yugIZ3UwqOtJzO24svfPrzyt7Ycw1QAKg0Z8cCHUUmbA==", + "version": "5.19.0", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.19.0.tgz", + "integrity": "sha512-MKkixmVsPLHFrG8EOqfKz1VOUfyxVkrSr/A4o9fJZz4+dyf0CJTjCoa97OzRc7YYfPCbUs/Q0GQwal0Kinw9uA==", "dev": true, "requires": { "7zip-bin": "~4.0.2", @@ -897,14 +897,14 @@ } }, "dmg-builder": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-5.0.3.tgz", - "integrity": "sha512-P0oEYXqQYeE7J3TueVrpQxs4v1NNLGzIIljHG4fXGIiq5uDnNqDubglxMh9zC6MhO2tXxRU5dr/8U2WcDqXN0w==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-5.0.4.tgz", + "integrity": "sha512-EAMCcpAwo/hpyhEaRzoWwTzUgrqS1AOU2GkbhyfgeVKwWU9kkuRfPz1NJFzWGKFcBkTO9zbi2DMEotqOzNg1aw==", "dev": true, "requires": { - "app-builder-lib": "~20.24.5", + "app-builder-lib": "~20.25.0", "bluebird-lst": "^1.0.5", - "builder-util": "~5.18.1", + "builder-util": "~5.19.0", "fs-extra-p": "^4.6.1", "iconv-lite": "^0.4.23", "js-yaml": "^3.12.0", @@ -983,17 +983,17 @@ } }, "electron-builder": { - "version": "20.24.5", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.24.5.tgz", - "integrity": "sha512-NMwQQlWtG3IZTZI2XdPGGUloxV1yewQQlbUUhUw6BimRS2cYkBpgVBUTlehs/mHCx5MUX+kt7HC01OihySPM/g==", + "version": "20.25.0", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.25.0.tgz", + "integrity": "sha512-Fk30YHabm+EEJ9C9WlDwTJUMqci7tF1FMUvvDu4/bSVCfMCF6pqjfE3ymHFCmFDaTdqpHa5yHRmMOu5ey+YyLA==", "dev": true, "requires": { - "app-builder-lib": "20.24.5", + "app-builder-lib": "20.25.0", "bluebird-lst": "^1.0.5", - "builder-util": "5.18.1", + "builder-util": "5.19.0", "builder-util-runtime": "4.4.1", "chalk": "^2.4.1", - "dmg-builder": "5.0.3", + "dmg-builder": "5.0.4", "fs-extra-p": "^4.6.1", "is-ci": "^1.1.0", "lazy-val": "^1.0.3", @@ -1053,13 +1053,13 @@ } }, "electron-publish": { - "version": "20.24.2", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.24.2.tgz", - "integrity": "sha512-ngGDjN7NEmUS2Zd6vrqLdfTRCH/ROFFUPbK0Ph79zOqR1oiveM8sZVRE99IdOLZEeXHZjvssGmZb4WsYxr/wyg==", + "version": "20.25.0", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.25.0.tgz", + "integrity": "sha512-XU1Bc6gwmupzufFrOOePmBsp1sbvzAAP/q1VkvfRunl950M/dqY7ENm6E8zpALgKgYL5guaBFMbR9/rc5Qibew==", "dev": true, "requires": { "bluebird-lst": "^1.0.5", - "builder-util": "~5.18.0", + "builder-util": "~5.19.0", "builder-util-runtime": "^4.4.1", "chalk": "^2.4.1", "fs-extra-p": "^4.6.1", diff --git a/package.json b/package.json index e20c4f5..f84a8a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "westeroscraftlauncher", - "version": "0.0.1-alpha.15", + "version": "0.0.1-alpha.16", "description": "Custom modded launcher for Westeroscraft", "productName": "WesterosCraft Launcher", "main": "index.js", @@ -48,7 +48,7 @@ }, "devDependencies": { "electron": "^2.0.5", - "electron-builder": "^20.24.5", + "electron-builder": "^20.25.0", "eslint": "^5.2.0" }, "build": {