@builder6/server 0.2.0 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/dist/{moleculer/env.config.d.ts → app.config.d.ts} +1 -0
  2. package/dist/{moleculer/env.config.js → app.config.js} +10 -3
  3. package/dist/{moleculer/env.config.js.map → app.config.js.map} +1 -1
  4. package/dist/app.module.js +2 -2
  5. package/dist/app.module.js.map +1 -1
  6. package/dist/b6.server.js +23 -12
  7. package/dist/b6.server.js.map +1 -1
  8. package/dist/moleculer/moleculer.config.js +2 -5
  9. package/dist/moleculer/moleculer.config.js.map +1 -1
  10. package/dist/moleculer/moleculer.service.d.ts +2 -2
  11. package/dist/moleculer/moleculer.service.js +7 -7
  12. package/dist/moleculer/moleculer.service.js.map +1 -1
  13. package/package.json +1 -1
package/dist/{moleculer/env.config.d.ts → app.config.d.ts} RENAMED
@@ -1,2 +1,3 @@
1
+ export declare function getEnvConfigs(): any;
1
2
  declare const _default: () => any;
2
3
  export default _default;
package/dist/{moleculer/env.config.js → app.config.js} RENAMED
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getEnvConfigs = getEnvConfigs;
3
4
  const dotenvFlow = require("dotenv-flow");
4
5
  dotenvFlow.config({
5
6
  path: process.cwd(),
@@ -29,10 +30,16 @@ function parseEnvToJSON(env, prefixes) {
29
30
  });
30
31
  return result;
31
32
  }
32
- exports.default = () => {
33
+ function getEnvConfigs() {
33
34
  const env = parseEnvToJSON(process.env, ['STEEDOS_', 'B6_']);
35
+ return env;
36
+ }
37
+ exports.default = () => {
38
+ const envConfigs = getEnvConfigs();
39
+ const b6Configs = global.b6Server?.config || {};
34
40
  return {
35
- ...env,
41
+ ...b6Configs,
42
+ ...envConfigs
36
43
  };
37
44
  };
38
- //# sourceMappingURL=env.config.js.map
45
+ //# sourceMappingURL=app.config.js.map
package/dist/{moleculer/env.config.js.map → app.config.js.map} RENAMED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -19,7 +19,7 @@ const moleculer_module_1 = require("./moleculer/moleculer.module");
19
19
  const microsoft365_module_1 = require("./microsoft365/microsoft365.module");
20
20
  const oidc_module_1 = require("./oidc/oidc.module");
21
21
  const app_controller_1 = require("./app.controller");
22
- const moleculer_config_1 = require("./moleculer/moleculer.config");
22
+ const app_config_1 = require("./app.config");
23
23
  let AppModule = class AppModule {
24
24
  };
25
25
  exports.AppModule = AppModule;
@@ -28,7 +28,7 @@ exports.AppModule = AppModule = __decorate([
28
28
  imports: [
29
29
  config_1.ConfigModule.forRoot({
30
30
  envFilePath: ['.env.local', '.env'],
31
- load: [moleculer_config_1.default],
31
+ load: [app_config_1.default],
32
32
  isGlobal: true,
33
33
  }),
34
34
  auth_module_1.AuthModule,
package/dist/app.module.js.map CHANGED
@@ -1 +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"}
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,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.server.js CHANGED
@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
4
4
  const common_1 = require("@nestjs/common");
5
5
  const app_express_1 = require("./app.express");
6
6
  const project = require("../package.json");
7
+ const app_config_1 = require("./app.config");
7
8
  const childProcess = require('child_process');
8
9
  var semver = require('semver');
9
10
  if (!semver.satisfies(process.version, ">=14.0.0")) {
@@ -22,6 +23,7 @@ var knownOpts = {
22
23
  "config": [path],
23
24
  "title": String,
24
25
  "userDir": [path],
26
+ "npmPackages": String,
25
27
  "verbose": Boolean,
26
28
  "safe": Boolean,
27
29
  "version": Boolean,
@@ -33,6 +35,7 @@ var shortHands = {
33
35
  "s": ["--config"],
34
36
  "t": ["--help"],
35
37
  "u": ["--userDir"],
38
+ "n": ["--npmPackages"],
36
39
  "v": ["--verbose"],
37
40
  "D": ["--define"]
38
41
  };
@@ -70,12 +73,13 @@ class B6Server {
70
73
  if (this.parsedArgs.help) {
71
74
  console.log("B6 Server v" + project.version);
72
75
  console.log("Usage: b6server [-v] [-?] [--config b6.config.js] [--userDir DIR]");
73
- console.log(" [--port PORT] [--title TITLE] [--safe] [plugins]");
76
+ console.log(" [--port PORT] [--title TITLE] [--safe] [services]");
74
77
  console.log("");
75
78
  console.log("Options:");
76
- console.log(" -p, --port PORT port to listen on");
77
- console.log(" -s, --config FILE use specified config file");
78
- console.log(" -u, --userDir DIR use specified user directory");
79
+ console.log(" -p, --port port to listen on");
80
+ console.log(" -s, --config specified config file");
81
+ console.log(" -n, --npmPackages install specified npm packages");
82
+ console.log(" -u, --userDir use specified user directory");
79
83
  console.log(" -v, --verbose enable verbose output");
80
84
  console.log(" --safe enable safe mode");
81
85
  console.log(" --version show version information");
@@ -124,7 +128,11 @@ class B6Server {
124
128
  }
125
129
  }
126
130
  try {
127
- this.config = require(this.configFile);
131
+ const config = require(this.configFile);
132
+ this.config = {
133
+ config,
134
+ ...(0, app_config_1.getEnvConfigs)(),
135
+ };
128
136
  this.userDir = path.dirname(this.configFile);
129
137
  this.config.configFile = this.configFile;
130
138
  }
@@ -154,10 +162,12 @@ class B6Server {
154
162
  this.config.port = 5100;
155
163
  }
156
164
  }
165
+ this.config.plugin = {};
166
+ if (this.parsedArgs.npmPackages !== undefined) {
167
+ this.config.plugin.packages = this.parsedArgs.npmPackages;
168
+ }
157
169
  if (this.parsedArgs.argv.remain.length > 0) {
158
- this.config.plugin = {
159
- packages: this.parsedArgs.argv.remain[0]
160
- };
170
+ this.config.plugin.services = this.parsedArgs.argv.remain[0];
161
171
  }
162
172
  this.config.userDir = this.userDir;
163
173
  this.logger.log('Loaded config', this.config);
@@ -265,10 +275,11 @@ class B6Server {
265
275
  }
266
276
  }
267
277
  async bootstrap() {
268
- await server.loadConfig();
269
- await server.updatePackage();
270
- const app = await (0, app_express_1.default)();
271
- await app.listen(this.config.port);
278
+ await this.loadConfig();
279
+ await this.updateNpmrc();
280
+ await this.updatePackage();
281
+ this.app = await (0, app_express_1.default)();
282
+ await this.app.listen(this.config.port);
272
283
  }
273
284
  }
274
285
  const server = global.b6Server = new B6Server(parsedArgs);
package/dist/b6.server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.ts"],"names":[],"mappings":"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"}
package/dist/moleculer/moleculer.config.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const env_config_1 = require("./env.config");
3
+ const app_config_1 = require("../app.config");
4
4
  const defaultConfig = {
5
5
  namespace: "steedos",
6
6
  nodeID: null,
@@ -66,13 +66,10 @@ const defaultConfig = {
66
66
  stopped(broker) {
67
67
  }
68
68
  };
69
- const b6ServerConfig = global.b6Server?.config || {};
70
- const envConfig = (0, env_config_1.default)();
71
69
  exports.default = () => {
72
70
  return {
73
71
  ...defaultConfig,
74
- ...b6ServerConfig,
75
- ...envConfig
72
+ ...(0, app_config_1.default)(),
76
73
  };
77
74
  };
78
75
  //# sourceMappingURL=moleculer.config.js.map
package/dist/moleculer/moleculer.config.js.map CHANGED
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -4,8 +4,8 @@ export declare class MoleculerService {
4
4
  private broker;
5
5
  private readonly logger;
6
6
  constructor(configService: ConfigService);
7
- loadPlugins(): void;
8
- loadPlugin(plugin: any): void;
7
+ loadServices(): void;
8
+ loadService(plugin: any): void;
9
9
  private isPackageInstalled;
10
10
  private getPackagePath;
11
11
  }
package/dist/moleculer/moleculer.service.js CHANGED
@@ -29,18 +29,18 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
29
29
  this.broker = new moleculer_1.ServiceBroker({
30
30
  ...moleculer_config_1.default,
31
31
  });
32
- this.loadPlugins();
32
+ this.loadServices();
33
33
  this.broker.start();
34
34
  }
35
- loadPlugins() {
36
- const plugins = this.configService.get("plugin.packages");
35
+ loadServices() {
36
+ const plugins = this.configService.get("plugin.services");
37
37
  if (plugins) {
38
38
  for (const plugin of plugins.split(',')) {
39
- this.loadPlugin(plugin);
39
+ this.loadService(plugin);
40
40
  }
41
41
  }
42
42
  }
43
- loadPlugin(plugin) {
43
+ loadService(plugin) {
44
44
  try {
45
45
  const match = plugin.match(/^(.*?)(?:@([\d.]+))?$/);
46
46
  if (!match) {
@@ -48,7 +48,7 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
48
48
  return;
49
49
  }
50
50
  const [, packageName, version] = match;
51
- this.logger.log(`加载插件: 名称：${packageName}, 版本：${version}`);
51
+ this.logger.log(`加载插件: 名称：${packageName}`);
52
52
  if (!this.isPackageInstalled(packageName)) {
53
53
  this.logger.error(`插件 ${packageName} 未安装，请先安装`);
54
54
  return;
@@ -62,7 +62,7 @@ let MoleculerService = MoleculerService_1 = class MoleculerService {
62
62
  const serviceSchema = serviceModule.default ? serviceModule.default : serviceModule;
63
63
  if (serviceSchema) {
64
64
  this.broker.createService(serviceSchema);
65
- this.logger.log(`插件服务已创建: ${packageName}`, serviceSchema);
65
+ this.logger.log(`插件服务已创建: ${packageName}`);
66
66
  }
67
67
  }
68
68
  catch (err) {
package/dist/moleculer/moleculer.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/moleculer/moleculer.service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@builder6/server",
3
- "version": "0.2.0",
3
+ "version": "0.2.1",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "license": "AGPL-3.0-only",