@steedos/server 3.0.0-beta.9 → 3.0.0-beta.92
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/app.config.js +1 -0
- package/default.steedos.settings.yml +149 -0
- package/dist/app.controller.d.ts +11 -0
- package/dist/app.controller.js +23 -0
- package/dist/app.controller.js.map +1 -1
- package/dist/app.gateway.d.ts +22 -0
- package/dist/app.gateway.js +250 -0
- package/dist/app.gateway.js.map +1 -0
- package/dist/app.moleculer.d.ts +3 -1
- package/dist/app.moleculer.js +56 -6
- package/dist/app.moleculer.js.map +1 -1
- package/dist/config/index.d.ts +1 -6
- package/dist/config/index.js +4 -17
- package/dist/config/index.js.map +1 -1
- package/dist/config/moleculler.config.d.ts +1 -2
- package/dist/config/moleculler.config.js +86 -83
- package/dist/config/moleculler.config.js.map +1 -1
- package/dist/config/steedos.config.js +95 -16
- package/dist/config/steedos.config.js.map +1 -1
- package/dist/index.d.ts +14 -1
- package/dist/index.js +61 -14
- package/dist/index.js.map +1 -1
- package/dist/instance_files/file.controller.d.ts +14 -0
- package/dist/instance_files/file.controller.js +73 -0
- package/dist/instance_files/file.controller.js.map +1 -0
- package/dist/instance_files/file.moleculer.d.ts +7 -0
- package/dist/instance_files/file.moleculer.js +55 -0
- package/dist/instance_files/file.moleculer.js.map +1 -0
- package/dist/instance_files/file.service.d.ts +17 -0
- package/dist/instance_files/file.service.js +239 -0
- package/dist/instance_files/file.service.js.map +1 -0
- package/package.json +15 -76
- package/dist/app.module.d.ts +0 -4
- package/dist/app.module.js +0 -84
- package/dist/app.module.js.map +0 -1
- package/dist/bootstrap.d.ts +0 -1
- package/dist/bootstrap.js +0 -156
- package/dist/bootstrap.js.map +0 -1
- package/dist/config/env.config.d.ts +0 -1
- package/dist/config/env.config.js +0 -128
- package/dist/config/env.config.js.map +0 -1
- package/dist/config/project.config.d.ts +0 -1
- package/dist/config/project.config.js +0 -15
- package/dist/config/project.config.js.map +0 -1
- package/dist/filters/all-exceptions.filter.d.ts +0 -5
- package/dist/filters/all-exceptions.filter.js +0 -62
- package/dist/filters/all-exceptions.filter.js.map +0 -1
- package/dist/main.d.ts +0 -1
- package/dist/main.js +0 -5
- package/dist/main.js.map +0 -1
package/dist/config/index.js
CHANGED
|
@@ -12,20 +12,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports.steedosConfig = exports.getMoleculerConfigs = void 0;
|
|
16
16
|
exports.getDbConfigs = getDbConfigs;
|
|
17
17
|
exports.getSteedosConfigs = getSteedosConfigs;
|
|
18
|
-
exports.getMoleculerConfigs = getMoleculerConfigs;
|
|
19
|
-
exports.getConfigs = getConfigs;
|
|
20
18
|
const steedos_config_1 = __importDefault(require("./steedos.config"));
|
|
21
|
-
|
|
22
|
-
exports
|
|
23
|
-
const moleculler_config_1 = __importDefault(require("./moleculler.config"));
|
|
24
|
-
const project_config_1 = __importDefault(require("./project.config"));
|
|
25
|
-
exports.projectConfigs = (0, project_config_1.default)(process.cwd());
|
|
19
|
+
var moleculler_config_1 = require("./moleculler.config");
|
|
20
|
+
Object.defineProperty(exports, "getMoleculerConfigs", { enumerable: true, get: function () { return moleculler_config_1.getMoleculerConfigs; } });
|
|
26
21
|
exports.steedosConfig = steedos_config_1.default.getSteedosConfig();
|
|
27
22
|
global.Steedos = {
|
|
28
|
-
settings: exports.steedosConfig.settings
|
|
23
|
+
settings: exports.steedosConfig.settings,
|
|
29
24
|
};
|
|
30
25
|
function getDbConfigs() {
|
|
31
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -35,12 +30,4 @@ function getDbConfigs() {
|
|
|
35
30
|
function getSteedosConfigs() {
|
|
36
31
|
return exports.steedosConfig;
|
|
37
32
|
}
|
|
38
|
-
function getMoleculerConfigs() {
|
|
39
|
-
const { moleculer } = (0, env_config_1.default)();
|
|
40
|
-
return Object.assign(Object.assign({}, moleculler_config_1.default), moleculer);
|
|
41
|
-
}
|
|
42
|
-
function getConfigs() {
|
|
43
|
-
return Object.assign(Object.assign({}, exports.steedosConfig), (0, env_config_1.default)());
|
|
44
|
-
}
|
|
45
|
-
exports.configs = getConfigs();
|
|
46
33
|
//# 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":";;;;;;;;;;;;;;;AAiBA,oCAEC;AAED,8CAEC;AAhBD,sEAA6C;AAE7C,yDAA0D;AAAjD,wHAAA,mBAAmB,OAAA;AAEf,QAAA,aAAa,GAAG,wBAAa,CAAC,gBAAgB,EAAE,CAAC;AAE9D,MAAM,CAAC,OAAO,GAAG;IACf,QAAQ,EAAE,qBAAa,CAAC,QAAQ;CACjC,CAAC;AAEF,SAAsB,YAAY;;QAChC,OAAO,EAAE,CAAC;IACZ,CAAC;CAAA;AAED,SAAgB,iBAAiB;IAC/B,OAAO,qBAAa,CAAC;AACvB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
declare
|
|
1
|
+
export declare function getMoleculerConfigs(): {
|
|
2
2
|
namespace: string;
|
|
3
3
|
nodeID: any;
|
|
4
4
|
metadata: {};
|
|
@@ -60,4 +60,3 @@ declare const _default: {
|
|
|
60
60
|
started(broker: any): void;
|
|
61
61
|
stopped(broker: any): void;
|
|
62
62
|
};
|
|
63
|
-
export default _default;
|
|
@@ -9,88 +9,91 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
12
|
+
exports.getMoleculerConfigs = getMoleculerConfigs;
|
|
13
|
+
function getMoleculerConfigs() {
|
|
14
|
+
return {
|
|
15
|
+
namespace: "steedos",
|
|
16
|
+
nodeID: null,
|
|
17
|
+
metadata: {},
|
|
18
|
+
logger: {
|
|
19
|
+
type: "Console",
|
|
20
|
+
options: {
|
|
21
|
+
level: process.env.B6_MO_LOG_LEVEL,
|
|
22
|
+
colors: true,
|
|
23
|
+
moduleColors: false,
|
|
24
|
+
formatter: "[MO] {timestamp} {level} [{mod}] {msg}",
|
|
25
|
+
objectPrinter: null,
|
|
26
|
+
autoPadding: false,
|
|
27
|
+
},
|
|
25
28
|
},
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
}
|
|
89
|
-
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
}
|
|
29
|
+
transporter: process.env.B6_TRANSPORTER,
|
|
30
|
+
cacher: process.env.B6_CACHER,
|
|
31
|
+
serializer: "JSON",
|
|
32
|
+
requestTimeout: 0,
|
|
33
|
+
retryPolicy: {
|
|
34
|
+
enabled: false,
|
|
35
|
+
},
|
|
36
|
+
maxCallLevel: 100,
|
|
37
|
+
heartbeatInterval: 10,
|
|
38
|
+
heartbeatTimeout: 30,
|
|
39
|
+
contextParamsCloning: false,
|
|
40
|
+
tracking: {
|
|
41
|
+
enabled: false,
|
|
42
|
+
},
|
|
43
|
+
disableBalancer: false,
|
|
44
|
+
registry: {
|
|
45
|
+
strategy: "RoundRobin",
|
|
46
|
+
preferLocal: true,
|
|
47
|
+
},
|
|
48
|
+
circuitBreaker: {
|
|
49
|
+
enabled: false,
|
|
50
|
+
threshold: 0.5,
|
|
51
|
+
minRequestCount: 20,
|
|
52
|
+
windowTime: 60,
|
|
53
|
+
halfOpenTime: 10000,
|
|
54
|
+
check: (err) => err && err.code >= 500,
|
|
55
|
+
},
|
|
56
|
+
bulkhead: {
|
|
57
|
+
enabled: false,
|
|
58
|
+
concurrency: 10,
|
|
59
|
+
maxQueueSize: 100,
|
|
60
|
+
},
|
|
61
|
+
validator: true,
|
|
62
|
+
errorHandler: null,
|
|
63
|
+
metrics: {
|
|
64
|
+
enabled: false,
|
|
65
|
+
},
|
|
66
|
+
tracing: {
|
|
67
|
+
enabled: false,
|
|
68
|
+
},
|
|
69
|
+
middlewares: [],
|
|
70
|
+
replCommands: null,
|
|
71
|
+
skipProcessEventRegistration: true,
|
|
72
|
+
created(broker) {
|
|
73
|
+
global.broker = broker;
|
|
74
|
+
broker.logger.warn("Clear all cache entries on startup.");
|
|
75
|
+
broker.cacher.clean();
|
|
76
|
+
const objectql = require("@steedos/objectql");
|
|
77
|
+
objectql.broker.init(broker);
|
|
78
|
+
process.on("SIGTERM", close.bind(broker, "SIGTERM"));
|
|
79
|
+
process.on("SIGINT", close.bind(broker, "SIGINT"));
|
|
80
|
+
function close(signal) {
|
|
81
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
82
|
+
try {
|
|
83
|
+
yield this.cacher.clean();
|
|
84
|
+
yield this.cacher.close();
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
}
|
|
88
|
+
console.log(`[${signal}]服务已停止: namespace: ${this.namespace}, nodeID: ${this.nodeID}`);
|
|
89
|
+
process.exit(0);
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
started(broker) {
|
|
94
|
+
},
|
|
95
|
+
stopped(broker) {
|
|
96
|
+
},
|
|
97
|
+
};
|
|
98
|
+
}
|
|
96
99
|
//# sourceMappingURL=moleculler.config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"moleculler.config.js","sourceRoot":"","sources":["../../src/config/moleculler.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"moleculler.config.js","sourceRoot":"","sources":["../../src/config/moleculler.config.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;;AASb,kDAiIC;AAjID,SAAgB,mBAAmB;IACjC,OAAO;QACL,SAAS,EAAE,SAAS;QACpB,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,EAAE;QAYZ,MAAM,EAAE;YACN,IAAI,EAAE,SAAS;YACf,OAAO,EAAE;gBAEP,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;gBAElC,MAAM,EAAE,IAAI;gBAEZ,YAAY,EAAE,KAAK;gBAEnB,SAAS,EAAE,wCAAwC;gBAEnD,aAAa,EAAE,IAAI;gBAEnB,WAAW,EAAE,KAAK;aACnB;SACF;QAED,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;QAEvC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;QAE7B,UAAU,EAAE,MAAM;QAElB,cAAc,EAAE,CAAC;QAEjB,WAAW,EAAE;YACX,OAAO,EAAE,KAAK;SACf;QAED,YAAY,EAAE,GAAG;QAEjB,iBAAiB,EAAE,EAAE;QACrB,gBAAgB,EAAE,EAAE;QAEpB,oBAAoB,EAAE,KAAK;QAE3B,QAAQ,EAAE;YACR,OAAO,EAAE,KAAK;SACf;QAED,eAAe,EAAE,KAAK;QAEtB,QAAQ,EAAE;YACR,QAAQ,EAAE,YAAY;YACtB,WAAW,EAAE,IAAI;SAClB;QAED,cAAc,EAAE;YACd,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,GAAG;YACd,eAAe,EAAE,EAAE;YACnB,UAAU,EAAE,EAAE;YACd,YAAY,EAAE,KAAK;YACnB,KAAK,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG;SAC5C;QAED,QAAQ,EAAE;YACR,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,EAAE;YACf,YAAY,EAAE,GAAG;SAClB;QAED,SAAS,EAAE,IAAI;QAEf,YAAY,EAAE,IAAI;QAElB,OAAO,EAAE;YACP,OAAO,EAAE,KAAK;SACf;QAED,OAAO,EAAE;YACP,OAAO,EAAE,KAAK;SACf;QAED,WAAW,EAAE,EAAE;QAEf,YAAY,EAAE,IAAI;QAElB,4BAA4B,EAAE,IAAI;QAElC,OAAO,CAAC,MAAW;YACjB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;YAEvB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;YAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAC9C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE7B,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;YACrD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;YACnD,SAAe,KAAK,CAAC,MAAM;;oBACzB,IAAI,CAAC;wBACH,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;wBAC1B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;oBAC5B,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;oBAEjB,CAAC;oBACD,OAAO,CAAC,GAAG,CACT,IAAI,MAAM,sBAAsB,IAAI,CAAC,SAAS,aAAa,IAAI,CAAC,MAAM,EAAE,CACzE,CAAC;oBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;aAAA;QACH,CAAC;QAED,OAAO,CAAC,MAAW;QAEnB,CAAC;QAED,OAAO,CAAC,MAAW;QAEnB,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.steedosConfig = void 0;
|
|
4
7
|
exports.isObject = isObject;
|
|
@@ -6,11 +9,72 @@ exports.isFunction = isFunction;
|
|
|
6
9
|
exports.isPlainObject = isPlainObject;
|
|
7
10
|
exports.isJsonMap = isJsonMap;
|
|
8
11
|
const lodash_1 = require("lodash");
|
|
12
|
+
const dotenv_flow_1 = __importDefault(require("dotenv-flow"));
|
|
13
|
+
dotenv_flow_1.default.config({
|
|
14
|
+
path: process.cwd(),
|
|
15
|
+
silent: true,
|
|
16
|
+
});
|
|
17
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN)) {
|
|
18
|
+
process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN = "true";
|
|
19
|
+
}
|
|
20
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_WIDGETS_ADDITIONAL)) {
|
|
21
|
+
process.env.STEEDOS_WIDGETS_ADDITIONAL = "@steedos-widgets/liveblocks";
|
|
22
|
+
}
|
|
23
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_UNPKG_URL)) {
|
|
24
|
+
process.env.STEEDOS_UNPKG_URL = "https://unpkg.steedos.cn";
|
|
25
|
+
}
|
|
26
|
+
process.env.STEEDOS_UNPKG_URL = process.env.STEEDOS_UNPKG_URL.replace(/\/+$/, "");
|
|
27
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_BUILDER_URL)) {
|
|
28
|
+
process.env.STEEDOS_BUILDER_URL = "https://6-3.builder.steedos.com";
|
|
29
|
+
}
|
|
30
|
+
process.env.STEEDOS_BUILDER_URL = process.env.STEEDOS_BUILDER_URL.replace(/\/+$/, "");
|
|
31
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_AMIS_VERSION)) {
|
|
32
|
+
process.env.STEEDOS_AMIS_VERSION = "6.3.0-patch.6";
|
|
33
|
+
}
|
|
34
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_AMIS_URL)) {
|
|
35
|
+
process.env.STEEDOS_AMIS_URL =
|
|
36
|
+
process.env.STEEDOS_UNPKG_URL +
|
|
37
|
+
"/@steedos-widgets/amis@" +
|
|
38
|
+
process.env.STEEDOS_AMIS_VERSION;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace("https://unpkg.com", process.env.STEEDOS_UNPKG_URL);
|
|
42
|
+
}
|
|
43
|
+
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace(/\/+$/, "");
|
|
44
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_WIDGETS_VERSION)) {
|
|
45
|
+
process.env.STEEDOS_WIDGETS_VERSION = "v6.10.1-beta.53";
|
|
46
|
+
}
|
|
47
|
+
if ((0, lodash_1.isEmpty)(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) {
|
|
48
|
+
const widgetsVersion = process.env.STEEDOS_WIDGETS_VERSION;
|
|
49
|
+
const unpkgUrl = process.env.STEEDOS_UNPKG_URL;
|
|
50
|
+
let steedosPublicPageAsseturls = `${unpkgUrl}/@steedos-widgets/amis-object@${widgetsVersion}/dist/assets.json`;
|
|
51
|
+
if (!(0, lodash_1.isEmpty)(process.env.STEEDOS_WIDGETS_ADDITIONAL)) {
|
|
52
|
+
process.env.STEEDOS_WIDGETS_ADDITIONAL.split(",").forEach((additional) => {
|
|
53
|
+
const lastAtIndex = additional.lastIndexOf("@");
|
|
54
|
+
let packageName = additional;
|
|
55
|
+
let versionToUse = widgetsVersion;
|
|
56
|
+
if (lastAtIndex > 0) {
|
|
57
|
+
packageName = additional.substring(0, lastAtIndex);
|
|
58
|
+
versionToUse = additional.substring(lastAtIndex + 1) || widgetsVersion;
|
|
59
|
+
}
|
|
60
|
+
steedosPublicPageAsseturls += `,${unpkgUrl}/${packageName}@${versionToUse}/dist/assets.json`;
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = steedosPublicPageAsseturls;
|
|
64
|
+
}
|
|
65
|
+
if ((0, lodash_1.isEmpty)(process.env.SERIALIZER)) {
|
|
66
|
+
process.env.SERIALIZER = "JSON";
|
|
67
|
+
}
|
|
68
|
+
if ((0, lodash_1.isEmpty)(process.env.ROOT_URL)) {
|
|
69
|
+
console.error("ERROR: Environment variable ROOT_URL is not defined.");
|
|
70
|
+
process.env.ROOT_URL = "http://localhost";
|
|
71
|
+
}
|
|
72
|
+
process.env.ROOT_URL = process.env.ROOT_URL.replace(/\/+$/, "");
|
|
9
73
|
const path = require("path");
|
|
10
74
|
const fs = require("fs");
|
|
11
75
|
const clone = require("clone");
|
|
12
|
-
const validator = require(
|
|
13
|
-
const yaml = require(
|
|
76
|
+
const validator = require("validator");
|
|
77
|
+
const yaml = require("js-yaml");
|
|
14
78
|
function calcString(str, content = process.env) {
|
|
15
79
|
if (!(0, lodash_1.isString)(str)) {
|
|
16
80
|
return str;
|
|
@@ -18,12 +82,15 @@ function calcString(str, content = process.env) {
|
|
|
18
82
|
let calcFun = null;
|
|
19
83
|
var reg = /(\${[^{}]*\})/g;
|
|
20
84
|
let rev = str.replace(reg, function (m, $1) {
|
|
21
|
-
return $1.replace(/\{\s*/,
|
|
85
|
+
return $1.replace(/\{\s*/, '{args["').replace(/\s*\}/, '"]}');
|
|
22
86
|
});
|
|
23
87
|
eval(`calcFun = function(args){return \`${rev}\`}`);
|
|
24
88
|
let val = calcFun.call({}, content);
|
|
25
89
|
if ((0, lodash_1.isString)(val) && val) {
|
|
26
|
-
return val
|
|
90
|
+
return val
|
|
91
|
+
.replace(/\\r/g, "\r")
|
|
92
|
+
.replace(/\\n/g, "\n")
|
|
93
|
+
.replace(/undefined/g, "");
|
|
27
94
|
}
|
|
28
95
|
else {
|
|
29
96
|
return null;
|
|
@@ -38,14 +105,22 @@ function calcSteedosConfig(config) {
|
|
|
38
105
|
}
|
|
39
106
|
else {
|
|
40
107
|
config[k] = calcString(v);
|
|
41
|
-
if (k &&
|
|
108
|
+
if (k &&
|
|
109
|
+
(0, lodash_1.isString)(k) &&
|
|
110
|
+
k.startsWith("enable_") &&
|
|
111
|
+
config[k] &&
|
|
112
|
+
(0, lodash_1.isString)(config[k])) {
|
|
42
113
|
config[k] = validator.toBoolean(config[k], true);
|
|
43
114
|
}
|
|
44
115
|
}
|
|
45
116
|
}
|
|
46
117
|
else {
|
|
47
118
|
config[k] = calcString(v);
|
|
48
|
-
if (k &&
|
|
119
|
+
if (k &&
|
|
120
|
+
(0, lodash_1.isString)(k) &&
|
|
121
|
+
k.startsWith("enable_") &&
|
|
122
|
+
config[k] &&
|
|
123
|
+
(0, lodash_1.isString)(config[k])) {
|
|
49
124
|
config[k] = validator.toBoolean(config[k], true);
|
|
50
125
|
}
|
|
51
126
|
}
|
|
@@ -54,7 +129,7 @@ function calcSteedosConfig(config) {
|
|
|
54
129
|
}
|
|
55
130
|
class SteedosConfig {
|
|
56
131
|
static loadDefaultSettings() {
|
|
57
|
-
const filePath = path.join(__dirname,
|
|
132
|
+
const filePath = path.join(__dirname, "..", "..", "default.steedos.settings.yml");
|
|
58
133
|
if (fs.existsSync(filePath) && !fs.statSync(filePath).isDirectory()) {
|
|
59
134
|
return SteedosConfig.loadSettings(filePath);
|
|
60
135
|
}
|
|
@@ -63,7 +138,7 @@ class SteedosConfig {
|
|
|
63
138
|
}
|
|
64
139
|
}
|
|
65
140
|
static loadProjectSettings() {
|
|
66
|
-
let configPath = path.join(process.cwd(),
|
|
141
|
+
let configPath = path.join(process.cwd(), "steedos-config.yml");
|
|
67
142
|
if (fs.existsSync(configPath) && !fs.statSync(configPath).isDirectory()) {
|
|
68
143
|
return SteedosConfig.loadSettings(configPath);
|
|
69
144
|
}
|
|
@@ -78,7 +153,7 @@ class SteedosConfig {
|
|
|
78
153
|
const _defaultConfig = (0, lodash_1.defaultsDeep)({}, { settings: defaultSettings });
|
|
79
154
|
const res = (0, lodash_1.cloneDeep)(_defaultConfig);
|
|
80
155
|
const mods = (0, lodash_1.cloneDeep)(_projectConfig);
|
|
81
|
-
Object.keys(mods).forEach(key => {
|
|
156
|
+
Object.keys(mods).forEach((key) => {
|
|
82
157
|
if (["created", "started", "stopped"].indexOf(key) !== -1) {
|
|
83
158
|
const functionArray = SteedosConfig.mergeSchemaLifecycleHandlers(mods[key], res[key]);
|
|
84
159
|
if (functionArray.length > 0) {
|
|
@@ -105,7 +180,7 @@ class SteedosConfig {
|
|
|
105
180
|
}
|
|
106
181
|
SteedosConfig.loadSettings = (filePath) => {
|
|
107
182
|
try {
|
|
108
|
-
const settings = yaml.load(fs.readFileSync(filePath,
|
|
183
|
+
const settings = yaml.load(fs.readFileSync(filePath, "utf8"));
|
|
109
184
|
if (settings.env) {
|
|
110
185
|
(0, lodash_1.each)(settings.env, function (item, key) {
|
|
111
186
|
process.env[key] = calcString(item);
|
|
@@ -113,7 +188,11 @@ SteedosConfig.loadSettings = (filePath) => {
|
|
|
113
188
|
}
|
|
114
189
|
let emailConfig = settings.email;
|
|
115
190
|
if (emailConfig) {
|
|
116
|
-
if (!emailConfig.url &&
|
|
191
|
+
if (!emailConfig.url &&
|
|
192
|
+
emailConfig.host &&
|
|
193
|
+
emailConfig.port &&
|
|
194
|
+
emailConfig.username &&
|
|
195
|
+
emailConfig.password) {
|
|
117
196
|
let url = `smtps://${emailConfig.username}:${emailConfig.password}@${emailConfig.host}:${emailConfig.port}/`;
|
|
118
197
|
emailConfig.url = url;
|
|
119
198
|
}
|
|
@@ -133,18 +212,18 @@ SteedosConfig.loadSettings = (filePath) => {
|
|
|
133
212
|
return res;
|
|
134
213
|
}
|
|
135
214
|
catch (error) {
|
|
136
|
-
console.error(
|
|
215
|
+
console.error("loadFile error", filePath, error);
|
|
137
216
|
}
|
|
138
217
|
};
|
|
139
218
|
exports.default = SteedosConfig;
|
|
140
219
|
function isObject(value) {
|
|
141
|
-
return value != null && (typeof value ===
|
|
220
|
+
return (value != null && (typeof value === "object" || typeof value === "function"));
|
|
142
221
|
}
|
|
143
222
|
function isFunction(value) {
|
|
144
|
-
return typeof value ===
|
|
223
|
+
return typeof value === "function";
|
|
145
224
|
}
|
|
146
225
|
function isPlainObject(value) {
|
|
147
|
-
const isObjectObject = (o) => isObject(o) && Object.prototype.toString.call(o) ===
|
|
226
|
+
const isObjectObject = (o) => isObject(o) && Object.prototype.toString.call(o) === "[object Object]";
|
|
148
227
|
if (!isObjectObject(value))
|
|
149
228
|
return false;
|
|
150
229
|
const ctor = value.constructor;
|
|
@@ -152,7 +231,7 @@ function isPlainObject(value) {
|
|
|
152
231
|
return false;
|
|
153
232
|
if (!isObjectObject(ctor.prototype))
|
|
154
233
|
return false;
|
|
155
|
-
if (!ctor.prototype.hasOwnProperty(
|
|
234
|
+
if (!ctor.prototype.hasOwnProperty("isPrototypeOf"))
|
|
156
235
|
return false;
|
|
157
236
|
return true;
|
|
158
237
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"steedos.config.js","sourceRoot":"","sources":["../../src/config/steedos.config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"steedos.config.js","sourceRoot":"","sources":["../../src/config/steedos.config.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1 +1,14 @@
|
|
|
1
|
-
|
|
1
|
+
import { AppController } from "./app.controller";
|
|
2
|
+
import { AppMoleculer } from "./app.moleculer";
|
|
3
|
+
import { AppGateway } from "./app.gateway";
|
|
4
|
+
import { InstanceFileController } from "./instance_files/file.controller";
|
|
5
|
+
import { FileService } from "./instance_files/file.service";
|
|
6
|
+
import { FileMoleculer } from "./instance_files/file.moleculer";
|
|
7
|
+
export declare const modulesConfig: {
|
|
8
|
+
moleculer: (config: any) => any;
|
|
9
|
+
};
|
|
10
|
+
export declare const beforeServerStart: ({ app }: {
|
|
11
|
+
app: any;
|
|
12
|
+
}) => void;
|
|
13
|
+
export declare const controllers: (typeof AppController | typeof InstanceFileController)[];
|
|
14
|
+
export declare const providers: (typeof AppGateway | typeof AppMoleculer | typeof FileService | typeof FileMoleculer)[];
|
package/dist/index.js
CHANGED
|
@@ -1,18 +1,65 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
4
|
};
|
|
16
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
|
|
6
|
+
exports.providers = exports.controllers = exports.beforeServerStart = exports.modulesConfig = void 0;
|
|
7
|
+
const path_1 = __importDefault(require("path"));
|
|
8
|
+
const app_controller_1 = require("./app.controller");
|
|
9
|
+
const app_moleculer_1 = require("./app.moleculer");
|
|
10
|
+
const app_gateway_1 = require("./app.gateway");
|
|
11
|
+
const express_1 = __importDefault(require("express"));
|
|
12
|
+
const config_1 = require("./config");
|
|
13
|
+
const file_controller_1 = require("./instance_files/file.controller");
|
|
14
|
+
const file_service_1 = require("./instance_files/file.service");
|
|
15
|
+
const file_moleculer_1 = require("./instance_files/file.moleculer");
|
|
16
|
+
const steedosConfig = (0, config_1.getSteedosConfigs)();
|
|
17
|
+
exports.modulesConfig = {
|
|
18
|
+
moleculer: (config) => {
|
|
19
|
+
return Object.assign(Object.assign(Object.assign({}, config), (0, config_1.getMoleculerConfigs)()), steedosConfig);
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
const beforeServerStart = ({ app }) => {
|
|
23
|
+
process.on("uncaughtException", (error) => {
|
|
24
|
+
console.error("uncaughtException:", error);
|
|
25
|
+
});
|
|
26
|
+
global.logger = app.logger;
|
|
27
|
+
const expressApp = app.getHttpAdapter().getInstance();
|
|
28
|
+
expressApp.use(require("@steedos/router").staticRouter());
|
|
29
|
+
const webappPackagePath = require.resolve("@steedos/webapp/package.json");
|
|
30
|
+
const webappDistPath = path_1.default.join(path_1.default.dirname(webappPackagePath), "dist");
|
|
31
|
+
if (webappPackagePath) {
|
|
32
|
+
expressApp.use("/", express_1.default.static(webappDistPath));
|
|
33
|
+
expressApp.get("/app/*react", (req, res) => {
|
|
34
|
+
res.sendFile(path_1.default.join(webappDistPath, "index.html"));
|
|
35
|
+
});
|
|
36
|
+
const frontendRoutes = [
|
|
37
|
+
"/logout",
|
|
38
|
+
"/signup",
|
|
39
|
+
"/login",
|
|
40
|
+
"/",
|
|
41
|
+
"/create-space",
|
|
42
|
+
"/select-space",
|
|
43
|
+
"/update-password",
|
|
44
|
+
"/verify/email",
|
|
45
|
+
"/verify/mobile",
|
|
46
|
+
"/home",
|
|
47
|
+
"/home/:spaceId",
|
|
48
|
+
"/app",
|
|
49
|
+
"/app/:appId",
|
|
50
|
+
"/app/:appId/page/:pageId",
|
|
51
|
+
"/app/:appId/:objectName",
|
|
52
|
+
"/app/:appId/:objectName/grid/:listviewId",
|
|
53
|
+
"/app/:appId/:objectName/:recordId/:relatedObjectName/grid",
|
|
54
|
+
"/app/:appId/:objectName/view/:recordId",
|
|
55
|
+
"/app/:appId/tab_iframe/:tabId",
|
|
56
|
+
];
|
|
57
|
+
expressApp.get(frontendRoutes, (req, res) => {
|
|
58
|
+
res.sendFile(path_1.default.join(webappDistPath, "index.html"));
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
};
|
|
62
|
+
exports.beforeServerStart = beforeServerStart;
|
|
63
|
+
exports.controllers = [app_controller_1.AppController, file_controller_1.InstanceFileController];
|
|
64
|
+
exports.providers = [app_moleculer_1.AppMoleculer, app_gateway_1.AppGateway, file_service_1.FileService, file_moleculer_1.FileMoleculer];
|
|
18
65
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAkC;AAClC,qDAAiD;AACjD,mDAA+C;AAC/C,+CAA2C;AAC3C,sDAA8B;AAE9B,qCAAkE;AAClE,sEAA0E;AAC1E,gEAA4D;AAC5D,oEAAgE;AAEhE,MAAM,aAAa,GAAG,IAAA,0BAAiB,GAAE,CAAC;AAE7B,QAAA,aAAa,GAAG;IAC3B,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE;QACpB,qDACK,MAAM,GACN,IAAA,4BAAmB,GAAE,GACrB,aAAa,EAChB;IACJ,CAAC;CACF,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE;IAC3C,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE;QACxC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE3B,MAAM,UAAU,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC,WAAW,EAAE,CAAC;IAEtD,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAG1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAC,CAAC;IAE1E,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,CAAC;IAG1E,IAAI,iBAAiB,EAAE,CAAC;QACtB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QACpD,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACzC,GAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG;YACrB,SAAS;YACT,SAAS;YACT,QAAQ;YACR,GAAG;YACH,eAAe;YACf,eAAe;YACf,kBAAkB;YAClB,eAAe;YACf,gBAAgB;YAChB,OAAO;YACP,gBAAgB;YAChB,MAAM;YACN,aAAa;YACb,0BAA0B;YAC1B,yBAAyB;YACzB,0CAA0C;YAC1C,2DAA2D;YAC3D,wCAAwC;YACxC,+BAA+B;SAChC,CAAC;QACF,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC1C,GAAG,CAAC,QAAQ,CAAC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAhDW,QAAA,iBAAiB,qBAgD5B;AAMW,QAAA,WAAW,GAAG,CAAC,8BAAa,EAAE,wCAAsB,CAAC,CAAC;AAEtD,QAAA,SAAS,GAAG,CAAC,4BAAY,EAAE,wBAAU,EAAE,0BAAW,EAAE,8BAAa,CAAC,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { MongodbService } from "@builder6/core";
|
|
2
|
+
import { Request } from "express";
|
|
3
|
+
import { FileService } from "./file.service";
|
|
4
|
+
export declare class InstanceFileController {
|
|
5
|
+
private fileService;
|
|
6
|
+
private mongodbService;
|
|
7
|
+
constructor(fileService: FileService, mongodbService: MongodbService);
|
|
8
|
+
uploadFile(instanceId: string, req: Request, file: any): Promise<{
|
|
9
|
+
version_id: any;
|
|
10
|
+
size: any;
|
|
11
|
+
}>;
|
|
12
|
+
copyFiles(): Promise<void>;
|
|
13
|
+
private formatFileName;
|
|
14
|
+
}
|