@intuitionrobotics/thunderstorm 0.41.73 → 0.41.74
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.
|
@@ -3,6 +3,6 @@ export declare abstract class BaseStorm extends ModuleManager {
|
|
|
3
3
|
protected envKey: string;
|
|
4
4
|
private override;
|
|
5
5
|
setEnvironment(envKey: string): this;
|
|
6
|
-
setOverride(override
|
|
6
|
+
setOverride(override?: ObjectTS): this;
|
|
7
7
|
protected resolveConfig: () => Promise<void>;
|
|
8
8
|
}
|
|
@@ -41,7 +41,7 @@ class BaseStorm extends ts_common_1.ModuleManager {
|
|
|
41
41
|
const database = backend_1.FirebaseModule.createAdminSession().getDatabase();
|
|
42
42
|
let initialized = 0;
|
|
43
43
|
const listener = (resolve) => (snapshot) => {
|
|
44
|
-
if (initialized
|
|
44
|
+
if (initialized > 1) {
|
|
45
45
|
console.log("CONFIGURATION HAS CHANGED... KILLING PROCESS!!!");
|
|
46
46
|
process.exit(2);
|
|
47
47
|
}
|
|
@@ -54,12 +54,16 @@ class BaseStorm extends ts_common_1.ModuleManager {
|
|
|
54
54
|
const envPromise = new Promise((resolve) => {
|
|
55
55
|
database.listen(`/_config/${this.envKey}`, listener(resolve));
|
|
56
56
|
});
|
|
57
|
-
const [defaultConfig,
|
|
57
|
+
const [defaultConfig, envConfig] = yield Promise.all([
|
|
58
58
|
defaultPromise,
|
|
59
59
|
envPromise
|
|
60
60
|
]);
|
|
61
|
-
|
|
62
|
-
|
|
61
|
+
let toBeConfig = ts_common_1.merge(defaultConfig || {}, envConfig || {});
|
|
62
|
+
if (this.config)
|
|
63
|
+
toBeConfig = ts_common_1.merge(this.config, toBeConfig);
|
|
64
|
+
if (this.override)
|
|
65
|
+
toBeConfig = ts_common_1.merge(toBeConfig, this.override);
|
|
66
|
+
this.setConfig(toBeConfig);
|
|
63
67
|
});
|
|
64
68
|
}
|
|
65
69
|
setEnvironment(envKey) {
|
|
@@ -67,7 +71,9 @@ class BaseStorm extends ts_common_1.ModuleManager {
|
|
|
67
71
|
return this;
|
|
68
72
|
}
|
|
69
73
|
setOverride(override) {
|
|
70
|
-
|
|
74
|
+
if (override && typeof override === "object" && Object.keys(override).length !== 0)
|
|
75
|
+
this.override = override;
|
|
76
|
+
return this;
|
|
71
77
|
}
|
|
72
78
|
}
|
|
73
79
|
exports.BaseStorm = BaseStorm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseStorm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/BaseStorm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH,iEAG6C;AAC7C,4DAIsC;AAEtC,MAAsB,SACrB,SAAQ,yBAAa;IADtB;;QAGW,WAAM,GAAW,KAAK,CAAC;QACzB,aAAQ,GAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseStorm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/BaseStorm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH,iEAG6C;AAC7C,4DAIsC;AAEtC,MAAsB,SACrB,SAAQ,yBAAa;IADtB;;QAGW,WAAM,GAAW,KAAK,CAAC;QACzB,aAAQ,GAAa,EAAE,CAAC;QAatB,kBAAa,GAAG,GAAS,EAAE;YACpC,MAAM,QAAQ,GAAoB,wBAAc,CAAC,kBAAkB,EAAE,CAAC,WAAW,EAAE,CAAC;YACpF,IAAI,WAAW,GAAG,CAAC,CAAC;YAEpB,MAAM,QAAQ,GAAG,CAAC,OAAmC,EAAE,EAAE,CAAC,CAAC,QAAmB,EAAE,EAAE;gBACjF,IAAI,WAAW,GAAG,CAAC,EAAE;oBACpB,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;oBAC/D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBAChB;gBAED,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;gBAExB,WAAW,EAAE,CAAC;YACf,CAAC,CAAC;YAEF,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC9C,QAAQ,CAAC,MAAM,CAAC,kBAAkB,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YACxD,CAAC,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC1C,QAAQ,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,MAAM,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC/D,CAAC,CAAC,CAAC;YACH,MAAM,CACC,aAAa,EACb,SAAS,CACT,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1B;gBACC,cAAc;gBACd,UAAU;aACV,CACD,CAAC;YAEF,IAAI,UAAU,GAAa,iBAAK,CAAC,aAAa,IAAI,EAAE,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC;YACvE,IAAG,IAAI,CAAC,MAAM;gBACb,UAAU,GAAG,iBAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;YAE5C,IAAG,IAAI,CAAC,QAAQ;gBACf,UAAU,GAAG,iBAAK,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;YAE9C,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAC;IACH,CAAC;IAnDA,cAAc,CAAC,MAAc;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,WAAW,CAAC,QAAmB;QAC9B,IAAI,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC;YACjF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACzB,OAAO,IAAI,CAAC;IACb,CAAC;CA0CD;AAzDD,8BAyDC"}
|
|
@@ -48,8 +48,9 @@ class Storm extends BaseStorm_1.BaseStorm {
|
|
|
48
48
|
this.addModules(...modules);
|
|
49
49
|
}
|
|
50
50
|
init() {
|
|
51
|
+
var _a;
|
|
51
52
|
ts_common_1.BeLogged.addClient(process.env.GCLOUD_PROJECT && process.env.FUNCTIONS_EMULATOR ? ts_common_1.LogClient_Terminal : ts_common_1.LogClient_Function);
|
|
52
|
-
server_api_1.ServerApi.isDebug = !!this.config.isDebug;
|
|
53
|
+
server_api_1.ServerApi.isDebug = !!((_a = this.config) === null || _a === void 0 ? void 0 : _a.isDebug);
|
|
53
54
|
super.init();
|
|
54
55
|
const urlPrefix = !process.env.GCLOUD_PROJECT ? this.initialPath : "";
|
|
55
56
|
// Load from folder structure
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Storm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/Storm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;;;;;;;;;;AAEH,iEAAmE;AACnE,4DAKsC;AACtC,qFAGuD;AACvD,2CAAsC;AACtC,6DAGsC;AACtC,6DAAuD;AAGvD,MAAM,OAAO,GAAa;IACzB,uBAAU;IACV,wBAAc;CACd,CAAC;AAGF,MAAa,KACZ,SAAQ,qBAAS;IAMjB;QACC,KAAK,EAAE,CAAC;QAJD,cAAS,GAAU,EAAE,CAAC;QACtB,SAAI,GAAqB,EAAE,CAAC;QAInC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI
|
|
1
|
+
{"version":3,"file":"Storm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/Storm.ts"],"names":[],"mappings":"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"}
|