@builder6/server 0.5.2 → 0.5.4

package/dist/app.module.js

@@ -15,7 +15,7 @@ const core_2 = require("@builder6/core");
 const steedos_module_1 = require("./steedos/steedos.module");
 const rooms_module_1 = require("./rooms/rooms.module");
 const files_module_1 = require("./files/files.module");
-const moleculer_module_1 = require("./moleculer/moleculer.module");
+const moleculer_1 = require("@builder6/moleculer");
 const microsoft365_module_1 = require("./microsoft365/microsoft365.module");
 const oidc_module_1 = require("./oidc/oidc.module");
 const app_controller_1 = require("./app.controller");
@@ -33,13 +33,17 @@ exports.AppModule = AppModule = __decorate([
                 load: [app_config_1.default],
                 isGlobal: true,
             }),
+            moleculer_1.MoleculerModule.forRoot({
+                brokerName: "builder6",
+                namespace: "steedos",
+                transporter: process.env.B6_TRANSPORTER,
+            }),
             core_2.AuthModule,
             core_1.MongodbModule,
             steedos_module_1.SteedosModule,
             tables_module_1.TablesModule,
             rooms_module_1.RoomsModule,
             files_module_1.FilesModule,
-            moleculer_module_1.MoleculerModule,
             microsoft365_module_1.Microsoft365Module,
             email_1.EmailModule,
             plugin_module_1.PluginModule.forRoot(),

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,yCAA+C;AAC/C,0DAAsD;AACtD,yCAA4C;AAC5C,6DAAyD;AACzD,uDAAmD;AACnD,uDAAmD;AACnD,mEAA+D;AAC/D,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,0DAAsD;AACtD,2CAA8C;AAC9C,6CAAqC;AAwB9B,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IAtBrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;gBACnC,IAAI,EAAE,CAAC,oBAAS,CAAC;gBACjB,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,iBAAU;YACV,oBAAa;YACb,8BAAa;YACb,4BAAY;YACZ,0BAAW;YACX,0BAAW;YACX,kCAAe;YACf,wCAAkB;YAClB,mBAAW;YACX,4BAAY,CAAC,OAAO,EAAE;YACtB,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,yCAA+C;AAC/C,0DAAsD;AACtD,yCAA4C;AAC5C,6DAAyD;AACzD,uDAAmD;AACnD,uDAAmD;AACnD,mDAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,0DAAsD;AACtD,2CAA8C;AAC9C,6CAAqC;AA6B9B,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IA3BrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,CAAC;gBACnC,IAAI,EAAE,CAAC,oBAAS,CAAC;gBACjB,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAAe,CAAC,OAAO,CAAC;gBACpB,UAAU,EAAE,UAAU;gBACtB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;aAE1C,CAAC;YACF,iBAAU;YACV,oBAAa;YACb,8BAAa;YACb,4BAAY;YACZ,0BAAW;YACX,0BAAW;YACX,wCAAkB;YAClB,mBAAW;YACX,4BAAY,CAAC,OAAO,EAAE;YACtB,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/microsoft365/microsoft365.controller.js

@@ -77,7 +77,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], Microsoft365Controller.prototype, "getSite", null);
 exports.Microsoft365Controller = Microsoft365Controller = __decorate([
-    (0, common_1.Controller)('microsoft365'),
+    (0, common_1.Controller)('api/v6/microsoft365'),
     __metadata("design:paramtypes", [microsoft365_service_1.Microsoft365Service])
 ], Microsoft365Controller);
 //# sourceMappingURL=microsoft365.controller.js.map

package/dist/microsoft365/microsoft365.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"microsoft365.controller.js","sourceRoot":"","sources":["../../src/microsoft365/microsoft365.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"microsoft365.controller.js","sourceRoot":"","sources":["../../src/microsoft365/microsoft365.controller.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-const app_config_1 = require("../app.config");
+const app_config_1 = require("./app.config");
 const defaultConfig = {
     namespace: 'steedos',
     nodeID: null,
@@ -16,8 +16,8 @@ const defaultConfig = {
             autoPadding: false,
         },
     },
-    transporter: process.env.TRANSPORTER,
-    cacher: process.env.CACHER,
+    transporter: process.env.B6_TRANSPORTER,
+    cacher: process.env.B6_CACHER,
     serializer: 'JSON',
     requestTimeout: 0,
     retryPolicy: {

package/dist/moleculer.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"moleculer.config.js","sourceRoot":"","sources":["../src/moleculer.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAGb,6CAAqC;AASrC,MAAM,aAAa,GAAG;IACpB,SAAS,EAAE,SAAS;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,EAAE;IAEZ,MAAM,EAAE;QACN,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YAEP,KAAK,EAAE,MAAM;YAEb,MAAM,EAAE,IAAI;YAEZ,YAAY,EAAE,KAAK;YAEnB,SAAS,EAAE,wCAAwC;YAEnD,aAAa,EAAE,IAAI;YAEnB,WAAW,EAAE,KAAK;SACnB;KACF;IAED,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IAEvC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAE7B,UAAU,EAAE,MAAM;IAElB,cAAc,EAAE,CAAC;IAEjB,WAAW,EAAE;QACX,OAAO,EAAE,KAAK;KACf;IAED,YAAY,EAAE,GAAG;IAEjB,iBAAiB,EAAE,EAAE;IACrB,gBAAgB,EAAE,EAAE;IAEpB,oBAAoB,EAAE,KAAK;IAE3B,QAAQ,EAAE;QACR,OAAO,EAAE,KAAK;KACf;IAED,eAAe,EAAE,KAAK;IAEtB,QAAQ,EAAE;QACR,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,IAAI;KAClB;IAED,cAAc,EAAE;QACd,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;KAC5C;IAED,QAAQ,EAAE;QACR,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,GAAG;KAClB;IAED,SAAS,EAAE,IAAI;IAEf,YAAY,EAAE,IAAI;IAElB,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IAED,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IAED,WAAW,EAAE,EAAE;IAEf,YAAY,EAAE,IAAI;IAElB,4BAA4B,EAAE,IAAI;IAElC,OAAO,CAAC,MAAW,IAAG,CAAC;IAEvB,OAAO,CAAC,MAAW;IAEnB,CAAC;IAED,OAAO,CAAC,MAAW;IAEnB,CAAC;CACF,CAAC;AAEF,kBAAe,GAAG,EAAE;IAClB,OAAO;QACL,GAAG,aAAa;QAChB,GAAG,IAAA,oBAAS,GAAE;KACf,CAAC;AACJ,CAAC,CAAC"}

package/dist/{moleculer → plugin}/moleculer.service.d.ts

@@ -1,9 +1,10 @@
 import { ConfigService } from '@nestjs/config';
-export declare class MoleculerService {
+import { ServiceBroker } from 'moleculer';
+export declare class MoleculerPluginService {
     private configService;
-    private broker;
+    private readonly broker;
     private readonly logger;
-    constructor(configService: ConfigService);
+    constructor(configService: ConfigService, broker: ServiceBroker);
     loadServices(): void;
     loadService(plugin: any): void;
     private getPackagePath;

package/dist/{moleculer → plugin}/moleculer.service.js

@@ -8,29 +8,29 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var MoleculerService_1;
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var MoleculerPluginService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MoleculerService = void 0;
+exports.MoleculerPluginService = void 0;
 const common_1 = require("@nestjs/common");
 const config_1 = require("@nestjs/config");
 const moleculer_1 = require("moleculer");
 const fs = require("fs");
 const path = require("path");
-const moleculer_config_1 = require("./moleculer.config");
-let MoleculerService = MoleculerService_1 = class MoleculerService {
-    constructor(configService) {
+const moleculer_2 = require("@builder6/moleculer");
+let MoleculerPluginService = MoleculerPluginService_1 = class MoleculerPluginService {
+    constructor(configService, broker) {
         this.configService = configService;
-        this.logger = new common_1.Logger(MoleculerService_1.name);
+        this.broker = broker;
+        this.logger = new common_1.Logger(MoleculerPluginService_1.name);
         const transporter = this.configService.get('transporter');
         if (!transporter) {
             console.error('B6_TRANSPORTER env is required.');
             return;
         }
-        this.broker = new moleculer_1.ServiceBroker({
-            ...moleculer_config_1.default,
-        });
         this.loadServices();
-        this.broker.start();
     }
     loadServices() {
         const plugins = this.configService.get('plugin.services');
@@ -63,8 +63,9 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
                 ? serviceModule.default
                 : serviceModule;
             if (serviceSchema) {
-                this.broker.createService(serviceSchema);
-                this.logger.log(`插件服务已创建: ${packageName}`);
+                const service = this.broker.createService(serviceSchema);
+                this.broker._restartService(service);
+                this.logger.log(`插件服务已加载: ${packageName}`);
             }
         }
         catch (err) {
@@ -86,9 +87,11 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
         }
     }
 };
-exports.MoleculerService = MoleculerService;
-exports.MoleculerService = MoleculerService = MoleculerService_1 = __decorate([
+exports.MoleculerPluginService = MoleculerPluginService;
+exports.MoleculerPluginService = MoleculerPluginService = MoleculerPluginService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [config_1.ConfigService])
-], MoleculerService);
+    __param(1, (0, moleculer_2.InjectBroker)()),
+    __metadata("design:paramtypes", [config_1.ConfigService,
+        moleculer_1.ServiceBroker])
+], MoleculerPluginService);
 //# sourceMappingURL=moleculer.service.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/plugin/moleculer.service.ts"],"names":[],"mappings":"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"}

package/dist/plugin/plugin.module.js

@@ -13,6 +13,8 @@ const fs = require("fs");
 const path = require("path");
 const plugin_service_1 = require("./plugin.service");
 const app_config_1 = require("../app.config");
+const moleculer_service_1 = require("./moleculer.service");
+const moleculer_1 = require("@builder6/moleculer");
 let PluginModule = PluginModule_1 = class PluginModule {
     static forRoot() {
         const modules = this.config.plugin.modules;
@@ -61,7 +63,10 @@ PluginModule.config = (0, app_config_1.default)();
 PluginModule.plugins = [];
 exports.PluginModule = PluginModule = PluginModule_1 = __decorate([
     (0, common_1.Module)({
-        providers: [plugin_service_1.PluginService],
+        imports: [
+            moleculer_1.MoleculerModule.forRoot({})
+        ],
+        providers: [plugin_service_1.PluginService, moleculer_service_1.MoleculerPluginService],
     })
 ], PluginModule);
 //# sourceMappingURL=plugin.module.js.map

package/dist/plugin/plugin.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA+D;AAC/D,yBAAyB;AACzB,6BAA6B;AAC7B,qDAAiD;AACjD,8CAAqC;AAK9B,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAKvB,MAAM,CAAC,OAAO;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;oBAChB,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,YAAY;iBACrB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO;YACL,MAAM,EAAE,cAAY;YACpB,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACzC,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,WAAmB;QAEnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CACpC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAChC,yBAAyB,CAC1B,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,aAAa,WAAW,UAAU,iBAAiB,EAAE,CACtD,CAAC;YACF,OAAO;QACT,CAAC;QAID,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,WAAW,MAAM,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAEhD,OAAO,YAAY,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,WAAmB;QACvC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,CACjB,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,EAAE;gBAC7C,KAAK,EAAE;oBACL,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC;oBACpD,GAAG,MAAM,CAAC,KAAK;iBAChB;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;;AA1DU,oCAAY;AACP,mBAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,AAAhC,CAAiC;AAChD,mBAAM,GAAG,IAAA,oBAAS,GAAE,AAAd,CAAe;AACd,oBAAO,GAAa,EAAE,AAAf,CAAgB;uBAH1B,YAAY;IAHxB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,8BAAa,CAAC;KAC3B,CAAC;GACW,YAAY,CA2DxB"}
+{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA+D;AAC/D,yBAAyB;AACzB,6BAA6B;AAC7B,qDAAiD;AACjD,8CAAqC;AACrC,2DAA6D;AAC7D,mDAAsD;AAS/C,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAKvB,MAAM,CAAC,OAAO;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QAC3C,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;oBAChB,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,YAAY;iBACrB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO;YACL,MAAM,EAAE,cAAY;YACpB,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACzC,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,WAAmB;QAEnC,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CACpC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAChC,yBAAyB,CAC1B,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,aAAa,WAAW,UAAU,iBAAiB,EAAE,CACtD,CAAC;YACF,OAAO;QACT,CAAC;QAID,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,WAAW,MAAM,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAEhD,OAAO,YAAY,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,WAAmB;QACvC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,CACjB,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,EAAE;gBAC7C,KAAK,EAAE;oBACL,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC;oBACpD,GAAG,MAAM,CAAC,KAAK;iBAChB;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;;AA1DU,oCAAY;AACP,mBAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,AAAhC,CAAiC;AAChD,mBAAM,GAAG,IAAA,oBAAS,GAAE,AAAd,CAAe;AACd,oBAAO,GAAa,EAAE,AAAf,CAAgB;uBAH1B,YAAY;IAPxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACH,2BAAe,CAAC,OAAO,CAAC,EACvB,CAAC;SACP;QACD,SAAS,EAAE,CAAC,8BAAa,EAAE,0CAAsB,CAAC;KACnD,CAAC;GACW,YAAY,CA2DxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder6/server",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "",
   "author": "",
   "license": "AGPL-3.0-only",
@@ -29,8 +29,9 @@
     "test:e2e": "jest --config ./test/jest-e2e.json"
   },
   "dependencies": {
-    "@builder6/core": "^0.5.2",
-    "@builder6/email": "^0.5.2",
+    "@builder6/core": "^0.5.4",
+    "@builder6/email": "^0.5.4",
+    "@builder6/moleculer": "^0.5.4",
     "@nestjs/common": "^9.0.0",
     "@nestjs/config": "^3.3.0",
     "@nestjs/core": "^9.0.0",
@@ -110,5 +111,5 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   },
-  "gitHead": "47d3d61e53f81abcda69bd9b7a4d157c9de4a466"
+  "gitHead": "e8a62cf2a20c2a4be6d05b6966d5afbfd5e95949"
 }

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

@@ -1 +0,0 @@
-{"version":3,"file":"moleculer.config.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAGb,8CAAsC;AAStC,MAAM,aAAa,GAAG;IACpB,SAAS,EAAE,SAAS;IACpB,MAAM,EAAE,IAAI;IACZ,QAAQ,EAAE,EAAE;IAEZ,MAAM,EAAE;QACN,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YAEP,KAAK,EAAE,MAAM;YAEb,MAAM,EAAE,IAAI;YAEZ,YAAY,EAAE,KAAK;YAEnB,SAAS,EAAE,wCAAwC;YAEnD,aAAa,EAAE,IAAI;YAEnB,WAAW,EAAE,KAAK;SACnB;KACF;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;QACX,OAAO,EAAE,KAAK;KACf;IAED,YAAY,EAAE,GAAG;IAEjB,iBAAiB,EAAE,EAAE;IACrB,gBAAgB,EAAE,EAAE;IAEpB,oBAAoB,EAAE,KAAK;IAE3B,QAAQ,EAAE;QACR,OAAO,EAAE,KAAK;KACf;IAED,eAAe,EAAE,KAAK;IAEtB,QAAQ,EAAE;QACR,QAAQ,EAAE,YAAY;QACtB,WAAW,EAAE,IAAI;KAClB;IAED,cAAc,EAAE;QACd,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;KAC5C;IAED,QAAQ,EAAE;QACR,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,GAAG;KAClB;IAED,SAAS,EAAE,IAAI;IAEf,YAAY,EAAE,IAAI;IAElB,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IAED,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IAED,WAAW,EAAE,EAAE;IAEf,YAAY,EAAE,IAAI;IAElB,4BAA4B,EAAE,IAAI;IAElC,OAAO,CAAC,MAAW,IAAG,CAAC;IAEvB,OAAO,CAAC,MAAW;IAEnB,CAAC;IAED,OAAO,CAAC,MAAW;IAEnB,CAAC;CACF,CAAC;AAEF,kBAAe,GAAG,EAAE;IAClB,OAAO;QACL,GAAG,aAAa;QAChB,GAAG,IAAA,oBAAS,GAAE;KACf,CAAC;AACJ,CAAC,CAAC"}

package/dist/moleculer/moleculer.module.d.ts

@@ -1,2 +0,0 @@
-export declare class MoleculerModule {
-}

package/dist/moleculer/moleculer.module.js

@@ -1,20 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MoleculerModule = void 0;
-const common_1 = require("@nestjs/common");
-const moleculer_service_1 = require("./moleculer.service");
-let MoleculerModule = class MoleculerModule {
-};
-exports.MoleculerModule = MoleculerModule;
-exports.MoleculerModule = MoleculerModule = __decorate([
-    (0, common_1.Module)({
-        providers: [moleculer_service_1.MoleculerService],
-    })
-], MoleculerModule);
-//# sourceMappingURL=moleculer.module.js.map

package/dist/moleculer/moleculer.module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"moleculer.module.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2DAAuD;AAKhD,IAAM,eAAe,GAArB,MAAM,eAAe;CAAG,CAAA;AAAlB,0CAAe;0BAAf,eAAe;IAH3B,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,oCAAgB,CAAC;KAC9B,CAAC;GACW,eAAe,CAAG"}

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

@@ -1 +0,0 @@
-{"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,YAAY,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAED,YAAY;QAEV,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,WAAW,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC;IAED,WAAW,CAAC,MAAM;QAChB,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,aAAa,MAAM,EAAE,CAAC,CAAC;gBACxC,OAAO;YACT,CAAC;YAED,MAAM,CAAC,EAAE,WAAW,CAAC,GAAG,KAAK,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,WAAW,EAAE,CAAC,CAAC;YAG7C,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,WAAW,WAAW,CAAC,CAAC;gBAClD,OAAO;YACT,CAAC;YAGD,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CACrC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,EAChC,0BAA0B,CAC3B,CAAC;YAEF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,MAAM,WAAW,UAAU,kBAAkB,EAAE,CAChD,CAAC;gBACF,OAAO;YACT,CAAC;YAID,MAAM,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;YAClD,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO;gBACzC,CAAC,CAAC,aAAa,CAAC,OAAO;gBACvB,CAAC,CAAC,aAAa,CAAC;YAClB,IAAI,aAAa,EAAE,CAAC;gBAClB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBACzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,WAAW,EAAE,CAAC,CAAC;YAC7C,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,cAAc,CAAC,WAAmB;QACxC,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,CACjB,OAAO,CAAC,OAAO,CAAC,GAAG,WAAW,eAAe,EAAE;gBAC7C,KAAK,EAAE;oBACL,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,cAAc,CAAC;oBACpD,GAAG,MAAM,CAAC,KAAK;iBAChB;aACF,CAAC,CACH,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF,CAAA;AA5FY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAKwB,sBAAa;GAJrC,gBAAgB,CA4F5B"}