@builder6/core 0.8.3 → 0.9.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/auth/auth.controller.d.ts +1 -1
- package/dist/auth/auth.controller.js +14 -5
- package/dist/auth/auth.controller.js.map +1 -1
- package/dist/auth/auth.module.js +1 -1
- package/dist/auth/auth.module.js.map +1 -1
- package/dist/config/default.config.js.map +1 -1
- package/dist/config/env.config.d.ts +2 -0
- package/dist/config/env.config.js +55 -0
- package/dist/config/env.config.js.map +1 -0
- package/dist/config/index.d.ts +4 -3
- package/dist/config/index.js +18 -72
- package/dist/config/index.js.map +1 -1
- package/dist/config/project.config.d.ts +1 -0
- package/dist/config/project.config.js +15 -0
- package/dist/config/project.config.js.map +1 -0
- package/dist/files/files.service.js +1 -1
- package/dist/files/files.service.js.map +1 -1
- package/dist/mongodb/mongodb.service.js +0 -2
- package/dist/mongodb/mongodb.service.js.map +1 -1
- package/dist/plugin/plugin.module.d.ts +3 -2
- package/dist/plugin/plugin.module.js +26 -30
- package/dist/plugin/plugin.module.js.map +1 -1
- package/package.json +3 -3
|
@@ -3,5 +3,5 @@ import { Request, Response } from 'express';
|
|
|
3
3
|
export declare class AuthController {
|
|
4
4
|
private authService;
|
|
5
5
|
constructor(authService: AuthService);
|
|
6
|
-
login(req: Request, res: Response, username: string, password: string): Promise<Response<any, Record<string, any>>>;
|
|
6
|
+
login(req: Request, res: Response, redirect_to: string, username: string, password: string): Promise<void | Response<any, Record<string, any>>>;
|
|
7
7
|
}
|
|
@@ -20,7 +20,7 @@ let AuthController = class AuthController {
|
|
|
20
20
|
constructor(authService) {
|
|
21
21
|
this.authService = authService;
|
|
22
22
|
}
|
|
23
|
-
async login(req, res, username, password) {
|
|
23
|
+
async login(req, res, redirect_to, username, password) {
|
|
24
24
|
try {
|
|
25
25
|
if (!username || !password) {
|
|
26
26
|
return res.status(401).json({ message: 'username and password is required' });
|
|
@@ -33,7 +33,10 @@ let AuthController = class AuthController {
|
|
|
33
33
|
auth_token,
|
|
34
34
|
access_token,
|
|
35
35
|
});
|
|
36
|
-
|
|
36
|
+
if (redirect_to)
|
|
37
|
+
return res.redirect(redirect_to);
|
|
38
|
+
else
|
|
39
|
+
return res.status(200).json(result);
|
|
37
40
|
}
|
|
38
41
|
catch (error) {
|
|
39
42
|
console.error('Error during signIn:', error);
|
|
@@ -45,6 +48,11 @@ exports.AuthController = AuthController;
|
|
|
45
48
|
__decorate([
|
|
46
49
|
(0, common_1.HttpCode)(common_1.HttpStatus.OK),
|
|
47
50
|
(0, common_1.Post)('login'),
|
|
51
|
+
(0, swagger_1.ApiQuery)({
|
|
52
|
+
name: 'redirect_to',
|
|
53
|
+
required: false,
|
|
54
|
+
description: '登录成功后跳转的地址',
|
|
55
|
+
}),
|
|
48
56
|
(0, swagger_1.ApiBody)({
|
|
49
57
|
schema: {
|
|
50
58
|
type: 'object',
|
|
@@ -65,10 +73,11 @@ __decorate([
|
|
|
65
73
|
}),
|
|
66
74
|
__param(0, (0, common_1.Req)()),
|
|
67
75
|
__param(1, (0, common_1.Res)()),
|
|
68
|
-
__param(2, (0, common_1.
|
|
69
|
-
__param(3, (0, common_1.Body)('
|
|
76
|
+
__param(2, (0, common_1.Query)('redirect_to')),
|
|
77
|
+
__param(3, (0, common_1.Body)('username')),
|
|
78
|
+
__param(4, (0, common_1.Body)('password')),
|
|
70
79
|
__metadata("design:type", Function),
|
|
71
|
-
__metadata("design:paramtypes", [Object, Object, String, String]),
|
|
80
|
+
__metadata("design:paramtypes", [Object, Object, String, String, String]),
|
|
72
81
|
__metadata("design:returntype", Promise)
|
|
73
82
|
], AuthController.prototype, "login", null);
|
|
74
83
|
exports.AuthController = AuthController = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"auth.controller.js","sourceRoot":"","sources":["../../src/auth/auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,iDAA6C;AAC7C,6CAAoD;AAI7C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAAoB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IA2B1C,AAAN,KAAK,CAAC,KAAK,CACF,GAAY,EACZ,GAAa,EACE,WAAmB,EACvB,QAAgB,EAChB,QAAgB;QAElC,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mCAAmC,EAAE,CAAC,CAAC;YAChF,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAC1C,QAAQ,EACR,QAAQ,CACT,CAAC;YACF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;YAEzD,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,GAAG,EAAE;gBACnC,OAAO,EAAE,IAAI;gBACb,QAAQ,EAAE,KAAK;gBACf,UAAU;gBACV,YAAY;aACb,CAAC,CAAC;YACH,IAAI,WAAW;gBACb,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;;gBAEjC,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;YAC7C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC,CAAC;QACpE,CAAC;IACH,CAAC;CACF,CAAA;AA5DY,wCAAc;AA4BnB;IAzBL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,aAAI,EAAC,OAAO,CAAC;IACb,IAAA,kBAAQ,EAAC;QACR,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,YAAY;KAC1B,CAAC;IACD,IAAA,iBAAO,EAAC;QACP,MAAM,EAAE;YACN,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;aAC7B;SACF;QACD,QAAQ,EAAE;YACR,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM;gBACf,KAAK,EAAE;oBACL,QAAQ,EAAE,MAAM;oBAChB,QAAQ,EAAE,MAAM;iBACjB;aACF;SACF;KACF,CAAC;IAEC,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;IAChB,WAAA,IAAA,aAAI,EAAC,UAAU,CAAC,CAAA;;;;2CA0BlB;yBA3DU,cAAc;IAD1B,IAAA,mBAAU,EAAC,aAAa,CAAC;qCAES,0BAAW;GADjC,cAAc,CA4D1B"}
|
package/dist/auth/auth.module.js
CHANGED
|
@@ -22,7 +22,7 @@ exports.AuthModule = AuthModule = __decorate([
|
|
|
22
22
|
imports: [
|
|
23
23
|
mongodb_module_1.MongodbModule,
|
|
24
24
|
jwt_1.JwtModule.register({
|
|
25
|
-
secret: process.env.
|
|
25
|
+
secret: process.env.B6_JWT_SECRET || 'secret',
|
|
26
26
|
signOptions: { expiresIn: '60s' },
|
|
27
27
|
}),
|
|
28
28
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,qCAAwC;AACxC,uDAAmD;AACnD,iDAA6C;AAC7C,8DAA0D;AAC1D,+CAA2C;AAC3C,6CAAyC;AAclC,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAZtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,8BAAa;YACb,eAAS,CAAC,QAAQ,CAAC;gBACjB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"auth.module.js","sourceRoot":"","sources":["../../src/auth/auth.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,qCAAwC;AACxC,uDAAmD;AACnD,iDAA6C;AAC7C,8DAA0D;AAC1D,+CAA2C;AAC3C,6CAAyC;AAclC,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAZtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,8BAAa;YACb,eAAS,CAAC,QAAQ,CAAC;gBACjB,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,QAAQ;gBAC7C,WAAW,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;aAClC,CAAC;SACH;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,EAAE,wBAAU,EAAE,sBAAS,CAAC;QAC/C,OAAO,EAAE,CAAC,0BAAW,EAAE,wBAAU,EAAE,sBAAS,CAAC;KAC9C,CAAC;GACW,UAAU,CAAG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default.config.js","sourceRoot":"","sources":["../../src/config/default.config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,MAAM,EAAE,EAAE;IACV,KAAK,EAAE;QACL,GAAG,EAAE,mBAAmB;KACzB;
|
|
1
|
+
{"version":3,"file":"default.config.js","sourceRoot":"","sources":["../../src/config/default.config.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,MAAM,EAAE,EAAE;IACV,KAAK,EAAE;QACL,GAAG,EAAE,mBAAmB;KACzB;CACF,CAAA"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const dotenvFlow = require("dotenv-flow");
|
|
4
|
+
dotenvFlow.config({
|
|
5
|
+
path: process.cwd(),
|
|
6
|
+
silent: true,
|
|
7
|
+
});
|
|
8
|
+
process.env.B6_ROOT_URL = process.env.B6_ROOT_URL || process.env.ROOT_URL;
|
|
9
|
+
process.env.B6_MONGO_URL = process.env.B6_MONGO_URL || process.env.MONGO_URL;
|
|
10
|
+
process.env.B6_TRANSPORTER = process.env.B6_TRANSPORTER || process.env.TRANSPORTER || '';
|
|
11
|
+
process.env.B6_CACHER = process.env.B6_CACHER || process.env.CACHER || '';
|
|
12
|
+
process.env.B6_JWT_SECRET = process.env.B6_JWT_SECRET || process.env.JWT_SECRET || '';
|
|
13
|
+
process.env.B6_HOME = process.cwd();
|
|
14
|
+
process.env.B6_HOST = process.env.B6_HOST || process.env.B6_ROOT_URL;
|
|
15
|
+
function parseEnvToJSON(env, prefixes) {
|
|
16
|
+
const result = {};
|
|
17
|
+
Object.keys(env).forEach((key) => {
|
|
18
|
+
const hasValidPrefix = prefixes.some((prefix) => key.startsWith(prefix));
|
|
19
|
+
if (!hasValidPrefix) {
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
22
|
+
const strippedKey = key.toLowerCase();
|
|
23
|
+
const keys = strippedKey.split('_');
|
|
24
|
+
let current = result;
|
|
25
|
+
keys.forEach((k, index) => {
|
|
26
|
+
if (index === keys.length - 1) {
|
|
27
|
+
const value = env[key];
|
|
28
|
+
if (value.toLowerCase() === 'true') {
|
|
29
|
+
current[k] = true;
|
|
30
|
+
}
|
|
31
|
+
else if (value.toLowerCase() === 'false') {
|
|
32
|
+
current[k] = false;
|
|
33
|
+
}
|
|
34
|
+
else if (!isNaN(value)) {
|
|
35
|
+
current[k] = Number(value);
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
current[k] = value;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
current[k] = current[k] || {};
|
|
43
|
+
current = current[k];
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
return result;
|
|
48
|
+
}
|
|
49
|
+
const env = parseEnvToJSON(process.env, ['STEEDOS_', 'B6_']);
|
|
50
|
+
const envConfig = {
|
|
51
|
+
...env.steedos,
|
|
52
|
+
...env.b6
|
|
53
|
+
};
|
|
54
|
+
exports.default = envConfig;
|
|
55
|
+
//# sourceMappingURL=env.config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.config.js","sourceRoot":"","sources":["../../src/config/env.config.ts"],"names":[],"mappings":"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"}
|
package/dist/config/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
export declare
|
|
1
|
+
export declare const projectConfigs: any;
|
|
2
2
|
export declare function getDbConfigs(): Promise<{}>;
|
|
3
|
-
export declare function
|
|
4
|
-
export declare function getConfigs(): any;
|
|
3
|
+
export declare function getEnvConfigs(): any;
|
|
5
4
|
export declare function getMoleculerConfigs(): any;
|
|
5
|
+
export declare function getConfigs(): any;
|
|
6
|
+
export declare const configs: any;
|
package/dist/config/index.js
CHANGED
|
@@ -1,89 +1,35 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.configs = exports.projectConfigs = void 0;
|
|
4
4
|
exports.getDbConfigs = getDbConfigs;
|
|
5
|
-
exports.
|
|
6
|
-
exports.getConfigs = getConfigs;
|
|
5
|
+
exports.getEnvConfigs = getEnvConfigs;
|
|
7
6
|
exports.getMoleculerConfigs = getMoleculerConfigs;
|
|
8
|
-
|
|
9
|
-
const path = require("path");
|
|
7
|
+
exports.getConfigs = getConfigs;
|
|
10
8
|
const default_config_1 = require("./default.config");
|
|
11
9
|
const moleculer_config_1 = require("./moleculer.config");
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
});
|
|
16
|
-
process.env.B6_ROOT_URL = process.env.B6_ROOT_URL || process.env.ROOT_URL;
|
|
17
|
-
process.env.B6_MONGO_URL = process.env.B6_MONGO_URL || process.env.MONGO_URL;
|
|
18
|
-
process.env.B6_TRANSPORTER =
|
|
19
|
-
process.env.B6_TRANSPORTER ||
|
|
20
|
-
process.env.STEEDOS_TRANSPORTER ||
|
|
21
|
-
process.env.TRANSPORTER;
|
|
22
|
-
process.env.B6_HOME = process.env.B6_HOME || process.cwd();
|
|
23
|
-
process.env.B6_PLUGIN_DIR =
|
|
24
|
-
process.env.B6_PLUGIN_DIR || path.join(process.cwd(), 'plugins');
|
|
25
|
-
function parseEnvToJSON(env, prefixes) {
|
|
26
|
-
const result = {};
|
|
27
|
-
Object.keys(env).forEach((key) => {
|
|
28
|
-
const hasValidPrefix = prefixes.some((prefix) => key.startsWith(prefix));
|
|
29
|
-
if (!hasValidPrefix) {
|
|
30
|
-
return;
|
|
31
|
-
}
|
|
32
|
-
const strippedKey = key
|
|
33
|
-
.replace(new RegExp(`^(${prefixes.join('|')})`), '')
|
|
34
|
-
.toLowerCase();
|
|
35
|
-
const keys = strippedKey.split('_');
|
|
36
|
-
let current = result;
|
|
37
|
-
keys.forEach((k, index) => {
|
|
38
|
-
if (index === keys.length - 1) {
|
|
39
|
-
const value = env[key];
|
|
40
|
-
if (value.toLowerCase() === 'true') {
|
|
41
|
-
current[k] = true;
|
|
42
|
-
}
|
|
43
|
-
else if (value.toLowerCase() === 'false') {
|
|
44
|
-
current[k] = false;
|
|
45
|
-
}
|
|
46
|
-
else if (!isNaN(value)) {
|
|
47
|
-
current[k] = Number(value);
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
current[k] = value;
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
else {
|
|
54
|
-
current[k] = current[k] || {};
|
|
55
|
-
current = current[k];
|
|
56
|
-
}
|
|
57
|
-
});
|
|
58
|
-
});
|
|
59
|
-
return result;
|
|
60
|
-
}
|
|
61
|
-
function getEnvConfigs() {
|
|
62
|
-
const env = parseEnvToJSON(process.env, ['STEEDOS_', 'B6_']);
|
|
63
|
-
return env;
|
|
64
|
-
}
|
|
10
|
+
const env_config_1 = require("./env.config");
|
|
11
|
+
const project_config_1 = require("./project.config");
|
|
12
|
+
exports.projectConfigs = (0, project_config_1.default)(process.cwd());
|
|
65
13
|
async function getDbConfigs() {
|
|
66
14
|
return {};
|
|
67
15
|
}
|
|
68
|
-
function
|
|
69
|
-
return
|
|
16
|
+
function getEnvConfigs() {
|
|
17
|
+
return env_config_1.default;
|
|
70
18
|
}
|
|
71
|
-
function
|
|
72
|
-
const
|
|
73
|
-
const file = getFileConfigs();
|
|
19
|
+
function getMoleculerConfigs() {
|
|
20
|
+
const { moleculer } = env_config_1.default;
|
|
74
21
|
return {
|
|
75
|
-
...
|
|
76
|
-
...
|
|
77
|
-
...
|
|
22
|
+
...moleculer_config_1.default,
|
|
23
|
+
...exports.projectConfigs,
|
|
24
|
+
...moleculer,
|
|
78
25
|
};
|
|
79
26
|
}
|
|
80
|
-
function
|
|
81
|
-
const env = getEnvConfigs();
|
|
82
|
-
const file = getFileConfigs();
|
|
27
|
+
function getConfigs() {
|
|
83
28
|
return {
|
|
84
|
-
...
|
|
85
|
-
...
|
|
86
|
-
...
|
|
29
|
+
...default_config_1.default,
|
|
30
|
+
...exports.projectConfigs,
|
|
31
|
+
...env_config_1.default,
|
|
87
32
|
};
|
|
88
33
|
}
|
|
34
|
+
exports.configs = getConfigs();
|
|
89
35
|
//# sourceMappingURL=index.js.map
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;AAQA,oCAEC;AAED,sCAEC;AAED,kDAOC;AAED,gCAMC;AA9BD,qDAA8C;AAC9C,yDAAkD;AAClD,6CAAsC;AACtC,qDAAiD;AAEpC,QAAA,cAAc,GAAG,IAAA,wBAAiB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAExD,KAAK,UAAU,YAAY;IAChC,OAAO,EAAE,CAAA;AACX,CAAC;AAED,SAAgB,aAAa;IAC3B,OAAO,oBAAU,CAAA;AACnB,CAAC;AAED,SAAgB,mBAAmB;IACjC,MAAM,EAAE,SAAS,EAAE,GAAG,oBAAU,CAAC;IACjC,OAAO;QACL,GAAG,0BAAgB;QACnB,GAAG,sBAAc;QACjB,GAAG,SAAS;KACb,CAAA;AACH,CAAC;AAED,SAAgB,UAAU;IACxB,OAAO;QACL,GAAG,wBAAc;QACjB,GAAG,sBAAc;QACjB,GAAG,oBAAU;KACd,CAAA;AACH,CAAC;AAEY,QAAA,OAAO,GAAG,UAAU,EAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export default function getProjectConfigs(projectDir: string): any | null;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.default = getProjectConfigs;
|
|
4
|
+
const fs_1 = require("fs");
|
|
5
|
+
const path_1 = require("path");
|
|
6
|
+
function getProjectConfigs(projectDir) {
|
|
7
|
+
const configPath = (0, path_1.join)(projectDir, 'b6.config.js');
|
|
8
|
+
if ((0, fs_1.existsSync)(configPath)) {
|
|
9
|
+
return require(configPath);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
return {};
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=project.config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project.config.js","sourceRoot":"","sources":["../../src/config/project.config.ts"],"names":[],"mappings":";;AAGA,oCAQC;AAXD,2BAAgC;AAChC,+BAA4B;AAE5B,SAAwB,iBAAiB,CAAC,UAAkB;IACxD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAEpD,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;QACzB,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;SAAM,CAAC;QACJ,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC"}
|
|
@@ -25,7 +25,7 @@ let FilesService = FilesService_1 = class FilesService {
|
|
|
25
25
|
this.configService = configService;
|
|
26
26
|
this.mongodbService = mongodbService;
|
|
27
27
|
this.logger = new common_1.Logger(FilesService_1.name);
|
|
28
|
-
this.rootUrl = configService.get('
|
|
28
|
+
this.rootUrl = configService.get('host');
|
|
29
29
|
this.storageDir = configService.get('storage.dir') || './steedos-storage';
|
|
30
30
|
this.cfsStore = configService.get('cfs.store') || 'local';
|
|
31
31
|
if (this.cfsStore === 'S3') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.service.js","sourceRoot":"","sources":["../../src/files/files.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,+BAA+B;AAC/B,+BAA+B;AAC/B,+BAAkC;AAClC,6BAA6B;AAC7B,gEAA4D;AAE5D,mCAAmC;AACnC,2CAA+C;AAC/C,iCAAiC;AAG1B,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAQvB,YACU,aAA4B,EAC5B,cAA8B;QAD9B,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QAJvB,WAAM,GAAG,IAAI,eAAM,CAAC,cAAY,CAAC,IAAI,CAAC,CAAC;QAMtD,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"files.service.js","sourceRoot":"","sources":["../../src/files/files.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,6 @@ let MongodbService = MongodbService_1 = class MongodbService {
|
|
|
22
22
|
this.configService = configService;
|
|
23
23
|
this.logger = new common_1.Logger(MongodbService_1.name);
|
|
24
24
|
const mongoUrl = configService.get('mongo.url');
|
|
25
|
-
console.log('mongoUrl', mongoUrl);
|
|
26
25
|
this.client = new mongodb_1.MongoClient(mongoUrl, {});
|
|
27
26
|
this.client
|
|
28
27
|
.connect()
|
|
@@ -45,7 +44,6 @@ let MongodbService = MongodbService_1 = class MongodbService {
|
|
|
45
44
|
}
|
|
46
45
|
async find(collectionName, query, options = {}) {
|
|
47
46
|
const collection = this.db.collection(collectionName);
|
|
48
|
-
this.logger.log('find', query, options);
|
|
49
47
|
return await collection.find(query, options).toArray();
|
|
50
48
|
}
|
|
51
49
|
async findOne(collectionName, query, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongodb.service.js","sourceRoot":"","sources":["../../src/mongodb/mongodb.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,uCAAqC;AAErC,2CAAoD;AACpD,qCAA0C;AAC1C,+BAAoC;AACpC,2DAAsD;AACtD,2CAA+C;AAGxC,IAAM,cAAc,sBAApB,MAAM,cAAc;IAKzB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJ/B,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;QAKxD,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,
|
|
1
|
+
{"version":3,"file":"mongodb.service.js","sourceRoot":"","sources":["../../src/mongodb/mongodb.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,13 +10,14 @@ export declare class PluginModule {
|
|
|
10
10
|
static state: any;
|
|
11
11
|
static targetState: any;
|
|
12
12
|
constructor(moleculerService: MoleculerPluginService);
|
|
13
|
-
static forRootAsync(): DynamicModule;
|
|
14
13
|
onModuleInit(): void;
|
|
14
|
+
static forRootAsync(): Promise<DynamicModule>;
|
|
15
|
+
static loadPlugins(): Promise<any[]>;
|
|
15
16
|
static loadPlugin(packageName: string): any;
|
|
16
17
|
static getPackagePath(packageName: string): string;
|
|
17
18
|
static getPluginDir(): string;
|
|
18
19
|
static getInstallPackages(): {};
|
|
19
|
-
static updateNpmrc():
|
|
20
|
+
static updateNpmrc(): void;
|
|
20
21
|
static installPackages(): Promise<void>;
|
|
21
22
|
}
|
|
22
23
|
interface Plugin {
|
|
@@ -33,37 +33,32 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
33
33
|
this.moleculerService = moleculerService;
|
|
34
34
|
this.logger = new common_1.Logger(plugin_service_1.PluginService.name);
|
|
35
35
|
}
|
|
36
|
-
|
|
36
|
+
onModuleInit() {
|
|
37
|
+
this.moleculerService.loadServices();
|
|
38
|
+
}
|
|
39
|
+
static async forRootAsync() {
|
|
40
|
+
const modules = await this.loadPlugins();
|
|
37
41
|
return {
|
|
38
42
|
module: PluginModule_1,
|
|
39
|
-
imports:
|
|
40
|
-
providers: [
|
|
41
|
-
{
|
|
42
|
-
provide: 'PLUGINS',
|
|
43
|
-
useFactory: async () => {
|
|
44
|
-
const modules = process.env.B6_PLUGIN_MODULES;
|
|
45
|
-
await this.updateNpmrc();
|
|
46
|
-
await this.installPackages();
|
|
47
|
-
const plugins = [];
|
|
48
|
-
if (modules) {
|
|
49
|
-
for (const module of modules.split(',')) {
|
|
50
|
-
const pluginModule = await this.loadPlugin(module);
|
|
51
|
-
plugins.push({
|
|
52
|
-
name: module,
|
|
53
|
-
module: pluginModule,
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
}
|
|
57
|
-
this.plugins = plugins;
|
|
58
|
-
return plugins.map((plugin) => plugin.module);
|
|
59
|
-
},
|
|
60
|
-
},
|
|
61
|
-
],
|
|
62
|
-
exports: ['PLUGINS'],
|
|
43
|
+
imports: modules,
|
|
63
44
|
};
|
|
64
45
|
}
|
|
65
|
-
|
|
66
|
-
|
|
46
|
+
static async loadPlugins() {
|
|
47
|
+
const modules = process.env.B6_PLUGIN_MODULES;
|
|
48
|
+
this.updateNpmrc();
|
|
49
|
+
await this.installPackages();
|
|
50
|
+
const plugins = [];
|
|
51
|
+
if (modules) {
|
|
52
|
+
for (const module of modules.split(',')) {
|
|
53
|
+
const pluginModule = this.loadPlugin(module);
|
|
54
|
+
plugins.push({
|
|
55
|
+
name: module,
|
|
56
|
+
module: pluginModule,
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
this.plugins = plugins;
|
|
61
|
+
return plugins.map((plugin) => plugin.module);
|
|
67
62
|
}
|
|
68
63
|
static loadPlugin(packageName) {
|
|
69
64
|
const packageModulePath = path.resolve(this.getPackagePath(packageName), './dist/plugin.module.js');
|
|
@@ -113,7 +108,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
113
108
|
}
|
|
114
109
|
return {};
|
|
115
110
|
}
|
|
116
|
-
static
|
|
111
|
+
static updateNpmrc() {
|
|
117
112
|
const npmrcPath = path.join(this.getPluginDir(), '.npmrc');
|
|
118
113
|
if (this.npmrc) {
|
|
119
114
|
try {
|
|
@@ -149,7 +144,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
149
144
|
const wantedDependencies = this.getInstallPackages();
|
|
150
145
|
const existingModules = Object.keys(existingDependencies);
|
|
151
146
|
const wantedModules = Object.keys(wantedDependencies);
|
|
152
|
-
this.logger.log(`
|
|
147
|
+
this.logger.log(`Existing dependencies: ${existingModules}`);
|
|
153
148
|
let changed = false;
|
|
154
149
|
if (existingModules.length !== wantedModules.length) {
|
|
155
150
|
changed = true;
|
|
@@ -171,7 +166,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
171
166
|
}
|
|
172
167
|
if (changed) {
|
|
173
168
|
this.state = States.INSTALLING;
|
|
174
|
-
this.logger.warn(`Install
|
|
169
|
+
this.logger.warn(`Install dependencies: ${this.install_packages}`);
|
|
175
170
|
pkg.dependencies = wantedDependencies;
|
|
176
171
|
fs.writeFileSync(pkgFilePath, JSON.stringify(pkg, null, 2));
|
|
177
172
|
const npmEnv = Object.assign({}, process.env);
|
|
@@ -200,6 +195,7 @@ let PluginModule = PluginModule_1 = class PluginModule {
|
|
|
200
195
|
});
|
|
201
196
|
child.on('close', (code) => {
|
|
202
197
|
if (code === 0) {
|
|
198
|
+
this.logger.warn(`Dependencies installed: ${this.install_packages}`);
|
|
203
199
|
resolve();
|
|
204
200
|
}
|
|
205
201
|
else {
|
|
@@ -1 +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,8CAA8C;AAC9C,qDAAiD;AACjD,2DAA6D;AAC7D,mDAAsD;AAEtD,MAAM,MAAM,GAAG;IACb,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;CACrB,CAAC;AAMK,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAWvB,YAA6B,gBAAwC;QAAxC,qBAAgB,GAAhB,gBAAgB,CAAwB;QAPpD,WAAM,GAAG,IAAI,eAAM,CAAC,8BAAa,CAAC,IAAI,CAAC,CAAC;IAOe,CAAC;IAEzE,
|
|
1
|
+
{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../../src/plugin/plugin.module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.1",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist"
|
|
8
8
|
],
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@builder6/query-mongodb": "^0.
|
|
10
|
+
"@builder6/query-mongodb": "^0.9.1"
|
|
11
11
|
},
|
|
12
12
|
"scripts": {
|
|
13
13
|
"build": "rm -rf dist && tsc",
|
|
@@ -16,5 +16,5 @@
|
|
|
16
16
|
"publishConfig": {
|
|
17
17
|
"access": "public"
|
|
18
18
|
},
|
|
19
|
-
"gitHead": "
|
|
19
|
+
"gitHead": "a20e7b82c563a95d55d5afe6ea066f7d80fa4312"
|
|
20
20
|
}
|