fixes

carlos8f · May 31, 2018 · 72f22b1 · 72f22b1
1 parent 90d34aa
commit 72f22b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/launcher/get-auth.js b/launcher/get-auth.js
@@ -221,7 +221,7 @@ module.exports = function getAuth (cb) {
       }
     }
     debug('Authenticating - Please stand by...'.grey)
-    mr.post('https://code.bot18.net/auth/' + username, opts, function (err, resp, body) {
+    bot18.lib.mr_post('https://code.bot18.net/auth/' + username, opts, function (err, resp, body) {
       if (err) {
         return cb(new Error('Your network connection is down. Please try again later.'))
       }

diff --git a/launcher/get-engine.js b/launcher/get-engine.js
@@ -21,7 +21,6 @@ var bot18 = global.BOT18
 
 module.exports = function getEngine (cb) {
   var salty = require('salty')
-  var mr = require('micro-request')
   var vm = require('vm')
   var zlib = require('zlib')
   var debug = bot18.debug('launcher')
@@ -97,8 +96,7 @@ module.exports = function getEngine (cb) {
           return cb(new Error('Invalid request to ZalgoNet. The REST API may have changed.'))
         case 403:
           var err = new Error('Authorization expired. Please log in again.')
-          err.retry = true
-          return cb(err)
+          return require(r(__dirname, 'get-auth'))(cb)
         case 404:
           return cb(new Error('Invalid engine distribution channel. Please choose either "stable", "unstable", or "trial".'))
         case 429:

diff --git a/launcher/get-lib.js b/launcher/get-lib.js
@@ -8,6 +8,6 @@ var bot18 = global.BOT18
 
 module.exports = function (cb) {
   var r = require('path').resolve
-  require(r(__dirname, '..', 'lib', 'mr'))
+  require(r(__dirname, '..', 'lib', 'mr'))()
   cb()
 }
diff --git a/lib/mr.js b/lib/mr.js
@@ -3,10 +3,6 @@ var bot18 = global.BOT18
 module.exports = function () {
   function wrapMethod (method) {
     return function (url, opts, cb) {
-      if (typeof opts === 'function') {
-        cb = opts
-        opts = {}
-      }
       var defaults = {
         headers: {
           'user-agent': bot18.user_agent
@@ -15,10 +11,14 @@ module.exports = function () {
       if (bot18.auth && bot18.auth.authorized && bot18.auth.auth_token) {
         defaults.headers['x-bot18-auth'] = bot18.auth.auth_token
       }
+      if (typeof opts === 'function') {
+        cb = opts
+        opts = {}
+      }
+      var opts_copy = JSON.parse(JSON.stringify(opts))
+      var opts_merged = require('lodash.defaultsdeep')(opts_copy, defaults)
+      return require('micro-request')[method](url, opts_merged, cb)
     }
-    var opts_copy = JSON.parse(JSON.stringify(opts))
-    var opts_merged = require('lodash.defaultsdeep')(opts_copy, defaults)
-    return require('micro-request')[method](url, opts_merged, cb)
   }
   ;['get', 'post', 'put', 'delete'].forEach(function (method) {
     bot18.lib['mr_' + method] = wrapMethod(method)