@adaptivestone/framework 5.0.0-beta.1 → 5.0.0-beta.2

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 5.0.0-beta.2
+
+[UPDATE] update deps
+[NEW] add ability to skip mongo model init in CLI env
+[NEW] now each mongo connection on CLI have own name and inslude command name there too (getMongoConnectionName in command)
+
 ### 5.0.0-beta.1
 
 [UPDATE] update deps

package/Cli.js

@@ -12,7 +12,7 @@ class Cli extends BaseCli {
   }
 
   async run() {
-    await this.server.init();
+    await this.server.init({ isSkipModelInit: true, isSkipModelLoading: true });
     const command = process.argv[2]?.toLowerCase();
     await super.run(command, this.args);
     this.app.events.emit('shutdown');

package/commands/GenerateRandomBytes.js

@@ -6,6 +6,8 @@ class GenerateRandomBytes extends AbstractCommand {
     return 'Generate random bytes ising randomBytes from  node:crypto';
   }
 
+  static isShouldInitModels = false;
+
   async run() {
     const sizes = [16, 32, 64, 128, 256];
     for (const size of sizes) {

package/modules/AbstractCommand.js

@@ -11,6 +11,21 @@ class AbstractCommand extends Base {
     return 'Command description. PLEASE PROVIDE IT';
   }
 
+  /**
+   * If true, then this command will load models and init mongo connection
+   */
+  static isShouldInitModels = true;
+
+  /**
+   * Get mongo connection name
+   * @param {String} commandName
+   * @param {array} args
+   * @returns string
+   */
+  static getMongoConnectionName(commandName, args) {
+    return `CLI: ${commandName} ${args.join(' ')}`;
+  }
+
   /**
    * Entry point to every command. This method should be overridden
    * @return {Promise<boolean>} resut

package/modules/AbstractModel.js

@@ -37,17 +37,23 @@ class AbstractModel extends Base {
         }
         // await mongoose.disconnect(); // TODO it have problems with replica-set
       });
+      const connectionParams = {};
+      if (process.env.MONGO_APP_NAME) {
+        connectionParams.appName = process.env.MONGO_APP_NAME;
+      }
       // do not connect on test
-      mongoose.connect(this.app.getConfig('mongo').connectionString, {}).then(
-        () => {
-          this.logger.info('Mongo connection success');
+      mongoose
+        .connect(this.app.getConfig('mongo').connectionString, connectionParams)
+        .then(
+          () => {
+            this.logger.info('Mongo connection success');
 
-          callback();
-        },
-        (error) => {
-          this.logger.error("Can't install mongodb connection", error);
-        },
-      );
+            callback();
+          },
+          (error) => {
+            this.logger.error("Can't install mongodb connection", error);
+          },
+        );
     } else {
       callback();
     }

package/modules/BaseCli.js

@@ -29,8 +29,8 @@ class Cli extends Base {
     return true;
   }
 
-  async printComandTable() {
-    const commands = Object.keys(this.commands);
+  async printCommandTable() {
+    const commands = Object.keys(this.commands).sort();
     const maxLength = commands.reduce((max, c) => Math.max(max, c.length), 0);
     console.log('Available commands:');
     let commandsClasses = [];
@@ -55,17 +55,30 @@ class Cli extends Base {
 
     if (!command) {
       console.log('Please provide command name');
-      await this.printComandTable();
+      await this.printCommandTable();
       return false;
     }
 
     if (!this.commands[command]) {
       console.log(`Command ${command} not found `);
-      await this.printComandTable();
+      await this.printCommandTable();
       return false;
     }
     const { default: Command } = await import(this.commands[command]);
 
+    if (Command.isShouldInitModels) {
+      this.logger.debug(
+        `Command ${command} isShouldInitModels called. If you want to skip loading and init models, please set isShouldInitModels to false in tyou command`,
+      );
+      process.env.MONGO_APP_NAME = Command.getMongoConnectionName(
+        command,
+        args,
+      );
+      await this.server.initAllModels();
+    } else {
+      this.logger.debug(`Command ${command} NOT need to isShouldInitModels`);
+    }
+
     const c = new Command(this.app, this.commands, args);
     let result = false;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptivestone/framework",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.2",
   "description": "Adaptive stone node js framework",
   "main": "index.js",
   "type": "module",

package/server.js

@@ -24,6 +24,10 @@ class Server {
 
   #isInited = false;
 
+  #isModelsInited = false;
+
+  #isModelsLoaded = false;
+
   cli = null;
 
   /**
@@ -93,14 +97,18 @@ class Server {
    * Do an initialization (config reading,  etc)
    * @returns {Promise}
    */
-  async init({ isSkipModelInit = false } = {}) {
+  async init({ isSkipModelInit = false, isSkipModelLoading = false } = {}) {
     if (this.#isInited) {
       return true;
     }
 
     console.time('Server init. Done');
     console.time('Loading config and model files. Time');
-    await Promise.all([this.#initConfigFiles(), this.#loadModelFiles()]);
+    const prom = [this.#initConfigFiles()];
+    if (!isSkipModelLoading) {
+      prom.push(this.#loadModelFiles());
+    }
+    await Promise.all(prom);
     console.timeEnd('Loading config and model files. Time');
 
     if (!isSkipModelInit) {
@@ -119,7 +127,15 @@ class Server {
    * @returns {Promise}
    */
   async initAllModels() {
-    console.time('Initing models. Time');
+    if (this.#isModelsInited) {
+      // already inited
+      return;
+    }
+    const now = performance.now();
+
+    if (!this.#isModelsLoaded) {
+      await this.#loadModelFiles();
+    }
 
     if (this.app.getConfig('mongo').connectionString) {
       for (const [modelName, ModelConstructor] of this.cache
@@ -140,7 +156,10 @@ class Server {
       );
     }
 
-    console.timeEnd('Initing models. Time');
+    this.app.logger.debug(
+      `Inited models in ${(performance.now() - now).toFixed(2)}ms`,
+    );
+    this.#isModelsInited = true;
   }
 
   async #initConfigFiles() {
@@ -198,6 +217,10 @@ class Server {
   }
 
   async #loadModelFiles() {
+    if (this.#isModelsLoaded) {
+      // already inited
+      return true;
+    }
     const dirname = url.fileURLToPath(new URL('.', import.meta.url));
     const files = await getFilesPathWithInheritance({
       internalFolder: path.join(dirname, '/models'),
@@ -223,6 +246,7 @@ class Server {
     for (const model of loadedModels) {
       this.cache.modelConstructors.set(model.name, model.file.default);
     }
+    this.#isModelsLoaded = true;
     return true;
   }