omegga 0.1.65 → 0.1.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omegga",
-  "version": "0.1.65",
+  "version": "0.1.66",
   "description": "Brickadia server installer, manager, wrapper, configurator, and automator",
   "main": "index.js",
   "bin": {

package/src/cli/auth.js

@@ -31,15 +31,17 @@ async function prompt() {
   ];
 }
 
-async function authFromPrompt() {
-  let email, password, files;
+async function authFromPrompt({email, password, debug=false}) {
+  let files;
 
-  // prompt for user credentials
-  try {
-    [email, password] = await prompt();
-  } catch (err) {
-    console.error('!>'.red, 'Error prompting credentials\n', err);
-    return false;
+  if (!email || !password) {
+    // prompt for user credentials
+    try {
+      [email, password] = await prompt();
+    } catch (err) {
+      console.error('!>'.red, 'Error prompting credentials\n', err);
+      return false;
+    }
   }
 
   // generate auth tokens
@@ -48,7 +50,7 @@ async function authFromPrompt() {
     console.log('>>'.green, 'Probably also installing the game...');
   },  10000);
   try {
-    files = await genAuthFiles(email, password);
+    files = await genAuthFiles(email, password, debug);
     clearTimeout(timeout);
   } catch (err) {
     clearTimeout(timeout);
@@ -56,6 +58,11 @@ async function authFromPrompt() {
     return false;
   }
 
+  if (!files) {
+    console.error('!>'.red, 'Authentication Failed');
+    return;
+  }
+
   // save the tokens to the config path (will be copied when omegga starts)
   try {
     console.log('>>'.green, 'Storing auth tokens...');
@@ -85,4 +92,5 @@ module.exports = {
   prompt: authFromPrompt,
   exists: authExists,
   clean: deleteAuthFiles,
+  AUTH_PATH,
 };

package/src/main.js

@@ -93,7 +93,7 @@ const program = require('commander')
 
     // check if the auth files don't exist
     if (!auth.exists(path.join(workDir, soft.DATA_PATH, 'Saved/Auth')) && !auth.exists()) {
-      const success = await auth.prompt();
+      const success = await auth.prompt({ debug });
       if (!success) {
         err('Start aborted - could not generate auth tokens');
         process.exit(1);
@@ -163,18 +163,27 @@ program
   .command('auth')
   .option('-g, --global', 'Remove global auth files')
   .option('-l, --local', 'Remove local auth files')
+  .option('-u, --email <email>', 'User email (must provide password)')
+  .option('-p, --pass <password>', 'User password (must provide email)')
+  .option('-v, --verbose', 'Print extra messages for debugging purposes')
   .description('Generates server auth tokens from brickadia account email+password')
-  .action(() => {
-    const { global, local } = program.opts();
-    if (global || local) {
-      log('Clearing old auth files');
-      if (global)
+  .action(async ({ email, pass: password, local: localAuth, global: globalAuth }) => {
+    const { verbose, debug } = program.opts();
+    global.VERBOSE = verbose;
+
+    if (globalAuth || localAuth) {
+      if (globalAuth) {
+        log('Clearing auth files from', auth.AUTH_PATH.yellow);
         auth.clean();
-      if (local)
-        file.rmdir(path.join(__dirname, 'data/Saved/Auth'));
+      }
+      if (localAuth) {
+        const localPath = path.resolve('data/Saved/Auth');
+        log('Clearing auth files from', localPath.yellow);
+        await file.rmdir(localPath);
+      }
       return;
     } else {
-      auth.prompt();
+      auth.prompt({email, password, debug});
     }
   });
 

package/src/omegga/auth.js

@@ -44,7 +44,7 @@ function writeAuthFiles(dstDir, files) {
 }
 
 // from credentials, build brickadia auth tokens
-async function genAuthFiles(email, password) {
+async function genAuthFiles(email, password, debug=false) {
   verboseLog('Generating auth files');
 
   // remove existing temporary install path
@@ -70,6 +70,7 @@ async function genAuthFiles(email, password) {
     noauth: true,
     noplugin: true,
     noweb: true,
+    debug,
   };
 
   // create a dummy omegga
@@ -107,7 +108,6 @@ async function genAuthFiles(email, password) {
       if (finished) return;
       finished = true;
       verboseLog('Brickadia', name, 'with code', ...args);
-      removeTempDir();
       if (!resolved) reject('temp server could not start');
     };
 
@@ -118,7 +118,7 @@ async function genAuthFiles(email, password) {
   });
 
   // read the auth files on success
-  const files = success ? readAuthFiles() : undefined;
+  const files = success ? readAuthFiles() : null;
 
   // remove temp dir
   removeTempDir();

package/src/util/file.js

@@ -77,13 +77,13 @@ function mkdir(path) {
 
 // rm -rf a path
 function rmdir(dir) {
-  if (!fs.existsSync(dir)) return;
+  if (!fs.existsSync(dir)) return false;
   return new Promise((resolve, reject) => {
     rimraf(dir, error => {
       if (error)
         reject(error);
       else
-        resolve();
+        resolve(true);
     });
   });
 }