omegga 0.1.64 → 0.1.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omegga",
-  "version": "0.1.64",
+  "version": "0.1.68",
   "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/cli/plugin.js

@@ -191,26 +191,22 @@ module.exports = {
         'to setup one.'
       );
 
-    plugins = plugins.map(transformUrl);
     log('Attempting to install', (plugins.length + '').yellow, 'plugins...');
 
-    plugins = plugins.filter(plugin => {
+    for (const pluginUrl of plugins) {
+      const plugin = transformUrl(pluginUrl);
+
       // if the plugin wasn't transformed, try to extract its name from the git url
-      if (!plugin.name) {
+      if (!('name' in plugin)) {
         try {
           const { name } = path.parse(plugin.url);
           plugin.name = name.replace(/^omegga-/, '');
-          return true;
         } catch (e) {
           console.error('!>'.red, 'Error parsing name from url', plugin.url);
-          return false;
+          break;
         }
-      } else {
-        return true;
       }
-    });
 
-    for (const plugin of plugins) {
       log(
         'Installing plugin',
         plugin.name.yellow,

package/src/config/index.js

@@ -31,11 +31,11 @@ module.exports = {
   defaultConfig: {
     omegga: {
       webui: true,
-      port: soft.DEFAULT_PORT,
+      port: process.env.OMEGGA_PORT ?? soft.DEFAULT_PORT,
       https: true,
     },
     server: {
-      port: 7777,
+      port: process.env.BRICKADIA_PORT ?? 7777,
       map: 'Plate'
     },
   },

package/src/main.js

@@ -93,7 +93,11 @@ 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,
+        email: process.env.BRICKADIA_USER ?? null,
+        password: process.env.BRICKADIA_PASS ?? null,
+      });
       if (!success) {
         err('Start aborted - could not generate auth tokens');
         process.exit(1);
@@ -161,22 +165,36 @@ program
 
 program
   .command('auth')
-  .option('-c, --clean', 'Remove old auth files')
-  .option('-f, --force', 'Forcefully regenerate auth token')
+  .option('-g, --global', 'Remove global auth files')
   .option('-l, --local', 'Remove local auth files')
+  .option('-w, --workdir', 'Remove configured location 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 { clean, force, local } = program.opts();
-    if (clean || force || local) {
-      log('Clearing old auth files');
-      if (clean || force)
-        auth.deleteAuthFiles();
-      if (local)
-        file.rmdir(path.join(__dirname, 'data/Saved/Auth'));
-      if (clean || local)
-        return;
+  .action(async ({ email, pass: password, local: localAuth, workDir, 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 (workDir) {
+        const workdirPath = path.join(config.store.get('defaultOmegga'), 'data/Saved/Auth');
+        log('Clearing auth files from', workdirPath.yellow);
+        await file.rmdir(workdirPath);
+      }
+      if (localAuth) {
+        const localPath = path.resolve('data/Saved/Auth');
+        log('Clearing auth files from', localPath.yellow);
+        await file.rmdir(localPath);
+      }
+      return;
+    } else {
+      auth.prompt({email, password, debug});
     }
-    auth.prompt();
   });
 
 program

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/omegga/server.js

@@ -525,10 +525,10 @@ class Omegga extends OmeggaWrapper {
     // wait for the server to save the file
     await this.watchLogChunk(
       `Bricks.Save "${saveFile}"`,
-      /^LogBrickSerializer: (.+)$/,
+      /^(LogBrickSerializer|LogTemp): (.+)$/,
       {
         first: match => match[0].endsWith(saveFile + '.brs...'),
-        last: match => match[1].match(/Saved .+ bricks and .+ components from .+ owners|Error: No bricks in grid!/),
+        last: match => match[2].match(/Saved .+ bricks and .+ components from .+ owners|Error: No bricks in grid!/),
         afterMatchDelay: 0,
         timeoutDelay: 30000
       },

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);
     });
   });
 }

package/.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}