@builder6/server 0.2.0 → 0.2.3

package/dist/{moleculer/env.config.d.ts → app.config.d.ts}

@@ -1,2 +1,3 @@
+export declare function getEnvConfigs(): any;
 declare const _default: () => any;
 export default _default;

package/dist/{moleculer/env.config.js → app.config.js}

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnvConfigs = getEnvConfigs;
 const dotenvFlow = require("dotenv-flow");
 dotenvFlow.config({
     path: process.cwd(),
@@ -29,10 +30,16 @@ function parseEnvToJSON(env, prefixes) {
     });
     return result;
 }
-exports.default = () => {
+function getEnvConfigs() {
     const env = parseEnvToJSON(process.env, ['STEEDOS_', 'B6_']);
+    return env;
+}
+exports.default = () => {
+    const envConfigs = getEnvConfigs();
+    const b6Configs = global.b6Server?.config || {};
     return {
-        ...env,
+        ...b6Configs,
+        ...envConfigs
     };
 };
-//# sourceMappingURL=env.config.js.map
+//# sourceMappingURL=app.config.js.map

package/dist/{moleculer/env.config.js.map → app.config.js.map}

@@ -1 +1 @@
-{"version":3,"file":"env.config.js","sourceRoot":"","sources":["../../src/moleculer/env.config.ts"],"names":[],"mappings":";;AACA,0CAA0C;AAE1C,UAAU,CAAC,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;IACnB,MAAM,EAAE,IAAI;CACf,CAAC,CAAC;AAGH,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AAC7E,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;AAQtH,SAAS,cAAc,CAAC,GAAG,EAAE,QAAQ;IACjC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAE7B,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO;QACX,CAAC;QAGD,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1F,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,OAAO,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACtB,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAE5B,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBAEJ,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC9B,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,kBAAe,GAAG,EAAE;IAChB,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAQ,CAAC;IACpE,OAAO;QACH,GAAG,GAAG;KACT,CAAA;AACL,CAAC,CAAA"}
+{"version":3,"file":"app.config.js","sourceRoot":"","sources":["../src/app.config.ts"],"names":[],"mappings":";;AA+CA,sCAGC;AAjDD,0CAA0C;AAE1C,UAAU,CAAC,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;IACnB,MAAM,EAAE,IAAI;CACf,CAAC,CAAC;AAGH,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AAC7E,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;AAQtH,SAAS,cAAc,CAAC,GAAG,EAAE,QAAQ;IACjC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAE7B,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,OAAO;QACX,CAAC;QAGD,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;QAC1F,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,OAAO,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YACtB,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAE5B,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/D,CAAC;iBAAM,CAAC;gBAEJ,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC9B,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACzB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,aAAa;IACzB,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAQ,CAAC;IACpE,OAAO,GAAG,CAAC;AACf,CAAC;AAED,kBAAe,GAAG,EAAE;IAChB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC;IAChD,OAAO;QACH,GAAG,SAAS;QACZ,GAAG,UAAU;KAChB,CAAA;AACL,CAAC,CAAA"}

package/dist/app.module.js

@@ -19,7 +19,7 @@ const moleculer_module_1 = require("./moleculer/moleculer.module");
 const microsoft365_module_1 = require("./microsoft365/microsoft365.module");
 const oidc_module_1 = require("./oidc/oidc.module");
 const app_controller_1 = require("./app.controller");
-const moleculer_config_1 = require("./moleculer/moleculer.config");
+const app_config_1 = require("./app.config");
 let AppModule = class AppModule {
 };
 exports.AppModule = AppModule;
@@ -28,7 +28,7 @@ exports.AppModule = AppModule = __decorate([
         imports: [
             config_1.ConfigModule.forRoot({
                 envFilePath: ['.env.local', '.env'],
-                load: [moleculer_config_1.default],
+                load: [app_config_1.default],
                 isGlobal: true,
             }),
             auth_module_1.AuthModule,

package/dist/app.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAE9C,6DAAyD;AACzD,0DAAsD;AACtD,oDAAgD;AAChD,6DAAyD;AACzD,uDAAmD;AACnD,uDAAmD;AACnD,mEAA+D;AAC/D,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,mEAAkD;AAsB3C,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IApBrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;gBACnC,IAAI,EAAE,CAAC,0BAAM,CAAC;gBACd,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,wBAAU;YACV,8BAAa;YACb,8BAAa;YACb,4BAAY;YACZ,0BAAW;YACX,0BAAW;YACX,kCAAe;YACf,wCAAkB;YAClB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,wBAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG"}
+{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAE9C,6DAAyD;AACzD,0DAAsD;AACtD,oDAAgD;AAChD,6DAAyD;AACzD,uDAAmD;AACnD,uDAAmD;AACnD,mEAA+D;AAC/D,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,6CAAkC;AAsB3B,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IApBrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;gBACnC,IAAI,EAAE,CAAC,oBAAM,CAAC;gBACd,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,wBAAU;YACV,8BAAa;YACb,8BAAa;YACb,4BAAY;YACZ,0BAAW;YACX,0BAAW;YACX,kCAAe;YACf,wCAAkB;YAClB,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,wBAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG"}

package/dist/b6.config.js

@@ -1,6 +1,4 @@
 module.exports = {
-    plugin: {
-        npmrc: `registry=${process.env.NPM_REGISTRY_URL}`,
-    }
+    plugin: {}
 };
 //# sourceMappingURL=b6.config.js.map

package/dist/b6.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"b6.config.js","sourceRoot":"","sources":["../src/b6.config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,MAAM,EAAE;QACJ,KAAK,EAAE,YAAY,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;KACpD;CACJ,CAAA"}
+{"version":3,"file":"b6.config.js","sourceRoot":"","sources":["../src/b6.config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACb,MAAM,EAAE,EACP;CACJ,CAAA"}

package/dist/b6.server.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("@nestjs/common");
 const app_express_1 = require("./app.express");
 const project = require("../package.json");
+const app_config_1 = require("./app.config");
 const childProcess = require('child_process');
 var semver = require('semver');
 if (!semver.satisfies(process.version, ">=14.0.0")) {
@@ -22,6 +23,7 @@ var knownOpts = {
     "config": [path],
     "title": String,
     "userDir": [path],
+    "npmPackages": String,
     "verbose": Boolean,
     "safe": Boolean,
     "version": Boolean,
@@ -33,6 +35,7 @@ var shortHands = {
     "s": ["--config"],
     "t": ["--help"],
     "u": ["--userDir"],
+    "n": ["--npmPackages"],
     "v": ["--verbose"],
     "D": ["--define"]
 };
@@ -70,12 +73,13 @@ class B6Server {
         if (this.parsedArgs.help) {
             console.log("B6 Server v" + project.version);
             console.log("Usage: b6server [-v] [-?] [--config b6.config.js] [--userDir DIR]");
-            console.log("                [--port PORT] [--title TITLE] [--safe] [plugins]");
+            console.log("                [--port PORT] [--title TITLE] [--safe] [services]");
             console.log("");
             console.log("Options:");
-            console.log("  -p, --port     PORT  port to listen on");
-            console.log("  -s, --config FILE  use specified config file");
-            console.log("  -u, --userDir  DIR   use specified user directory");
+            console.log("  -p, --port           port to listen on");
+            console.log("  -s, --config         specified config file");
+            console.log("  -n, --npmPackages    install specified npm packages");
+            console.log("  -u, --userDir        use specified user directory");
             console.log("  -v, --verbose        enable verbose output");
             console.log("      --safe           enable safe mode");
             console.log("      --version        show version information");
@@ -124,7 +128,12 @@ class B6Server {
             }
         }
         try {
-            this.config = require(this.configFile);
+            const configJs = require(this.configFile);
+            this.config = {
+                ...configJs,
+                ...(0, app_config_1.getEnvConfigs)(),
+            };
+            console.log('configJs', configJs);
             this.userDir = path.dirname(this.configFile);
             this.config.configFile = this.configFile;
         }
@@ -154,10 +163,12 @@ class B6Server {
                 this.config.port = 5100;
             }
         }
+        this.config.plugin = this.config.plugin || {};
+        if (this.parsedArgs.npmPackages !== undefined) {
+            this.config.plugin.packages = this.parsedArgs.npmPackages;
+        }
         if (this.parsedArgs.argv.remain.length > 0) {
-            this.config.plugin = {
-                packages: this.parsedArgs.argv.remain[0]
-            };
+            this.config.plugin.services = this.parsedArgs.argv.remain[0];
         }
         this.config.userDir = this.userDir;
         this.logger.log('Loaded config', this.config);
@@ -265,10 +276,11 @@ class B6Server {
         }
     }
     async bootstrap() {
-        await server.loadConfig();
-        await server.updatePackage();
-        const app = await (0, app_express_1.default)();
-        await app.listen(this.config.port);
+        await this.loadConfig();
+        await this.updateNpmrc();
+        await this.updatePackage();
+        this.app = await (0, app_express_1.default)();
+        await this.app.listen(this.config.port);
     }
 }
 const server = global.b6Server = new B6Server(parsedArgs);

package/dist/b6.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.ts"],"names":[],"mappings":";;;AAkBA,2CAAwC;AAExC,+CAA+C;AAC/C,2CAA2C;AAE3C,MAAM,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;AAE7C,IAAI,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAC/B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,iCAAiC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC;IACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC;AAED,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AACxB,+BAA+B;AAG/B,IAAI,SAAS,GAAG;IACZ,MAAM,EAAE,OAAO;IACf,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,CAAC,IAAI,CAAC;IAChB,OAAO,EAAE,MAAM;IACf,SAAS,EAAE,CAAC,IAAI,CAAC;IACjB,SAAS,EAAE,OAAO;IAClB,MAAM,EAAE,OAAO;IACf,SAAS,EAAE,OAAO;IAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC;CAC5B,CAAC;AACF,IAAI,UAAU,GAAG;IACb,GAAG,EAAC,CAAC,QAAQ,CAAC;IACd,GAAG,EAAC,CAAC,QAAQ,CAAC;IACd,GAAG,EAAC,CAAC,UAAU,CAAC;IAGhB,GAAG,EAAC,CAAC,QAAQ,CAAC;IACd,GAAG,EAAC,CAAC,WAAW,CAAC;IACjB,GAAG,EAAC,CAAC,WAAW,CAAC;IACjB,GAAG,EAAC,CAAC,UAAU,CAAC;CACnB,CAAC;AACF,IAAI,CAAC,cAAc,GAAG,UAAS,CAAC,EAAC,CAAC,EAAC,CAAC;AAEpC,CAAC,CAAA;AAED,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,EAAC,UAAU,EAAC,OAAO,CAAC,IAAI,EAAC,CAAC,CAAC,CAAA;AAE1D,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS,CAAC;AAGvD,MAAM,MAAM,GAAG;IACX,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;CACvB,CAAA;AAED,MAAM,QAAQ;IAiBV,YAAa,UAAU;QAhBvB,YAAO,GAAW,OAAO,CAAC,GAAG,EAAE,CAAC;QAcf,WAAM,GAAG,IAAI,eAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAGhD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAA;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,IAAI,EAAE,CAAA;QAElC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,OAAO,CAAA;QAEjC,IAAI,CAAC,MAAM,GAAG,EAAE,CAAA;QAGhB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;QACpB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAA;QAItB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QAExB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;QACtB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QAExB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAA;QACvB,IAAI,CAAC,iBAAiB,GAAG,CAAC,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,UAAU;QAEd,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC;YACjF,OAAO,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACxB,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,gDAAgD,CAAC,CAAC;YAC9D,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAC;YACnE,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,oDAAoD,CAAC,CAAC;YAClE,OAAO,CAAC,IAAI,EAAE,CAAC;QACnB,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAC1B,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YAChD,OAAO,CAAC,GAAG,CAAC,UAAU,GAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACvC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,GAAC,GAAG,GAAC,EAAE,CAAC,OAAO,EAAE,GAAC,GAAG,GAAC,EAAE,CAAC,IAAI,EAAE,GAAC,GAAG,GAAC,EAAE,CAAC,UAAU,EAAE,CAAC,CAAA;YACzE,OAAO,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YAEzB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;QAC7C,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAC,cAAc,CAAC,CAAC,EAAE,CAAC;YAErG,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAC,cAAc,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACJ,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAC,cAAc,CAAC,CAAC,EAAE,CAAC;gBAE/D,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAC,cAAc,CAAC,CAAC;YACpE,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACrG,OAAO,CAAC,GAAG,CAAC,kGAAkG,CAAC,CAAA;oBAC/G,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;gBACnB,CAAC;gBACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAC,KAAK,CAAC,CAAC;gBAC/H,IAAI,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAC,cAAc,CAAC,CAAC;gBAC5D,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;oBAEhC,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACJ,IAAI,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,cAAc,CAAC,CAAC;oBACxD,IAAI,UAAU,GAAG,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;oBAC5C,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;wBAE3D,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAC,cAAc,CAAC,CAAC;wBAC1C,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC;oBACrC,CAAC;yBAAM,CAAC;wBAEJ,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC;oBACpC,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YACD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC7C,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7C,CAAC;QAAC,OAAM,GAAG,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,6BAA6B,GAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC1D,IAAI,GAAG,CAAC,IAAI,IAAI,kBAAkB,EAAE,CAAC;gBACjC,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAChC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;QAC7B,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAE,EAAE,CAAC;YACpH,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC9B,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,SAAS,EAAC,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,EAAC,CAAC;gBAClC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YAC1B,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG;gBACnB,QAAQ,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;aACzC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhD,CAAC;IACD,iBAAiB;QAGf,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,EAAE,CAAC;YACrB,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;gBAChE,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;oBACtB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC;oBACrC,SAAS,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;gBAC5B,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IACD,KAAK,CAAC,WAAW;QAEf,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACD,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;YAC1D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAA;gBAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAE,CAAA;gBAC/C,MAAM,KAAK,CAAA;YACf,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IAAI,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACD,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;gBAC5B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAA;oBAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;oBACnD,MAAM,KAAK,CAAA;gBACf,CAAC;YACL,CAAC;QACL,CAAC;IAEH,CAAC;IACD,KAAK,CAAC,aAAa;QACf,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;QAC3D,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;YAEhC,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QACjH,CAAC;QACD,MAAM,cAAc,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;QACzE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QACtC,MAAM,oBAAoB,GAAG,GAAG,CAAC,YAAY,IAAI,EAAE,CAAA;QACnD,MAAM,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEpD,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACzD,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAErD,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,IAAI,eAAe,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;YAClD,OAAO,GAAG,IAAI,CAAA;QAClB,CAAC;aAAM,CAAC;YACJ,eAAe,CAAC,IAAI,EAAE,CAAA;YACtB,aAAa,CAAC,IAAI,EAAE,CAAA;YACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC9C,IAAI,eAAe,CAAC,CAAC,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1C,OAAO,GAAG,IAAI,CAAA;oBACd,MAAK;gBACT,CAAC;gBACD,IAAI,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBACpF,OAAO,GAAG,IAAI,CAAA;oBACd,MAAK;gBACT,CAAC;YACL,CAAC;QACL,CAAC;QAED,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,UAAU,CAAA;YAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,kBAAkB,CAAC,CAAA;YACpE,GAAG,CAAC,YAAY,GAAG,kBAAkB,CAAA;YACrC,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;YAC3D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAC9D,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAA;YACnE,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACzC,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAC5B,UAAU,EACV,CAAC,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,sBAAsB,EAAE,WAAW,CAAC,EAC5E,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;gBAClF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAE,CAAA;gBACrC,CAAC,CAAC,CAAA;gBACF,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAE,CAAA;gBACnC,CAAC,CAAC,CAAA;gBACF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAE,CAAA;gBAC7C,CAAC,CAAC,CAAA;gBACF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;oBACvB,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;wBACb,OAAO,EAAE,CAAA;oBACb,CAAC;yBAAM,CAAC;wBACJ,MAAM,CAAC,IAAI,KAAK,CAAC,oDAAoD,IAAI,WAAW,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAA;oBAC5G,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBAGX,EAAE,CAAC,aAAa,CAAC,WAAW,EAAE,cAAc,CAAC,CAAA;gBAC7C,MAAM,GAAG,CAAA;YACb,CAAC,CAAC,CAAA;QACN,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,SAAS;QACX,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1B,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;QAC7B,MAAM,GAAG,GAAG,MAAM,IAAA,qBAAkB,GAAE,CAAC;QAEvC,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;CACF;AAED,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC1D,MAAM,CAAC,SAAS,EAAE,CAAC"}
+{"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.ts"],"names":[],"mappings":"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"}

package/dist/moleculer/moleculer.config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const env_config_1 = require("./env.config");
+const app_config_1 = require("../app.config");
 const defaultConfig = {
     namespace: "steedos",
     nodeID: null,
@@ -66,13 +66,10 @@ const defaultConfig = {
     stopped(broker) {
     }
 };
-const b6ServerConfig = global.b6Server?.config || {};
-const envConfig = (0, env_config_1.default)();
 exports.default = () => {
     return {
         ...defaultConfig,
-        ...b6ServerConfig,
-        ...envConfig
+        ...(0, app_config_1.default)(),
     };
 };
 //# sourceMappingURL=moleculer.config.js.map

package/dist/moleculer/moleculer.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"moleculer.config.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAGb,6CAAkC;AASlC,MAAM,aAAa,GAAG;IAClB,SAAS,EAAE,SAAS;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,EAAE;IAEZ,MAAM,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YAEL,KAAK,EAAE,MAAM;YAEb,MAAM,EAAE,IAAI;YAEZ,YAAY,EAAE,KAAK;YAEnB,SAAS,EAAE,wCAAwC;YAEnD,aAAa,EAAE,IAAI;YAEnB,WAAW,EAAE,KAAK;SACrB;KACJ;IAED,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IAEpC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;IAE1B,UAAU,EAAE,MAAM;IAElB,cAAc,EAAE,CAAC;IAEjB,WAAW,EAAE;QACT,OAAO,EAAE,KAAK;KACjB;IAED,YAAY,EAAE,GAAG;IAEjB,iBAAiB,EAAE,EAAE;IACrB,gBAAgB,EAAE,EAAE;IAEpB,oBAAoB,EAAE,KAAK;IAE3B,QAAQ,EAAE;QACN,OAAO,EAAE,KAAK;KACjB;IAED,eAAe,EAAE,KAAK;IAEtB,QAAQ,EAAE;QACN,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,IAAI;KACpB;IAED,cAAc,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,GAAG;QACd,eAAe,EAAE,EAAE;QACnB,UAAU,EAAE,EAAE;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG;KAC9C;IAED,QAAQ,EAAE;QACN,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,GAAG;KACpB;IAED,SAAS,EAAE,IAAI;IAEf,YAAY,EAAE,IAAI;IAElB,OAAO,EAAE;QACL,OAAO,EAAE,KAAK;KACjB;IAED,OAAO,EAAE;QACL,OAAO,EAAE,KAAK;KACjB;IAED,WAAW,EAAE,EAAE;IAEf,YAAY,EAAE,IAAI;IAElB,4BAA4B,EAAE,IAAI;IAElC,OAAO,CAAC,MAAW;IAEnB,CAAC;IAED,OAAO,CAAC,MAAW;IAEnB,CAAC;IAED,OAAO,CAAC,MAAW;IAEnB,CAAC;CACJ,CAAC;AAEF,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,CAAC;AACrD,MAAM,SAAS,GAAG,IAAA,oBAAM,GAAE,CAAC;AAE3B,kBAAe,GAAG,EAAE;IAClB,OAAO;QACL,GAAG,aAAa;QAChB,GAAG,cAAc;QACjB,GAAG,SAAS;KACb,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"moleculer.config.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAGb,8CAAsC;AAStC,MAAM,aAAa,GAAG;IAClB,SAAS,EAAE,SAAS;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,EAAE;IAEZ,MAAM,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YAEL,KAAK,EAAE,MAAM;YAEb,MAAM,EAAE,IAAI;YAEZ,YAAY,EAAE,KAAK;YAEnB,SAAS,EAAE,wCAAwC;YAEnD,aAAa,EAAE,IAAI;YAEnB,WAAW,EAAE,KAAK;SACrB;KACJ;IAED,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IAEpC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM;IAE1B,UAAU,EAAE,MAAM;IAElB,cAAc,EAAE,CAAC;IAEjB,WAAW,EAAE;QACT,OAAO,EAAE,KAAK;KACjB;IAED,YAAY,EAAE,GAAG;IAEjB,iBAAiB,EAAE,EAAE;IACrB,gBAAgB,EAAE,EAAE;IAEpB,oBAAoB,EAAE,KAAK;IAE3B,QAAQ,EAAE;QACN,OAAO,EAAE,KAAK;KACjB;IAED,eAAe,EAAE,KAAK;IAEtB,QAAQ,EAAE;QACN,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,IAAI;KACpB;IAED,cAAc,EAAE;QACZ,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,GAAG;QACd,eAAe,EAAE,EAAE;QACnB,UAAU,EAAE,EAAE;QACd,YAAY,EAAE,KAAK;QACnB,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG;KAC9C;IAED,QAAQ,EAAE;QACN,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,GAAG;KACpB;IAED,SAAS,EAAE,IAAI;IAEf,YAAY,EAAE,IAAI;IAElB,OAAO,EAAE;QACL,OAAO,EAAE,KAAK;KACjB;IAED,OAAO,EAAE;QACL,OAAO,EAAE,KAAK;KACjB;IAED,WAAW,EAAE,EAAE;IAEf,YAAY,EAAE,IAAI;IAElB,4BAA4B,EAAE,IAAI;IAElC,OAAO,CAAC,MAAW;IAEnB,CAAC;IAED,OAAO,CAAC,MAAW;IAEnB,CAAC;IAED,OAAO,CAAC,MAAW;IAEnB,CAAC;CACJ,CAAC;AAGF,kBAAe,GAAG,EAAE;IAClB,OAAO;QACL,GAAG,aAAa;QAChB,GAAG,IAAA,oBAAS,GAAE;KACf,CAAA;AACH,CAAC,CAAA"}

package/dist/moleculer/moleculer.service.d.ts

@@ -4,8 +4,8 @@ export declare class MoleculerService {
     private broker;
     private readonly logger;
     constructor(configService: ConfigService);
-    loadPlugins(): void;
-    loadPlugin(plugin: any): void;
+    loadServices(): void;
+    loadService(plugin: any): void;
     private isPackageInstalled;
     private getPackagePath;
 }

package/dist/moleculer/moleculer.service.js

@@ -29,18 +29,18 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
         this.broker = new moleculer_1.ServiceBroker({
             ...moleculer_config_1.default,
         });
-        this.loadPlugins();
+        this.loadServices();
         this.broker.start();
     }
-    loadPlugins() {
-        const plugins = this.configService.get("plugin.packages");
+    loadServices() {
+        const plugins = this.configService.get("plugin.services");
         if (plugins) {
             for (const plugin of plugins.split(',')) {
-                this.loadPlugin(plugin);
+                this.loadService(plugin);
             }
         }
     }
-    loadPlugin(plugin) {
+    loadService(plugin) {
         try {
             const match = plugin.match(/^(.*?)(?:@([\d.]+))?$/);
             if (!match) {
@@ -48,7 +48,7 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
                 return;
             }
             const [, packageName, version] = match;
-            this.logger.log(`加载插件: 名称：${packageName}, 版本：${version}`);
+            this.logger.log(`加载插件: 名称：${packageName}`);
             if (!this.isPackageInstalled(packageName)) {
                 this.logger.error(`插件 ${packageName} 未安装，请先安装`);
                 return;
@@ -62,7 +62,7 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
             const serviceSchema = serviceModule.default ? serviceModule.default : serviceModule;
             if (serviceSchema) {
                 this.broker.createService(serviceSchema);
-                this.logger.log(`插件服务已创建: ${packageName}`, serviceSchema);
+                this.logger.log(`插件服务已创建: ${packageName}`);
             }
         }
         catch (err) {

package/dist/moleculer/moleculer.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,yCAA0C;AAC1C,yBAAyB;AACzB,6BAA6B;AAE7B,yDAAiD;AAG1C,IAAM,gBAAgB,wBAAtB,MAAM,gBAAgB;IAI3B,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAF/B,WAAM,GAAG,IAAI,eAAM,CAAC,kBAAgB,CAAC,IAAI,CAAC,CAAC;QAG1D,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC1D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACjD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,GAAG,IAAI,yBAAa,CAAC;YAC9B,GAAG,0BAAe;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,WAAW;QAET,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAC1D,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBAKxC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;IAED,UAAU,CAAC,MAAM;QACf,IAAI,CAAC;YAEH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,CAAC,CAAC;gBACtC,OAAO;YACT,CAAC;YAED,MAAM,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC;YACvC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,WAAW,QAAQ,OAAO,EAAE,CAAC,CAAC;YAG1D,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW,WAAW,CAAC,CAAC;gBAChD,OAAO;YACT,CAAC;YAGD,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CACrC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAChC,2BAA2B,CAC5B,CAAC;YAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,WAAW,UAAU,kBAAkB,EAAE,CAAC,CAAC;gBACnE,OAAO;YACT,CAAC;YAGD,MAAM,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAClD,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAA,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAA;YAClF,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBACzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,WAAW,EAAE,EAAE,aAAa,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,MAAM,SAAU,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;QACrE,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,WAAmB;QAC5C,IAAI,CAAC;YACH,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,cAAc,CAAC,WAAmB;QACxC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,CAAC,CAAC,CAAC;QACtE,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,aAAa,WAAW,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;CACF,CAAA;AAxFY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAKwB,sBAAa;GAJrC,gBAAgB,CAwF5B"}
+{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder6/server",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "",
   "author": "",
   "license": "AGPL-3.0-only",