fix some omegga fields being undefined instead of a boolean

brickadia-community · Apr 23, 2023 · f48f3ed · f48f3ed
1 parent 60abf68
commit f48f3ed
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omegga",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "Brickadia server installer, manager, wrapper, configurator, and automator",
   "engines": {
     "node": ">=18.0.0"

diff --git a/src/logger.ts b/src/logger.ts
@@ -1,7 +1,7 @@
 import type Terminal from '@cli/terminal';
 
 export default class Logger {
-  static VERBOSE: boolean;
+  static VERBOSE = false;
   static terminal: Terminal;
 
   /**

diff --git a/src/main.ts b/src/main.ts
@@ -44,7 +44,7 @@ const program = commander
       program.help();
       process.exit(1);
     }
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
 
     // default working directory is the one specified in config
     let workDir = config.store.get('defaultOmegga');
@@ -193,7 +193,8 @@ program
       global: globalAuth,
     }) => {
       const { verbose, debug } = program.opts();
-      Logger.VERBOSE = verbose;
+      Logger.VERBOSE = Boolean(verbose);
+
       const workdirPath = path.join(
         config.store.get('defaultOmegga'),
         'data/Saved/Auth'
@@ -272,7 +273,7 @@ program
       process.exit(1);
     }
     const { verbose, force } = program.opts();
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
     pluginUtil.install(plugins, { verbose, force });
   });
 
@@ -292,7 +293,7 @@ program
       process.exit(1);
     }
     const { verbose, force } = program.opts();
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
     pluginUtil.update(plugins, { verbose, force });
   });
 
@@ -310,7 +311,7 @@ program
       process.exit(1);
     }
     const { verbose } = program.opts();
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
     pluginUtil.check(plugins, { verbose });
   });
 
@@ -320,7 +321,7 @@ program
   .description('Initializes a new plugin with the given name and settings')
   .action(async () => {
     const { verbose } = program.opts();
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
 
     pluginUtil.init();
   });
@@ -331,7 +332,7 @@ program
   .option('-v, --verbose', 'Print extra messages for debugging purposes')
   .action(async () => {
     const { verbose } = program.opts();
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
 
     pluginUtil.init();
   });
@@ -356,7 +357,7 @@ program
     }
     const { verbose } = program.opts();
     const json = program.args.includes('-j') || program.args.includes('--json');
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
     if (!configName) {
       pluginUtil.listConfig(pluginName, json);
     } else {
@@ -386,7 +387,7 @@ program
     }
     const { verbose } = program.opts();
     const yes = program.args.includes('-y') || program.args.includes('--yes');
-    Logger.VERBOSE = verbose;
+    Logger.VERBOSE = Boolean(verbose);
     if (!configName) {
       pluginUtil.resetAllConfigs(pluginName, yes);
     } else if (!configValue) {

diff --git a/src/omegga/plugin/plugin_node_safe/proxyOmegga.ts b/src/omegga/plugin/plugin_node_safe/proxyOmegga.ts
@@ -1,4 +1,3 @@
-import Logger from '@/logger';
 import {
   OmeggaCore,
   OmeggaLike,
@@ -33,13 +32,14 @@ export const bootstrap = (omegga: Omegga): Record<string, unknown[]> => ({
     {
       host: Object.freeze({ ...omegga.host }),
       version: omegga.version,
-      verbose: Logger.VERBOSE,
+      verbose: omegga.verbose,
       savePath: omegga.savePath,
       path: omegga.path,
       configPath: omegga.configPath,
       presetPath: omegga.presetPath,
       starting: omegga.starting,
       started: omegga.started,
+      stopping: omegga.stopping,
       config: omegga.config,
       currentMap: omegga.currentMap,
     },

diff --git a/src/omegga/server.ts b/src/omegga/server.ts
@@ -65,9 +65,9 @@ export default class Omegga extends OmeggaWrapper implements OmeggaLike {
   host?: { id: string; name: string };
   players: OmeggaPlayer[];
 
-  started: boolean;
-  starting: boolean;
-  stopping: boolean;
+  started = false;
+  starting = false;
+  stopping = false;
   currentMap: string;
 
   getServerStatus: () => Promise<IServerStatus>;