@builder6/core 3.0.11 → 3.1.0-alpha.0
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/config/env.config.d.ts +1 -1
- package/dist/config/env.config.js +13 -13
- package/dist/config/env.config.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.js +2 -3
- package/dist/config/index.js.map +1 -1
- package/dist/websockets/io-adapter.js +1 -1
- package/dist/websockets/io-adapter.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
export default function getEnvConfigs(): any;
|
|
1
|
+
export default function getEnvConfigs(prefixes?: string[]): any;
|
|
@@ -10,23 +10,23 @@ dotenv_flow_1.default.config({
|
|
|
10
10
|
path: process.cwd(),
|
|
11
11
|
silent: true,
|
|
12
12
|
});
|
|
13
|
-
process.env.B6_PORT = process.env.B6_PORT || process.env.PORT;
|
|
14
|
-
process.env.B6_ROOT_URL = process.env.B6_ROOT_URL || process.env.ROOT_URL;
|
|
15
|
-
process.env.B6_MONGO_URL = process.env.B6_MONGO_URL || process.env.MONGO_URL;
|
|
13
|
+
process.env.B6_PORT = process.env.B6_PORT || process.env.PORT || '5100';
|
|
14
|
+
process.env.B6_ROOT_URL = process.env.B6_ROOT_URL || process.env.ROOT_URL || 'http://127.0.0.1:5100';
|
|
15
|
+
process.env.B6_MONGO_URL = process.env.B6_MONGO_URL || process.env.MONGO_URL || 'mongodb://127.0.0.1/steedos';
|
|
16
16
|
process.env.B6_TRANSPORTER =
|
|
17
|
-
process.env.B6_TRANSPORTER || process.env.TRANSPORTER || '';
|
|
17
|
+
process.env.B6_TRANSPORTER || process.env.TRANSPORTER || 'redis://127.0.0.1:6379';
|
|
18
18
|
process.env.B6_CACHER =
|
|
19
19
|
process.env.B6_CACHER ||
|
|
20
20
|
process.env.STEEDOS_CACHER ||
|
|
21
21
|
process.env.CACHER ||
|
|
22
|
-
'';
|
|
22
|
+
'redis://127.0.0.1:6379/1';
|
|
23
23
|
process.env.B6_CLUSTER_TRANSPORTER =
|
|
24
24
|
process.env.B6_CLUSTER_TRANSPORTER || process.env.B6_TRANSPORTER;
|
|
25
25
|
process.env.B6_CLUSTER_CACHER =
|
|
26
|
-
process.env.B6_CLUSTER_CACHER || process.env.
|
|
26
|
+
process.env.B6_CLUSTER_CACHER || process.env.B6_TRANSPORTER;
|
|
27
27
|
process.env.B6_NAMESPACE = process.env.B6_NAMESPACE || 'steedos';
|
|
28
28
|
process.env.B6_JWT_SECRET =
|
|
29
|
-
process.env.B6_JWT_SECRET || process.env.JWT_SECRET || '';
|
|
29
|
+
process.env.B6_JWT_SECRET || process.env.JWT_SECRET || 'steedos';
|
|
30
30
|
process.env.B6_SESSION_SECRET =
|
|
31
31
|
process.env.B6_SESSION_SECRET || 'steedos-session-secret';
|
|
32
32
|
process.env.B6_HOME = process.cwd();
|
|
@@ -81,12 +81,12 @@ function parseEnvToJSON(env, prefixes) {
|
|
|
81
81
|
});
|
|
82
82
|
return result;
|
|
83
83
|
}
|
|
84
|
-
function getEnvConfigs() {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
...env.
|
|
89
|
-
};
|
|
84
|
+
function getEnvConfigs(prefixes = ['B6', 'STEEDOS']) {
|
|
85
|
+
let envConfigs = {};
|
|
86
|
+
prefixes.forEach(prefix => {
|
|
87
|
+
const env = parseEnvToJSON(process.env, [`${prefix}_`]);
|
|
88
|
+
envConfigs = { ...envConfigs, ...env[prefix.toLowerCase()] };
|
|
89
|
+
});
|
|
90
90
|
return envConfigs;
|
|
91
91
|
}
|
|
92
92
|
//# sourceMappingURL=env.config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.config.js","sourceRoot":"","sources":["../../src/config/env.config.ts"],"names":[],"mappings":";;;;;AAuGA,
|
|
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,6 +1,6 @@
|
|
|
1
1
|
import getEnvConfigs from './env.config';
|
|
2
2
|
export declare function getDbConfigs(): Promise<{}>;
|
|
3
|
-
export declare function getMoleculerConfigs(): any;
|
|
3
|
+
export declare function getMoleculerConfigs(overrideMoleculerConfigs: any): any;
|
|
4
4
|
export declare function getConfigs(): any;
|
|
5
5
|
export declare const configs: any;
|
|
6
6
|
export { getEnvConfigs };
|
package/dist/config/index.js
CHANGED
|
@@ -14,11 +14,10 @@ const moleculer_config_1 = __importDefault(require("./moleculer.config"));
|
|
|
14
14
|
async function getDbConfigs() {
|
|
15
15
|
return {};
|
|
16
16
|
}
|
|
17
|
-
function getMoleculerConfigs() {
|
|
18
|
-
const { moleculer } = (0, env_config_1.default)();
|
|
17
|
+
function getMoleculerConfigs(overrideMoleculerConfigs) {
|
|
19
18
|
return {
|
|
20
19
|
...moleculer_config_1.default,
|
|
21
|
-
...
|
|
20
|
+
...(0, env_config_1.default)(),
|
|
22
21
|
};
|
|
23
22
|
}
|
|
24
23
|
function getConfigs() {
|
package/dist/config/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;AAIA,oCAEC;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;AAIA,oCAEC;AAED,kDAKC;AAED,gCAKC;AApBD,sEAA8C;AAC9C,8DAAyC;AAuBhC,wBAvBF,oBAAa,CAuBE;AAtBtB,0EAAkD;AAE3C,KAAK,UAAU,YAAY;IAChC,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,mBAAmB,CAAC,wBAAwB;IAC1D,OAAO;QACL,GAAG,0BAAgB;QACnB,GAAG,IAAA,oBAAa,GAAE;KACnB,CAAC;AACJ,CAAC;AAED,SAAgB,UAAU;IACxB,OAAO;QACL,GAAG,wBAAc;QACjB,GAAG,IAAA,oBAAa,GAAE;KACnB,CAAC;AACJ,CAAC;AAEY,QAAA,OAAO,GAAG,UAAU,EAAE,CAAC"}
|
|
@@ -7,7 +7,7 @@ const redis_1 = require("redis");
|
|
|
7
7
|
class RedisIoAdapter extends platform_socket_io_1.IoAdapter {
|
|
8
8
|
async connectToRedis() {
|
|
9
9
|
const pubClient = (0, redis_1.createClient)({
|
|
10
|
-
url: process.env.B6_CLUSTER_TRANSPORTER
|
|
10
|
+
url: process.env.B6_CLUSTER_TRANSPORTER,
|
|
11
11
|
});
|
|
12
12
|
const subClient = pubClient.duplicate();
|
|
13
13
|
await Promise.all([pubClient.connect(), subClient.connect()]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"io-adapter.js","sourceRoot":"","sources":["../../src/websockets/io-adapter.ts"],"names":[],"mappings":";;;AAAA,mEAAuD;AAEvD,4DAAyD;AACzD,iCAAqC;AAErC,MAAa,cAAe,SAAQ,8BAAS;IAG3C,KAAK,CAAC,cAAc;QAClB,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC;YAC7B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB
|
|
1
|
+
{"version":3,"file":"io-adapter.js","sourceRoot":"","sources":["../../src/websockets/io-adapter.ts"],"names":[],"mappings":";;;AAAA,mEAAuD;AAEvD,4DAAyD;AACzD,iCAAqC;AAErC,MAAa,cAAe,SAAQ,8BAAS;IAG3C,KAAK,CAAC,cAAc;QAClB,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC;YAC7B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB;SACxC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,EAAE,CAAC;QAExC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAE9D,IAAI,CAAC,kBAAkB,GAAG,IAAA,6BAAa,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED,cAAc,CAAC,IAAY,EAAE,OAAuB;QAClD,MAAM,MAAM,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACnD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAnBD,wCAmBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/core",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.1.0-alpha.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"files": [
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
],
|
|
10
10
|
"dependencies": {
|
|
11
11
|
"@aws-sdk/client-cloudwatch-logs": "^3.721.0",
|
|
12
|
-
"@builder6/query-mongodb": "3.0.
|
|
12
|
+
"@builder6/query-mongodb": "3.1.0-alpha.0",
|
|
13
13
|
"@socket.io/redis-adapter": "^8.3.0",
|
|
14
14
|
"socket.io-adapter": "^2.5.5"
|
|
15
15
|
},
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
},
|
|
29
29
|
"scripts": {
|
|
30
30
|
"format": "prettier --write \"src/**/*.ts\"",
|
|
31
|
-
"build": "rimraf dist && tsc",
|
|
31
|
+
"build": "npx rimraf dist && npx tsc",
|
|
32
32
|
"build:watch": "rimraf dist && tsc --watch"
|
|
33
33
|
},
|
|
34
34
|
"publishConfig": {
|
|
35
35
|
"access": "public"
|
|
36
36
|
},
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "4aac6bcc2c9a43356dcc7d45541d15ebb2de1076"
|
|
38
38
|
}
|