@intuitionrobotics/thunderstorm 0.42.42 → 0.43.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.
Files changed (13) hide show
  1. package/app-backend/core/BaseStorm.d.ts +3 -5
  2. package/app-backend/core/BaseStorm.js +2 -43
  3. package/app-backend/core/BaseStorm.js.map +1 -1
  4. package/app-backend/core/Storm.d.ts +8 -3
  5. package/app-backend/core/Storm.js +19 -37
  6. package/app-backend/core/Storm.js.map +1 -1
  7. package/app-backend/modules/server/HttpServer.d.ts +2 -10
  8. package/app-backend/modules/server/HttpServer.js +7 -93
  9. package/app-backend/modules/server/HttpServer.js.map +1 -1
  10. package/app-backend/modules/server/server-api.d.ts +2 -1
  11. package/app-backend/modules/server/server-api.js +6 -5
  12. package/app-backend/modules/server/server-api.js.map +1 -1
  13. package/package.json +4 -4
package/app-backend/core/BaseStorm.d.ts CHANGED
@@ -1,8 +1,6 @@
1
- import { ModuleManager, ObjectTS } from "@intuitionrobotics/ts-common";
1
+ import { ModuleManager } from "@intuitionrobotics/ts-common";
2
2
  export declare abstract class BaseStorm extends ModuleManager {
3
- protected envKey: string;
4
- private override;
3
+ private envKey;
5
4
  setEnvironment(envKey: string): this;
6
- setOverride(override?: ObjectTS): this;
7
- protected resolveConfig: () => Promise<void>;
5
+ getEnvironment(): string;
8
6
  }
package/app-backend/core/BaseStorm.js CHANGED
@@ -19,61 +19,20 @@
19
19
  * See the License for the specific language governing permissions and
20
20
  * limitations under the License.
21
21
  */
22
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
23
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
24
- return new (P || (P = Promise))(function (resolve, reject) {
25
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
26
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
27
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
28
- step((generator = generator.apply(thisArg, _arguments || [])).next());
29
- });
30
- };
31
22
  Object.defineProperty(exports, "__esModule", { value: true });
32
23
  exports.BaseStorm = void 0;
33
- const backend_1 = require("@intuitionrobotics/firebase/backend");
34
24
  const ts_common_1 = require("@intuitionrobotics/ts-common");
35
25
  class BaseStorm extends ts_common_1.ModuleManager {
36
26
  constructor() {
37
27
  super(...arguments);
38
28
  this.envKey = "dev";
39
- this.override = {};
40
- this.resolveConfig = () => __awaiter(this, void 0, void 0, function* () {
41
- const database = backend_1.FirebaseModule.createAdminSession().getDatabase();
42
- let initialized = 0;
43
- const listener = (resolve) => (snapshot) => {
44
- if (initialized > 1) {
45
- console.log("CONFIGURATION HAS CHANGED... KILLING PROCESS!!!");
46
- process.exit(2);
47
- }
48
- resolve(snapshot || {});
49
- initialized++;
50
- };
51
- const defaultPromise = new Promise((resolve) => {
52
- database.listen(`/_config/default`, listener(resolve));
53
- });
54
- const envPromise = new Promise((resolve) => {
55
- database.listen(`/_config/${this.envKey}`, listener(resolve));
56
- });
57
- const [defaultConfig, envConfig] = yield Promise.all([
58
- defaultPromise,
59
- envPromise
60
- ]);
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);
67
- });
68
29
  }
69
30
  setEnvironment(envKey) {
70
31
  this.envKey = envKey;
71
32
  return this;
72
33
  }
73
- setOverride(override) {
74
- if (override && typeof override === "object" && Object.keys(override).length !== 0)
75
- this.override = override;
76
- return this;
34
+ getEnvironment() {
35
+ return this.envKey;
77
36
  }
78
37
  }
79
38
  exports.BaseStorm = BaseStorm;
package/app-backend/core/BaseStorm.js.map CHANGED
@@ -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;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"}
1
+ {"version":3,"file":"BaseStorm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/BaseStorm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,4DAA2D;AAE3D,MAAsB,SAClB,SAAQ,yBAAa;IADzB;;QAEY,WAAM,GAAW,KAAK,CAAC;IASnC,CAAC;IARG,cAAc,CAAC,MAAc;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;CACJ;AAXD,8BAWC"}
package/app-backend/core/Storm.d.ts CHANGED
@@ -1,17 +1,22 @@
1
- import { BaseStorm } from "./BaseStorm";
2
- import { RouteResolver } from "../modules/server/HttpServer";
1
+ import { HttpServer_Class, RouteResolver } from "../modules/server/HttpServer";
3
2
  import { ServerApi } from "../modules/server/server-api";
3
+ import { BaseStorm } from "./BaseStorm";
4
+ import { Express } from "express";
4
5
  export declare class Storm extends BaseStorm {
5
6
  private routeResolver;
6
7
  private initialPath;
7
8
  private functions;
8
9
  private apis;
10
+ private express?;
11
+ private readonly httpServer;
9
12
  constructor();
13
+ static getInstance(): Storm;
14
+ getHttpServer(): HttpServer_Class;
10
15
  init(): this;
16
+ setMainExpressApp(_express: Express): void;
11
17
  registerApis(...apis: ServerApi<any>[]): this;
12
18
  setInitialRouteResolver(routeResolver: RouteResolver): this;
13
19
  setInitialRoutePath(initialPath: string): this;
14
20
  startServer(onStarted?: () => Promise<void>): any;
15
21
  build(onStarted?: () => Promise<void>): any;
16
- private startServerImpl;
17
22
  }
package/app-backend/core/Storm.js CHANGED
@@ -19,33 +19,28 @@
19
19
  * See the License for the specific language governing permissions and
20
20
  * limitations under the License.
21
21
  */
22
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
23
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
24
- return new (P || (P = Promise))(function (resolve, reject) {
25
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
26
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
27
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
28
- step((generator = generator.apply(thisArg, _arguments || [])).next());
29
- });
30
- };
31
22
  Object.defineProperty(exports, "__esModule", { value: true });
32
23
  exports.Storm = void 0;
33
24
  const backend_1 = require("@intuitionrobotics/firebase/backend");
34
25
  const ts_common_1 = require("@intuitionrobotics/ts-common");
35
26
  const backend_functions_1 = require("@intuitionrobotics/firebase/backend-functions");
36
- const BaseStorm_1 = require("./BaseStorm");
37
27
  const HttpServer_1 = require("../modules/server/HttpServer");
38
28
  const server_api_1 = require("../modules/server/server-api");
39
- const modules = [
40
- HttpServer_1.HttpServer,
41
- backend_1.FirebaseModule
42
- ];
29
+ const BaseStorm_1 = require("./BaseStorm");
30
+ const express = require("express");
43
31
  class Storm extends BaseStorm_1.BaseStorm {
44
32
  constructor() {
45
33
  super();
46
34
  this.functions = [];
47
35
  this.apis = [];
48
- this.addModules(...modules);
36
+ this.httpServer = new HttpServer_1.HttpServer_Class(this.express || express());
37
+ this.addModules(this.httpServer, backend_1.FirebaseModule);
38
+ }
39
+ static getInstance() {
40
+ return Storm.instance;
41
+ }
42
+ getHttpServer() {
43
+ return this.httpServer;
49
44
  }
50
45
  init() {
51
46
  var _a;
@@ -54,12 +49,15 @@ class Storm extends BaseStorm_1.BaseStorm {
54
49
  super.init();
55
50
  const urlPrefix = !process.env.GCLOUD_PROJECT ? this.initialPath : "";
56
51
  // Load from folder structure
57
- HttpServer_1.HttpServer.resolveApi(this.routeResolver, urlPrefix);
52
+ this.httpServer.resolveApi(this.routeResolver, urlPrefix);
58
53
  // Load from those passed by init
59
54
  this.routeResolver.routeApis(this.apis, urlPrefix);
60
- HttpServer_1.HttpServer.printRoutes(process.env.GCLOUD_PROJECT ? this.initialPath : "");
55
+ this.httpServer.printRoutes(process.env.GCLOUD_PROJECT ? this.initialPath : "");
61
56
  return this;
62
57
  }
58
+ setMainExpressApp(_express) {
59
+ this.express = _express;
60
+ }
63
61
  registerApis(...apis) {
64
62
  this.apis = apis;
65
63
  return this;
@@ -74,14 +72,11 @@ class Storm extends BaseStorm_1.BaseStorm {
74
72
  }
75
73
  startServer(onStarted) {
76
74
  const modulesAsFunction = this.modules.filter((module) => module instanceof backend_functions_1.FirebaseFunction);
77
- this.functions = [new backend_functions_1.Firebase_ExpressFunction(HttpServer_1.HttpServer.express),
75
+ this.functions = [new backend_functions_1.Firebase_ExpressFunction(this.httpServer.express),
78
76
  ...modulesAsFunction];
79
- this.startServerImpl(onStarted)
80
- .then(() => console.log("Server Started!!"))
81
- .catch(reason => {
82
- this.logError("failed to launch server", reason);
83
- throw reason;
84
- });
77
+ this.init();
78
+ onStarted && onStarted().catch(e => this.logError(e));
79
+ console.log("Server Started!!");
85
80
  return this.functions.reduce((toRet, _function) => {
86
81
  toRet[_function.getName()] = _function.getFunction();
87
82
  return toRet;
@@ -90,19 +85,6 @@ class Storm extends BaseStorm_1.BaseStorm {
90
85
  build(onStarted) {
91
86
  return this.startServer(onStarted);
92
87
  }
93
- startServerImpl(onStarted) {
94
- return __awaiter(this, void 0, void 0, function* () {
95
- const label = 'Resolving Config';
96
- console.time(label);
97
- yield this.resolveConfig();
98
- console.timeEnd(label);
99
- this.init();
100
- yield HttpServer_1.HttpServer.startServer();
101
- const functions = yield Promise.all(this.functions.map(moduleAsFunction => moduleAsFunction.onFunctionReady()));
102
- onStarted && (yield onStarted());
103
- return functions;
104
- });
105
- }
106
88
  }
107
89
  exports.Storm = Storm;
108
90
  //# sourceMappingURL=Storm.js.map
package/app-backend/core/Storm.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Storm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/Storm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Storm.js","sourceRoot":"","sources":["../../../src/main/app-backend/core/Storm.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;GAmBG;;;AAEH,iEAAmE;AACnE,4DAAsG;AACtG,qFAAyG;AACzG,6DAA6E;AAC7E,6DAAuD;AACvD,2CAAsC;AAEtC,mCAAmC;AAEnC,MAAa,KACT,SAAQ,qBAAS;IAQjB;QACI,KAAK,EAAE,CAAC;QANJ,cAAS,GAAU,EAAE,CAAC;QACtB,SAAI,GAAqB,EAAE,CAAC;QAMhC,IAAI,CAAC,UAAU,GAAG,IAAI,6BAAgB,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,wBAAc,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,CAAC,WAAW;QACd,OAAO,KAAK,CAAC,QAAiB,CAAA;IAClC,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI;;QACA,oBAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,8BAAkB,CAAC,CAAC,CAAC,8BAAkB,CAAC,CAAC;QAC3H,sBAAS,CAAC,OAAO,GAAG,CAAC,QAAC,IAAI,CAAC,MAAM,0CAAE,OAAO,CAAA,CAAC;QAE3C,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,6BAA6B;QAC7B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QAC1D,iCAAiC;QACjC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAElD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAChF,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,iBAAiB,CAAC,QAAiB;QAC/B,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,YAAY,CAAC,GAAG,IAAsB;QAClC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,uBAAuB,CAAC,aAA4B;QAChD,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mBAAmB,CAAC,WAAmB;QACnC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,SAA+B;QACvC,MAAM,iBAAiB,GAAuB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAc,EAA8B,EAAE,CAAC,MAAM,YAAY,oCAAgB,CAAC,CAAC;QAEtJ,IAAI,CAAC,SAAS,GAAG,CAAC,IAAI,4CAAwB,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YACnE,GAAG,iBAAiB,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,SAAS,IAAI,SAAS,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;QAE/B,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;YAC9C,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;YACrD,OAAO,KAAK,CAAC;QACjB,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,SAA+B;QACjC,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;CACJ;AA7ED,sBA6EC"}
package/app-backend/modules/server/HttpServer.d.ts CHANGED
@@ -29,20 +29,14 @@ export declare class HttpServer_Class extends Module<ConfigType> {
29
29
  private static readonly expressMiddleware;
30
30
  errorMessageComposer: HttpErrorHandler;
31
31
  readonly express: Express;
32
- private server;
33
32
  private routes;
34
- private socketId;
35
- constructor();
33
+ constructor(_express: Express);
36
34
  setErrorMessageComposer(errorMessageComposer: HttpErrorHandler): void;
37
35
  static addMiddleware(middleware: ExpressRequestHandler): typeof HttpServer_Class;
38
36
  getRoutes(): HttpRoute[];
39
37
  getBaseUrl(): string;
40
38
  protected init(): Promise<void>;
41
39
  printRoutes(prefix: string): void;
42
- private createServer;
43
- startServer(): Promise<void>;
44
- private connectImpl;
45
- terminate(): Promise<void>;
46
40
  resolveApi(routeResolver: RouteResolver, urlPrefix: string): void;
47
41
  }
48
42
  export declare class RouteResolver {
@@ -52,13 +46,11 @@ export declare class RouteResolver {
52
46
  readonly apiFolder: string;
53
47
  private middlewares;
54
48
  constructor(require: NodeRequire, rootDir: string, apiFolder?: string);
55
- setExpressInstance(_exp: express.Express): void;
56
49
  setMiddlewares(...middlewares: ServerApi_Middleware[]): this;
57
- resolveApi(urlPrefix: string): void;
50
+ resolveApi(urlPrefix: string, _exp: express.Express): void;
58
51
  private resolveApiImpl;
59
52
  routeApis(apis: ServerApi<any>[], urlPrefix: string): void;
60
53
  }
61
- export declare const HttpServer: HttpServer_Class;
62
54
  export declare class HeaderKey {
63
55
  private readonly key;
64
56
  private readonly responseCode;
package/app-backend/modules/server/HttpServer.js CHANGED
@@ -29,7 +29,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
29
29
  });
30
30
  };
31
31
  Object.defineProperty(exports, "__esModule", { value: true });
32
- exports.HeaderKey = exports.HttpServer = exports.RouteResolver = exports.HttpServer_Class = void 0;
32
+ exports.HeaderKey = exports.RouteResolver = exports.HttpServer_Class = void 0;
33
33
  /**
34
34
  * Module dependencies.
35
35
  */
@@ -60,11 +60,10 @@ const ExposedHeaders = [
60
60
  _imports_1.HeaderKey_JWT
61
61
  ];
62
62
  class HttpServer_Class extends ts_common_1.Module {
63
- constructor() {
63
+ constructor(_express) {
64
64
  super("http-server");
65
65
  this.errorMessageComposer = server_errors_1.DefaultApiErrorMessageComposer();
66
- this.socketId = 0;
67
- this.express = express();
66
+ this.express = _express;
68
67
  }
69
68
  setErrorMessageComposer(errorMessageComposer) {
70
69
  this.errorMessageComposer = errorMessageComposer;
@@ -148,90 +147,9 @@ class HttpServer_Class extends ts_common_1.Module {
148
147
  this.routes.forEach(route => this.logInfo(`${JSON.stringify(route.methods)} ${prefix}${route.path}`));
149
148
  console.timeEnd(label);
150
149
  }
151
- createServer() {
152
- const ssl = this.config.ssl;
153
- if (!ssl) {
154
- this.logDebug("starting HTTP server");
155
- return require('http').createServer(this.express);
156
- }
157
- this.logDebug("starting HTTPS server");
158
- let key = ssl.key;
159
- if (!ssl.key.startsWith("-----BEGIN"))
160
- key = fs.readFileSync(ssl.key, "utf8");
161
- let cert = ssl.cert;
162
- if (!ssl.cert.startsWith("-----BEGIN"))
163
- cert = fs.readFileSync(ssl.cert, "utf8");
164
- const options = {
165
- key: key,
166
- cert: cert,
167
- rejectUnauthorized: false,
168
- requestCert: false
169
- };
170
- return require('https').createServer(options, this.express);
171
- }
172
- startServer() {
173
- return __awaiter(this, void 0, void 0, function* () {
174
- return new Promise((resolve, rejected) => {
175
- this.connectImpl((err) => {
176
- if (err)
177
- return rejected(err);
178
- resolve();
179
- });
180
- });
181
- });
182
- }
183
- connectImpl(onCompletion) {
184
- this.server = this.createServer();
185
- this.server.listen(this.config.port);
186
- this.server.on('connection', (socket) => {
187
- this.logInfo(`Got a new connection(${this.socketId++}): ${socket}`);
188
- // Extend socket lifetime for demo purposes
189
- // socket.setTimeout(4000);
190
- });
191
- this.server.on('error', (error) => {
192
- switch (error.code) {
193
- case 'EACCES':
194
- this.logErrorBold(`Server port: ${this.config.port} requires elevated privileges`);
195
- process.exit(1);
196
- break;
197
- case 'EADDRINUSE':
198
- this.logErrorBold(`Unable to start server port(${this.config.port}) is already in use!`);
199
- onCompletion(error);
200
- break;
201
- default:
202
- this.logErrorBold(`Error starting server... unknown state: ${error.code}`);
203
- onCompletion(error);
204
- return;
205
- }
206
- if (error.syscall !== 'listen') {
207
- onCompletion(error);
208
- return;
209
- }
210
- });
211
- this.server.on('listening', () => {
212
- const address = this.server.address();
213
- // Explicit check has to be made due to address.port
214
- if (!address) {
215
- this.logDebug(`Exiting !!`);
216
- process.exit(1);
217
- return;
218
- }
219
- this.logDebug(`Server is listening on ${(typeof address === 'string' ? `pipe: ${JSON.stringify(address)}` : `port: ${address.port}`)}`);
220
- onCompletion();
221
- });
222
- }
223
- terminate() {
224
- return new Promise((resolve) => {
225
- this.server.close(() => {
226
- this.logInfo('Server is terminated!');
227
- resolve();
228
- });
229
- });
230
- }
231
150
  resolveApi(routeResolver, urlPrefix) {
232
151
  console.time('Resolving Apis');
233
- routeResolver.setExpressInstance(this.express);
234
- routeResolver.resolveApi(urlPrefix);
152
+ routeResolver.resolveApi(urlPrefix, this.express);
235
153
  const resolveRoutes = (stack) => {
236
154
  return stack.map((layer) => {
237
155
  if (layer.route && typeof layer.route.path === "string") {
@@ -262,14 +180,12 @@ class RouteResolver {
262
180
  this.rootDir = rootDir;
263
181
  this.apiFolder = apiFolder || "";
264
182
  }
265
- setExpressInstance(_exp) {
266
- this.express = _exp;
267
- }
268
183
  setMiddlewares(...middlewares) {
269
184
  this.middlewares = middlewares;
270
185
  return this;
271
186
  }
272
- resolveApi(urlPrefix) {
187
+ resolveApi(urlPrefix, _exp) {
188
+ this.express = _exp;
273
189
  this.resolveApiImpl(urlPrefix, this.rootDir + "/" + this.apiFolder);
274
190
  }
275
191
  resolveApiImpl(urlPrefix, workingDir) {
@@ -294,8 +210,7 @@ class RouteResolver {
294
210
  console.log(`could not reference RouteResolver for: ${workingDir}/${relativePathToFile}`, e);
295
211
  throw e;
296
212
  }
297
- routeResolver.setExpressInstance(this.express);
298
- routeResolver.resolveApi(urlPrefix);
213
+ routeResolver.resolveApi(urlPrefix, this.express);
299
214
  return;
300
215
  }
301
216
  let content;
@@ -319,7 +234,6 @@ class RouteResolver {
319
234
  }
320
235
  }
321
236
  exports.RouteResolver = RouteResolver;
322
- exports.HttpServer = new HttpServer_Class();
323
237
  class HeaderKey {
324
238
  constructor(key, responseCode = 400) {
325
239
  this.key = key;
package/app-backend/modules/server/HttpServer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":"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"}
package/app-backend/modules/server/server-api.d.ts CHANGED
@@ -4,7 +4,7 @@
4
4
  */
5
5
  import { Logger, ValidatorTypeResolver } from "@intuitionrobotics/ts-common";
6
6
  import { Stream } from "stream";
7
- import { ServerApi_Middleware } from "./HttpServer";
7
+ import { HttpServer_Class, ServerApi_Middleware } from "./HttpServer";
8
8
  import { IncomingHttpHeaders } from "http";
9
9
  import { ApiTypeBinder, ApiWithBody, ApiWithQuery, DeriveBodyType, DeriveQueryType, DeriveResponseType, DeriveUrlType, HttpMethod, QueryParams } from "../../../shared/types";
10
10
  import { ApiException } from "../../exceptions";
@@ -28,6 +28,7 @@ export declare abstract class ServerApi<Binder extends ApiTypeBinder<string, R,
28
28
  private bodyValidator?;
29
29
  private queryValidator?;
30
30
  private sideEffects;
31
+ protected readonly httpServer: HttpServer_Class;
31
32
  protected constructor(method: HttpMethod, relativePath: string, tag?: string);
32
33
  shouldPrintResponse(): boolean;
33
34
  addSideEffect(sideEffect: () => Promise<any>): this;
package/app-backend/modules/server/server-api.js CHANGED
@@ -35,12 +35,12 @@ exports.ApiResponse = exports.ServerApi_Redirect = exports.ServerApi_Proxy = exp
35
35
  */
36
36
  const ts_common_1 = require("@intuitionrobotics/ts-common");
37
37
  const url_1 = require("url");
38
- const HttpServer_1 = require("./HttpServer");
39
38
  // noinspection TypeScriptPreferShortImport
40
39
  const types_1 = require("../../../shared/types");
41
40
  const to_be_removed_1 = require("../../utils/to-be-removed");
42
41
  const exceptions_1 = require("../../exceptions");
43
42
  const RemoteProxy_1 = require("../proxy/RemoteProxy");
43
+ const Storm_1 = require("../../core/Storm");
44
44
  class ServerApi extends ts_common_1.Logger {
45
45
  constructor(method, relativePath, tag) {
46
46
  super(tag || relativePath);
@@ -153,10 +153,10 @@ class ServerApi extends ts_common_1.Logger {
153
153
  severity = ts_common_1.ServerErrorSeverity.Critical;
154
154
  break;
155
155
  }
156
- const message = yield HttpServer_1.HttpServer.errorMessageComposer(requestData, apiException);
156
+ const message = yield this.httpServer.errorMessageComposer(requestData, apiException);
157
157
  try {
158
158
  yield ts_common_1.dispatch_onServerError.dispatchModuleAsync([severity,
159
- HttpServer_1.HttpServer,
159
+ this.httpServer,
160
160
  message]);
161
161
  }
162
162
  catch (e) {
@@ -170,6 +170,7 @@ class ServerApi extends ts_common_1.Logger {
170
170
  this.setMinLevel(ServerApi.isDebug ? ts_common_1.LogLevel.Verbose : ts_common_1.LogLevel.Info);
171
171
  this.method = method;
172
172
  this.relativePath = `${relativePath}`;
173
+ this.httpServer = Storm_1.Storm.getInstance().getHttpServer();
173
174
  }
174
175
  shouldPrintResponse() {
175
176
  return this.printResponse;
@@ -212,7 +213,7 @@ class ServerApi extends ts_common_1.Logger {
212
213
  const fullPath = `${prefixUrl ? prefixUrl : ""}/${this.relativePath}`;
213
214
  this.setTag(fullPath);
214
215
  router[this.method](fullPath, this.callWrapper);
215
- this.url = `${HttpServer_1.HttpServer.getBaseUrl()}${fullPath}`;
216
+ this.url = `${this.httpServer.getBaseUrl()}${fullPath}`;
216
217
  }
217
218
  }
218
219
  exports.ServerApi = ServerApi;
@@ -251,7 +252,7 @@ class ServerApi_Redirect extends ServerApi {
251
252
  process(request, response, queryParams, body) {
252
253
  return __awaiter(this, void 0, void 0, function* () {
253
254
  const query = queryParams ? ts_common_1._keys(queryParams).reduce((c, k) => c + '&' + k + '=' + queryParams[k], '?') : '';
254
- response.redirect(this.responseCode, `${HttpServer_1.HttpServer.getBaseUrl()}${this.redirectUrl}${query}`);
255
+ response.redirect(this.responseCode, `${this.httpServer.getBaseUrl()}${this.redirectUrl}${query}`);
255
256
  });
256
257
  }
257
258
  }
package/app-backend/modules/server/server-api.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server-api.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-api.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@intuitionrobotics/thunderstorm",
3
- "version": "0.42.42",
3
+ "version": "0.43.1",
4
4
  "description": "Thunderstorm",
5
5
  "keywords": [
6
6
  "IR",
@@ -27,9 +27,9 @@
27
27
  "build": "tsc"
28
28
  },
29
29
  "dependencies": {
30
- "@intuitionrobotics/firebase": "~0.42.0",
31
- "@intuitionrobotics/testelot": "~0.42.0",
32
- "@intuitionrobotics/ts-common": "~0.42.0",
30
+ "@intuitionrobotics/firebase": "~0.43.0",
31
+ "@intuitionrobotics/testelot": "~0.43.0",
32
+ "@intuitionrobotics/ts-common": "~0.43.0",
33
33
  "abort-controller": "^3.0.0",
34
34
  "axios": "^0.27.2",
35
35
  "browserify-zlib": "^0.2.0",