@builder6/server 0.7.0 → 0.7.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.
- package/dist/app.module.js +9 -7
- package/dist/app.module.js.map +1 -1
- package/dist/b6.server.js +11 -134
- package/dist/b6.server.js.map +1 -1
- package/package.json +7 -6
- package/dist/app.config.d.ts +0 -2
- package/dist/app.config.js +0 -55
- package/dist/app.config.js.map +0 -1
- package/dist/b6.config.d.ts +0 -0
- package/dist/b6.config.js +0 -4
- package/dist/b6.config.js.map +0 -1
- package/dist/index.d.ts +0 -2
- package/dist/index.js +0 -11
- package/dist/index.js.map +0 -1
- package/dist/moleculer.config.d.ts +0 -2
- package/dist/moleculer.config.js +0 -74
- package/dist/moleculer.config.js.map +0 -1
- package/dist/plugin/moleculer.service.d.ts +0 -11
- package/dist/plugin/moleculer.service.js +0 -96
- package/dist/plugin/moleculer.service.js.map +0 -1
- package/dist/plugin/plugin.module.d.ts +0 -14
- package/dist/plugin/plugin.module.js +0 -70
- package/dist/plugin/plugin.module.js.map +0 -1
- package/dist/plugin/plugin.service.d.ts +0 -3
- package/dist/plugin/plugin.service.js +0 -21
- package/dist/plugin/plugin.service.js.map +0 -1
package/dist/app.module.js
CHANGED
|
@@ -19,9 +19,10 @@ const moleculer_1 = require("@builder6/moleculer");
|
|
|
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
|
|
22
|
+
const core_4 = require("@builder6/core");
|
|
23
23
|
const email_1 = require("@builder6/email");
|
|
24
|
-
const
|
|
24
|
+
const pages_1 = require("@builder6/pages");
|
|
25
|
+
const core_5 = require("@builder6/core");
|
|
25
26
|
let AppModule = class AppModule {
|
|
26
27
|
};
|
|
27
28
|
exports.AppModule = AppModule;
|
|
@@ -29,23 +30,24 @@ exports.AppModule = AppModule = __decorate([
|
|
|
29
30
|
(0, common_1.Module)({
|
|
30
31
|
imports: [
|
|
31
32
|
config_1.ConfigModule.forRoot({
|
|
32
|
-
|
|
33
|
-
load: [app_config_1.default],
|
|
33
|
+
load: [core_5.getConfigs, core_5.getDbConfigs],
|
|
34
34
|
isGlobal: true,
|
|
35
35
|
}),
|
|
36
36
|
moleculer_1.MoleculerModule.forRoot({
|
|
37
37
|
namespace: "steedos",
|
|
38
38
|
transporter: process.env.B6_TRANSPORTER,
|
|
39
|
+
...(0, core_5.getMoleculerConfigs)(),
|
|
39
40
|
}),
|
|
40
41
|
core_2.AuthModule,
|
|
41
42
|
core_1.MongodbModule,
|
|
42
43
|
steedos_module_1.SteedosModule,
|
|
44
|
+
core_3.FilesModule,
|
|
45
|
+
email_1.EmailModule,
|
|
43
46
|
tables_1.TablesModule,
|
|
47
|
+
pages_1.PagesModule,
|
|
44
48
|
rooms_1.RoomsModule,
|
|
45
|
-
core_3.FilesModule,
|
|
46
49
|
microsoft365_module_1.Microsoft365Module,
|
|
47
|
-
|
|
48
|
-
plugin_module_1.PluginModule.forRoot(),
|
|
50
|
+
core_4.PluginModule.forRootAsync(),
|
|
49
51
|
...(process.env.B6_OIDC_ENABLED ? [oidc_module_1.OidcModule] : []),
|
|
50
52
|
],
|
|
51
53
|
controllers: [app_controller_1.AppController],
|
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,yCAA+C;AAC/C,6CAAgD;AAChD,yCAA4C;AAC5C,6DAAyD;AACzD,2CAA8C;AAC9C,yCAA6C;AAC7C,mDAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAE9C,yCAA+C;AAC/C,6CAAgD;AAChD,yCAA4C;AAC5C,6DAAyD;AACzD,2CAA8C;AAC9C,yCAA6C;AAC7C,mDAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,yCAA8C;AAC9C,2CAA8C;AAC9C,2CAA8C;AAC9C,yCAA+E;AA8BxE,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IA5BrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,IAAI,EAAE,CAAC,iBAAU,EAAE,mBAAY,CAAC;gBAChC,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAAe,CAAC,OAAO,CAAC;gBAEpB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;gBAEvC,GAAG,IAAA,0BAAmB,GAAE;aAC3B,CAAC;YACF,iBAAU;YACV,oBAAa;YACb,8BAAa;YACb,kBAAW;YACX,mBAAW;YACX,qBAAY;YACZ,mBAAW;YACX,mBAAW;YACX,wCAAkB;YAClB,mBAAY,CAAC,YAAY,EAAE;YAC3B,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
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
5
|
const project = require("../package.json");
|
|
6
|
-
const
|
|
6
|
+
const core_1 = require("@builder6/core");
|
|
7
7
|
const childProcess = require('child_process');
|
|
8
8
|
var semver = require('semver');
|
|
9
9
|
if (!semver.satisfies(process.version, '>=14.0.0')) {
|
|
@@ -15,7 +15,6 @@ var util = require('util');
|
|
|
15
15
|
var nopt = require('nopt');
|
|
16
16
|
var path = require('path');
|
|
17
17
|
const os = require('os');
|
|
18
|
-
const fs = require("fs-extra");
|
|
19
18
|
var knownOpts = {
|
|
20
19
|
help: Boolean,
|
|
21
20
|
port: Number,
|
|
@@ -68,10 +67,8 @@ class B6Server {
|
|
|
68
67
|
this.memoryAuditLogged = 0;
|
|
69
68
|
}
|
|
70
69
|
async loadConfig() {
|
|
71
|
-
const configJs = require('./b6.config');
|
|
72
70
|
this.config = {
|
|
73
|
-
...
|
|
74
|
-
...(0, app_config_1.getEnvConfigs)(),
|
|
71
|
+
...(0, core_1.getEnvConfigs)(),
|
|
75
72
|
};
|
|
76
73
|
if (this.parsedArgs.help) {
|
|
77
74
|
console.log('B6 Server v' + project.version);
|
|
@@ -91,18 +88,15 @@ class B6Server {
|
|
|
91
88
|
console.log('Documentation can be found at https://builder6.com');
|
|
92
89
|
process.exit();
|
|
93
90
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
os.endianness());
|
|
104
|
-
process.exit();
|
|
105
|
-
}
|
|
91
|
+
console.log('Builder6 Server v' + project.version);
|
|
92
|
+
console.log('Node.js ' + process.version);
|
|
93
|
+
console.log(os.type() +
|
|
94
|
+
' ' +
|
|
95
|
+
os.release() +
|
|
96
|
+
' ' +
|
|
97
|
+
os.arch() +
|
|
98
|
+
' ' +
|
|
99
|
+
os.endianness());
|
|
106
100
|
if (this.parsedArgs.verbose) {
|
|
107
101
|
this.config.verbose = true;
|
|
108
102
|
}
|
|
@@ -130,129 +124,12 @@ class B6Server {
|
|
|
130
124
|
}
|
|
131
125
|
this.logger.log('Loaded config', this.config);
|
|
132
126
|
}
|
|
133
|
-
getPluginPackages() {
|
|
134
|
-
if (this.config.plugin?.packages) {
|
|
135
|
-
const pluginList = this.config.plugin.packages.split(',');
|
|
136
|
-
const pluginMap = {};
|
|
137
|
-
pluginList.forEach((plugin) => {
|
|
138
|
-
const match = plugin.match(/^(@[^@]+\/[^@]+|[^@]+)(?:@(.+))?$/);
|
|
139
|
-
if (match) {
|
|
140
|
-
const name = match[1];
|
|
141
|
-
const version = match[2] || 'latest';
|
|
142
|
-
pluginMap[name] = version;
|
|
143
|
-
}
|
|
144
|
-
});
|
|
145
|
-
return pluginMap;
|
|
146
|
-
}
|
|
147
|
-
return {};
|
|
148
|
-
}
|
|
149
|
-
async updateNpmrc() {
|
|
150
|
-
const npmrcPath = path.join(process.env.B6_PLUGIN_DIR, '.npmrc');
|
|
151
|
-
if (this.config.plugin?.npmrc) {
|
|
152
|
-
try {
|
|
153
|
-
fs.writeFileSync(npmrcPath, this.config.plugin?.npmrc);
|
|
154
|
-
}
|
|
155
|
-
catch (error) {
|
|
156
|
-
this.state = States.STOPPED;
|
|
157
|
-
this.logger.log('Unable to write .npmrc file');
|
|
158
|
-
throw error;
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
else {
|
|
162
|
-
if (fs.existsSync(npmrcPath)) {
|
|
163
|
-
try {
|
|
164
|
-
fs.unlinkSync(npmrcPath);
|
|
165
|
-
}
|
|
166
|
-
catch (error) {
|
|
167
|
-
this.state = States.STOPPED;
|
|
168
|
-
this.logger.log('Unable to remove old .npmrc file');
|
|
169
|
-
throw error;
|
|
170
|
-
}
|
|
171
|
-
}
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
async updatePackage() {
|
|
175
|
-
const pkgFilePath = path.join(process.env.B6_PLUGIN_DIR, 'package.json');
|
|
176
|
-
if (!fs.existsSync(pkgFilePath)) {
|
|
177
|
-
fs.writeFileSync(pkgFilePath, JSON.stringify({ name: 'b6-server', version: '0.0.1', dependencies: {} }, null, 2));
|
|
178
|
-
}
|
|
179
|
-
const packageContent = fs.readFileSync(pkgFilePath, { encoding: 'utf8' });
|
|
180
|
-
const pkg = JSON.parse(packageContent);
|
|
181
|
-
const existingDependencies = pkg.dependencies || {};
|
|
182
|
-
const wantedDependencies = this.getPluginPackages();
|
|
183
|
-
const existingModules = Object.keys(existingDependencies);
|
|
184
|
-
const wantedModules = Object.keys(wantedDependencies);
|
|
185
|
-
let changed = false;
|
|
186
|
-
if (existingModules.length !== wantedModules.length) {
|
|
187
|
-
changed = true;
|
|
188
|
-
}
|
|
189
|
-
else {
|
|
190
|
-
existingModules.sort();
|
|
191
|
-
wantedModules.sort();
|
|
192
|
-
for (let i = 0; i < existingModules.length; i++) {
|
|
193
|
-
if (existingModules[i] !== wantedModules[i]) {
|
|
194
|
-
changed = true;
|
|
195
|
-
break;
|
|
196
|
-
}
|
|
197
|
-
if (existingDependencies[existingModules[i]] !==
|
|
198
|
-
wantedDependencies[wantedModules[i]]) {
|
|
199
|
-
changed = true;
|
|
200
|
-
break;
|
|
201
|
-
}
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
if (changed) {
|
|
205
|
-
this.state = States.INSTALLING;
|
|
206
|
-
this.logger.log('Updating project dependencies', wantedDependencies);
|
|
207
|
-
pkg.dependencies = wantedDependencies;
|
|
208
|
-
fs.writeFileSync(pkgFilePath, JSON.stringify(pkg, null, 2));
|
|
209
|
-
const npmEnv = Object.assign({}, process.env, this.config.env);
|
|
210
|
-
const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
|
|
211
|
-
return new Promise((resolve, reject) => {
|
|
212
|
-
const child = childProcess.spawn(npmCommand, [
|
|
213
|
-
'install',
|
|
214
|
-
'--omit=dev',
|
|
215
|
-
'--no-audit',
|
|
216
|
-
'--no-update-notifier',
|
|
217
|
-
'--no-fund',
|
|
218
|
-
], {
|
|
219
|
-
windowsHide: true,
|
|
220
|
-
cwd: path.join(process.env.B6_PLUGIN_DIR),
|
|
221
|
-
env: npmEnv,
|
|
222
|
-
shell: true,
|
|
223
|
-
});
|
|
224
|
-
child.stdout.on('data', (data) => {
|
|
225
|
-
this.logger.log('[npm] ' + data);
|
|
226
|
-
});
|
|
227
|
-
child.stderr.on('data', (data) => {
|
|
228
|
-
this.logger.log('[npm] ' + data);
|
|
229
|
-
});
|
|
230
|
-
child.on('error', (err) => {
|
|
231
|
-
this.logger.log('[npm] ' + err.toString());
|
|
232
|
-
});
|
|
233
|
-
child.on('close', (code) => {
|
|
234
|
-
if (code === 0) {
|
|
235
|
-
resolve();
|
|
236
|
-
}
|
|
237
|
-
else {
|
|
238
|
-
reject(new Error(`Failed to install project dependencies ret code: ${code} signal ${child.signalCode}`));
|
|
239
|
-
}
|
|
240
|
-
});
|
|
241
|
-
}).catch((err) => {
|
|
242
|
-
fs.writeFileSync(pkgFilePath, packageContent);
|
|
243
|
-
throw err;
|
|
244
|
-
});
|
|
245
|
-
}
|
|
246
|
-
}
|
|
247
127
|
async startApp() {
|
|
248
128
|
const ExpressApplication = require('./app.express');
|
|
249
129
|
this.app = await ExpressApplication.default();
|
|
250
130
|
await this.app.listen(this.config.port);
|
|
251
131
|
}
|
|
252
132
|
async bootstrap() {
|
|
253
|
-
await this.loadConfig();
|
|
254
|
-
await this.updateNpmrc();
|
|
255
|
-
await this.updatePackage();
|
|
256
133
|
await this.startApp();
|
|
257
134
|
}
|
|
258
135
|
}
|
package/dist/b6.server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.ts"],"names":[],"mappings":";;;AAkBA,2CAAwC;AAExC,2CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"b6.server.js","sourceRoot":"","sources":["../src/b6.server.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.7.
|
|
3
|
+
"version": "0.7.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "AGPL-3.0-only",
|
|
@@ -29,12 +29,13 @@
|
|
|
29
29
|
"test:e2e": "jest --config ./test/jest-e2e.json"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@builder6/core": "^0.7.
|
|
33
|
-
"@builder6/email": "^0.7.
|
|
32
|
+
"@builder6/core": "^0.7.1",
|
|
33
|
+
"@builder6/email": "^0.7.1",
|
|
34
34
|
"@builder6/moleculer": "^0.7.0",
|
|
35
|
+
"@builder6/pages": "^0.7.1",
|
|
35
36
|
"@builder6/query-mongodb": "^0.7.0",
|
|
36
|
-
"@builder6/rooms": "^0.7.
|
|
37
|
-
"@builder6/tables": "^0.
|
|
37
|
+
"@builder6/rooms": "^0.7.1",
|
|
38
|
+
"@builder6/tables": "^0.7.1",
|
|
38
39
|
"@nestjs/common": "^10.0.0",
|
|
39
40
|
"@nestjs/config": "^3.3.0",
|
|
40
41
|
"@nestjs/core": "^9.0.0",
|
|
@@ -116,5 +117,5 @@
|
|
|
116
117
|
"publishConfig": {
|
|
117
118
|
"access": "public"
|
|
118
119
|
},
|
|
119
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "b0e1429ea0940fa47cadb4abc340bb7498b15784"
|
|
120
121
|
}
|
package/dist/app.config.d.ts
DELETED
package/dist/app.config.js
DELETED
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getEnvConfigs = getEnvConfigs;
|
|
4
|
-
exports.default = getConfig;
|
|
5
|
-
const dotenvFlow = require("dotenv-flow");
|
|
6
|
-
const path = require("path");
|
|
7
|
-
dotenvFlow.config({
|
|
8
|
-
path: process.cwd(),
|
|
9
|
-
silent: true,
|
|
10
|
-
});
|
|
11
|
-
process.env.B6_ROOT_URL = process.env.B6_ROOT_URL || process.env.ROOT_URL;
|
|
12
|
-
process.env.B6_MONGO_URL = process.env.B6_MONGO_URL || process.env.MONGO_URL;
|
|
13
|
-
process.env.B6_TRANSPORTER =
|
|
14
|
-
process.env.B6_TRANSPORTER ||
|
|
15
|
-
process.env.STEEDOS_TRANSPORTER ||
|
|
16
|
-
process.env.TRANSPORTER;
|
|
17
|
-
process.env.B6_HOME = process.env.B6_HOME || process.cwd();
|
|
18
|
-
process.env.B6_PLUGIN_DIR =
|
|
19
|
-
process.env.B6_PLUGIN_DIR || path.join(process.cwd(), 'plugins');
|
|
20
|
-
function parseEnvToJSON(env, prefixes) {
|
|
21
|
-
const result = {};
|
|
22
|
-
Object.keys(env).forEach((key) => {
|
|
23
|
-
const hasValidPrefix = prefixes.some((prefix) => key.startsWith(prefix));
|
|
24
|
-
if (!hasValidPrefix) {
|
|
25
|
-
return;
|
|
26
|
-
}
|
|
27
|
-
const strippedKey = key
|
|
28
|
-
.replace(new RegExp(`^(${prefixes.join('|')})`), '')
|
|
29
|
-
.toLowerCase();
|
|
30
|
-
const keys = strippedKey.split('_');
|
|
31
|
-
let current = result;
|
|
32
|
-
keys.forEach((k, index) => {
|
|
33
|
-
if (index === keys.length - 1) {
|
|
34
|
-
current[k] = isNaN(env[key]) ? env[key] : Number(env[key]);
|
|
35
|
-
}
|
|
36
|
-
else {
|
|
37
|
-
current[k] = current[k] || {};
|
|
38
|
-
current = current[k];
|
|
39
|
-
}
|
|
40
|
-
});
|
|
41
|
-
});
|
|
42
|
-
return result;
|
|
43
|
-
}
|
|
44
|
-
function getEnvConfigs() {
|
|
45
|
-
const env = parseEnvToJSON(process.env, ['STEEDOS_', 'B6_']);
|
|
46
|
-
return env;
|
|
47
|
-
}
|
|
48
|
-
function getConfig() {
|
|
49
|
-
const env = getEnvConfigs();
|
|
50
|
-
return {
|
|
51
|
-
plugin: {},
|
|
52
|
-
...env,
|
|
53
|
-
};
|
|
54
|
-
}
|
|
55
|
-
//# sourceMappingURL=app.config.js.map
|
package/dist/app.config.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"app.config.js","sourceRoot":"","sources":["../src/app.config.ts"],"names":[],"mappings":";;AAyDA,sCAGC;AAED,4BAMC;AApED,0CAA0C;AAC1C,6BAA6B;AAE7B,UAAU,CAAC,MAAM,CAAC;IAChB,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE;IACnB,MAAM,EAAE,IAAI;CACb,CAAC,CAAC;AAGH,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;AAC1E,OAAO,CAAC,GAAG,CAAC,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;AAC7E,OAAO,CAAC,GAAG,CAAC,cAAc;IACxB,OAAO,CAAC,GAAG,CAAC,cAAc;QAC1B,OAAO,CAAC,GAAG,CAAC,mBAAmB;QAC/B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;AAE1B,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;AAC3D,OAAO,CAAC,GAAG,CAAC,aAAa;IACvB,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;AAQnE,SAAS,cAAc,CAAC,GAAG,EAAE,QAAQ;IACnC,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAE/B,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;YACpB,OAAO;QACT,CAAC;QAGD,MAAM,WAAW,GAAG,GAAG;aACpB,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;aACnD,WAAW,EAAE,CAAC;QACjB,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;YACxB,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAE9B,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;YAC7D,CAAC;iBAAM,CAAC;gBAEN,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAC9B,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,aAAa;IAC3B,MAAM,GAAG,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,KAAK,CAAC,CAAQ,CAAC;IACpE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAwB,SAAS;IAC/B,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,OAAO;QACL,MAAM,EAAE,EAAE;QACV,GAAG,GAAG;KACP,CAAC;AACJ,CAAC"}
|
package/dist/b6.config.d.ts
DELETED
|
File without changes
|
package/dist/b6.config.js
DELETED
package/dist/b6.config.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"b6.config.js","sourceRoot":"","sources":["../src/b6.config.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE,EAAE;CACX,CAAC"}
|
package/dist/index.d.ts
DELETED
package/dist/index.js
DELETED
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.app = void 0;
|
|
4
|
-
const core_1 = require("@nestjs/core");
|
|
5
|
-
const app_module_1 = require("./app.module");
|
|
6
|
-
async function bootstrap() {
|
|
7
|
-
exports.app = await core_1.NestFactory.createApplicationContext(app_module_1.AppModule);
|
|
8
|
-
await exports.app.close();
|
|
9
|
-
}
|
|
10
|
-
bootstrap();
|
|
11
|
-
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,uCAA2C;AAE3C,6CAAyC;AAKzC,KAAK,UAAU,SAAS;IACtB,WAAG,GAAG,MAAM,kBAAW,CAAC,wBAAwB,CAAC,sBAAS,CAAC,CAAC;IAC5D,MAAM,WAAG,CAAC,KAAK,EAAE,CAAC;AACpB,CAAC;AAED,SAAS,EAAE,CAAC"}
|
package/dist/moleculer.config.js
DELETED
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
'use strict';
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const app_config_1 = require("./app.config");
|
|
4
|
-
const defaultConfig = {
|
|
5
|
-
namespace: 'steedos',
|
|
6
|
-
nodeID: null,
|
|
7
|
-
metadata: {},
|
|
8
|
-
logger: {
|
|
9
|
-
type: 'Console',
|
|
10
|
-
options: {
|
|
11
|
-
level: 'info',
|
|
12
|
-
colors: true,
|
|
13
|
-
moduleColors: false,
|
|
14
|
-
formatter: '[MO] {timestamp} {level} [{mod}] {msg}',
|
|
15
|
-
objectPrinter: null,
|
|
16
|
-
autoPadding: false,
|
|
17
|
-
},
|
|
18
|
-
},
|
|
19
|
-
transporter: process.env.B6_TRANSPORTER,
|
|
20
|
-
cacher: process.env.B6_CACHER,
|
|
21
|
-
serializer: 'JSON',
|
|
22
|
-
requestTimeout: 0,
|
|
23
|
-
retryPolicy: {
|
|
24
|
-
enabled: false,
|
|
25
|
-
},
|
|
26
|
-
maxCallLevel: 100,
|
|
27
|
-
heartbeatInterval: 10,
|
|
28
|
-
heartbeatTimeout: 30,
|
|
29
|
-
contextParamsCloning: false,
|
|
30
|
-
tracking: {
|
|
31
|
-
enabled: false,
|
|
32
|
-
},
|
|
33
|
-
disableBalancer: false,
|
|
34
|
-
registry: {
|
|
35
|
-
strategy: 'RoundRobin',
|
|
36
|
-
preferLocal: true,
|
|
37
|
-
},
|
|
38
|
-
circuitBreaker: {
|
|
39
|
-
enabled: false,
|
|
40
|
-
threshold: 0.5,
|
|
41
|
-
minRequestCount: 20,
|
|
42
|
-
windowTime: 60,
|
|
43
|
-
halfOpenTime: 10000,
|
|
44
|
-
check: (err) => err && err.code >= 500,
|
|
45
|
-
},
|
|
46
|
-
bulkhead: {
|
|
47
|
-
enabled: false,
|
|
48
|
-
concurrency: 10,
|
|
49
|
-
maxQueueSize: 100,
|
|
50
|
-
},
|
|
51
|
-
validator: true,
|
|
52
|
-
errorHandler: null,
|
|
53
|
-
metrics: {
|
|
54
|
-
enabled: false,
|
|
55
|
-
},
|
|
56
|
-
tracing: {
|
|
57
|
-
enabled: false,
|
|
58
|
-
},
|
|
59
|
-
middlewares: [],
|
|
60
|
-
replCommands: null,
|
|
61
|
-
skipProcessEventRegistration: true,
|
|
62
|
-
created(broker) { },
|
|
63
|
-
started(broker) {
|
|
64
|
-
},
|
|
65
|
-
stopped(broker) {
|
|
66
|
-
},
|
|
67
|
-
};
|
|
68
|
-
exports.default = () => {
|
|
69
|
-
return {
|
|
70
|
-
...defaultConfig,
|
|
71
|
-
...(0, app_config_1.default)(),
|
|
72
|
-
};
|
|
73
|
-
};
|
|
74
|
-
//# sourceMappingURL=moleculer.config.js.map
|
|
@@ -1 +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"}
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { ConfigService } from '@nestjs/config';
|
|
2
|
-
import { ServiceBroker } from 'moleculer';
|
|
3
|
-
export declare class MoleculerPluginService {
|
|
4
|
-
private configService;
|
|
5
|
-
private readonly broker;
|
|
6
|
-
private readonly logger;
|
|
7
|
-
constructor(configService: ConfigService, broker: ServiceBroker);
|
|
8
|
-
loadServices(): void;
|
|
9
|
-
loadService(plugin: any): void;
|
|
10
|
-
private getPackagePath;
|
|
11
|
-
}
|
|
@@ -1,96 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
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;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
-
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
-
};
|
|
14
|
-
var MoleculerPluginService_1;
|
|
15
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.MoleculerPluginService = void 0;
|
|
17
|
-
const common_1 = require("@nestjs/common");
|
|
18
|
-
const config_1 = require("@nestjs/config");
|
|
19
|
-
const moleculer_1 = require("moleculer");
|
|
20
|
-
const fs = require("fs");
|
|
21
|
-
const path = require("path");
|
|
22
|
-
const moleculer_2 = require("@builder6/moleculer");
|
|
23
|
-
let MoleculerPluginService = MoleculerPluginService_1 = class MoleculerPluginService {
|
|
24
|
-
constructor(configService, broker) {
|
|
25
|
-
this.configService = configService;
|
|
26
|
-
this.broker = broker;
|
|
27
|
-
this.logger = new common_1.Logger(MoleculerPluginService_1.name);
|
|
28
|
-
const transporter = this.configService.get('transporter');
|
|
29
|
-
if (!transporter) {
|
|
30
|
-
console.error('B6_TRANSPORTER env is required.');
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
this.loadServices();
|
|
34
|
-
}
|
|
35
|
-
loadServices() {
|
|
36
|
-
const plugins = this.configService.get('plugin.services');
|
|
37
|
-
if (plugins) {
|
|
38
|
-
for (const plugin of plugins.split(',')) {
|
|
39
|
-
this.loadService(plugin);
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
loadService(plugin) {
|
|
44
|
-
try {
|
|
45
|
-
const match = plugin.match(/^(.*?)(?:@([\d.]+))?$/);
|
|
46
|
-
if (!match) {
|
|
47
|
-
this.logger.warn(`服务插件格式无效: ${plugin}`);
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
const [, packageName] = match;
|
|
51
|
-
this.logger.log(`加载服务插件: 名称：${packageName}`);
|
|
52
|
-
if (!this.getPackagePath(packageName)) {
|
|
53
|
-
this.logger.error(`服务插件 ${packageName} 未安装，请先安装`);
|
|
54
|
-
return;
|
|
55
|
-
}
|
|
56
|
-
const packageServicePath = path.resolve(this.getPackagePath(packageName), './package.service.js');
|
|
57
|
-
if (!fs.existsSync(packageServicePath)) {
|
|
58
|
-
this.logger.error(`插件 ${packageName} 缺少文件: ${packageServicePath}`);
|
|
59
|
-
return;
|
|
60
|
-
}
|
|
61
|
-
const serviceModule = require(packageServicePath);
|
|
62
|
-
const serviceSchema = serviceModule.default
|
|
63
|
-
? serviceModule.default
|
|
64
|
-
: serviceModule;
|
|
65
|
-
if (serviceSchema) {
|
|
66
|
-
const service = this.broker.createService(serviceSchema);
|
|
67
|
-
this.logger.log(`插件服务已加载: ${packageName}`);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
catch (err) {
|
|
71
|
-
this.logger.error(`处理插件 ${plugin} 时出错: ${err.message}`);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
getPackagePath(packageName) {
|
|
75
|
-
try {
|
|
76
|
-
return path.dirname(require.resolve(`${packageName}/package.json`, {
|
|
77
|
-
paths: [
|
|
78
|
-
path.join(process.env.B6_PLUGIN_DIR, 'node_modules'),
|
|
79
|
-
...module.paths,
|
|
80
|
-
],
|
|
81
|
-
}));
|
|
82
|
-
}
|
|
83
|
-
catch (e) {
|
|
84
|
-
console.error(e);
|
|
85
|
-
return null;
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
};
|
|
89
|
-
exports.MoleculerPluginService = MoleculerPluginService;
|
|
90
|
-
exports.MoleculerPluginService = MoleculerPluginService = MoleculerPluginService_1 = __decorate([
|
|
91
|
-
(0, common_1.Injectable)(),
|
|
92
|
-
__param(1, (0, moleculer_2.InjectBroker)()),
|
|
93
|
-
__metadata("design:paramtypes", [config_1.ConfigService,
|
|
94
|
-
moleculer_1.ServiceBroker])
|
|
95
|
-
], MoleculerPluginService);
|
|
96
|
-
//# sourceMappingURL=moleculer.service.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"moleculer.service.js","sourceRoot":"","sources":["../../src/plugin/moleculer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,2CAA+C;AAC/C,yCAA0C;AAC1C,yBAAyB;AACzB,6BAA6B;AAC7B,mDAAmD;AAI5C,IAAM,sBAAsB,8BAA5B,MAAM,sBAAsB;IAGjC,YACU,aAA4B,EACpB,MAAsC;QAD9C,kBAAa,GAAb,aAAa,CAAe;QACH,WAAM,GAAN,MAAM,CAAe;QAJvC,WAAM,GAAG,IAAI,eAAM,CAAC,wBAAsB,CAAC,IAAI,CAAC,CAAC;QAMhE,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,YAAY,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,sBAAsB,CACvB,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,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;gBAEzD,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;AA3FY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAMR,WAAA,IAAA,wBAAY,GAAE,CAAA;qCADQ,sBAAa;QACK,yBAAa;GAL7C,sBAAsB,CA2FlC"}
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { DynamicModule, Logger } from '@nestjs/common';
|
|
2
|
-
export declare class PluginModule {
|
|
3
|
-
static readonly logger: Logger;
|
|
4
|
-
static config: any;
|
|
5
|
-
static plugins: Plugin[];
|
|
6
|
-
static forRoot(): DynamicModule;
|
|
7
|
-
static loadPlugin(packageName: string): any;
|
|
8
|
-
static getPackagePath(packageName: string): string;
|
|
9
|
-
}
|
|
10
|
-
interface Plugin {
|
|
11
|
-
name: string;
|
|
12
|
-
module: DynamicModule;
|
|
13
|
-
}
|
|
14
|
-
export {};
|
|
@@ -1,70 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
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;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var PluginModule_1;
|
|
9
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.PluginModule = void 0;
|
|
11
|
-
const common_1 = require("@nestjs/common");
|
|
12
|
-
const fs = require("fs");
|
|
13
|
-
const path = require("path");
|
|
14
|
-
const plugin_service_1 = require("./plugin.service");
|
|
15
|
-
const app_config_1 = require("../app.config");
|
|
16
|
-
const moleculer_service_1 = require("./moleculer.service");
|
|
17
|
-
const moleculer_1 = require("@builder6/moleculer");
|
|
18
|
-
let PluginModule = PluginModule_1 = class PluginModule {
|
|
19
|
-
static forRoot() {
|
|
20
|
-
const modules = this.config.plugin.modules;
|
|
21
|
-
if (modules) {
|
|
22
|
-
for (const module of modules.split(',')) {
|
|
23
|
-
const pluginModule = this.loadPlugin(module);
|
|
24
|
-
this.plugins.push({
|
|
25
|
-
name: module,
|
|
26
|
-
module: pluginModule,
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
return {
|
|
31
|
-
module: PluginModule_1,
|
|
32
|
-
imports: [...this.plugins.map((plugin) => plugin.module)],
|
|
33
|
-
};
|
|
34
|
-
}
|
|
35
|
-
static loadPlugin(packageName) {
|
|
36
|
-
const packageModulePath = path.resolve(this.getPackagePath(packageName), './dist/app.module.js');
|
|
37
|
-
if (!fs.existsSync(packageModulePath)) {
|
|
38
|
-
this.logger.error(`Nestjs 插件 ${packageName} 缺少文件: ${packageModulePath}`);
|
|
39
|
-
return;
|
|
40
|
-
}
|
|
41
|
-
this.logger.log(`加载 Nestjs 插件： ${packageName} ...`);
|
|
42
|
-
const PluginModule = require(packageModulePath);
|
|
43
|
-
return PluginModule.default;
|
|
44
|
-
}
|
|
45
|
-
static getPackagePath(packageName) {
|
|
46
|
-
try {
|
|
47
|
-
return path.dirname(require.resolve(`${packageName}/package.json`, {
|
|
48
|
-
paths: [
|
|
49
|
-
path.join(process.env.B6_PLUGIN_DIR, 'node_modules'),
|
|
50
|
-
...module.paths,
|
|
51
|
-
],
|
|
52
|
-
}));
|
|
53
|
-
}
|
|
54
|
-
catch (e) {
|
|
55
|
-
console.error(e);
|
|
56
|
-
return null;
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
};
|
|
60
|
-
exports.PluginModule = PluginModule;
|
|
61
|
-
PluginModule.logger = new common_1.Logger(PluginModule_1.name);
|
|
62
|
-
PluginModule.config = (0, app_config_1.default)();
|
|
63
|
-
PluginModule.plugins = [];
|
|
64
|
-
exports.PluginModule = PluginModule = PluginModule_1 = __decorate([
|
|
65
|
-
(0, common_1.Module)({
|
|
66
|
-
imports: [moleculer_1.MoleculerModule.forRoot({})],
|
|
67
|
-
providers: [plugin_service_1.PluginService, moleculer_service_1.MoleculerPluginService],
|
|
68
|
-
})
|
|
69
|
-
], PluginModule);
|
|
70
|
-
//# sourceMappingURL=plugin.module.js.map
|
|
@@ -1 +0,0 @@
|
|
|
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,8CAAsC;AACtC,2DAA6D;AAC7D,mDAAsD;AAM/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,sBAAsB,CACvB,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;QAGpD,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;;AA5DU,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;IAJxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,2BAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtC,SAAS,EAAE,CAAC,8BAAa,EAAE,0CAAsB,CAAC;KACnD,CAAC;GACW,YAAY,CA6DxB"}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
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;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var PluginService_1;
|
|
9
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.PluginService = void 0;
|
|
11
|
-
const common_1 = require("@nestjs/common");
|
|
12
|
-
let PluginService = PluginService_1 = class PluginService {
|
|
13
|
-
constructor() {
|
|
14
|
-
this.logger = new common_1.Logger(PluginService_1.name);
|
|
15
|
-
}
|
|
16
|
-
};
|
|
17
|
-
exports.PluginService = PluginService;
|
|
18
|
-
exports.PluginService = PluginService = PluginService_1 = __decorate([
|
|
19
|
-
(0, common_1.Injectable)()
|
|
20
|
-
], PluginService);
|
|
21
|
-
//# sourceMappingURL=plugin.service.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.service.js","sourceRoot":"","sources":["../../src/plugin/plugin.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAoD;AAG7C,IAAM,aAAa,qBAAnB,MAAM,aAAa;IAAnB;QACY,WAAM,GAAG,IAAI,eAAM,CAAC,eAAa,CAAC,IAAI,CAAC,CAAC;IAC3D,CAAC;CAAA,CAAA;AAFY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;GACA,aAAa,CAEzB"}
|