@intuitionrobotics/thunderstorm 1.0.1 → 2.0.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.
@@ -1,13 +1,11 @@
1
1
  import { LogClient } from "@intuitionrobotics/ts-common";
2
- import { type HttpErrorHandler, RouteResolver } from "../modules/server/HttpServer.js";
3
- import { ServerApi } from "../modules/server/server-api.js";
2
+ import { type HttpErrorHandler } from "../modules/server/HttpServer.js";
4
3
  import { BaseStorm } from "./BaseStorm.js";
5
- import { type Express } from "express";
4
+ import { type Express, type Router } from "express";
6
5
  export declare class Storm extends BaseStorm {
7
- private routeResolver?;
6
+ private routes?;
8
7
  private initialPath;
9
8
  private functions;
10
- private apis;
11
9
  private express?;
12
10
  private logClient;
13
11
  private onDestroy?;
@@ -22,8 +20,7 @@ export declare class Storm extends BaseStorm {
22
20
  setOnStart(onStart?: () => Promise<void>): this;
23
21
  static getInstance(): Storm;
24
22
  init(): this;
25
- registerApis(...apis: ServerApi<any>[]): this;
26
- setInitialRouteResolver(routeResolver: RouteResolver): this;
23
+ setRoutes(routes: Router): this;
27
24
  setInitialRoutePath(initialPath: string): this;
28
25
  build(onStarted?: () => Promise<void>): any;
29
26
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Storm.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/core/Storm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,SAAS,EAAiD,MAAM,8BAA8B,CAAC;AAEjH,OAAO,EAAC,KAAK,gBAAgB,EAAoB,aAAa,EAAC,MAAM,iCAAiC,CAAC;AACvG,OAAO,EAAC,SAAS,EAAC,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAC,KAAK,OAAO,EAAC,MAAM,SAAS,CAAC;AAIrC,qBAAa,KACT,SAAQ,SAAS;IACjB,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,IAAI,CAAwB;IACpC,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,SAAS,CAAC,CAAsB;IACxC,OAAO,CAAC,OAAO,CAAC,CAAsB;IAEtC,oBAAoB,EAAE,gBAAgB,CAAoC;;IAOnE,uBAAuB,CAAC,oBAAoB,EAAE,gBAAgB;IAK9D,MAAM,CAAC,GAAG,EAAE,OAAO;IAKnB,YAAY,CAAC,SAAS,EAAE,SAAS;IAKjC,YAAY;IAIZ,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAK5C,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAK/C,MAAM,CAAC,WAAW,IAAI,KAAK;IAI3B,IAAI;IASJ,YAAY,CAAC,GAAG,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE;IAKtC,uBAAuB,CAAC,aAAa,EAAE,aAAa;IAKpD,mBAAmB,CAAC,WAAW,EAAE,MAAM;IAKvC,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;CA4BxC"}
1
+ {"version":3,"file":"Storm.d.ts","sourceRoot":"","sources":["../../../src/main/app-backend/core/Storm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,SAAS,EAAiD,MAAM,8BAA8B,CAAC;AAEjH,OAAO,EAAC,KAAK,gBAAgB,EAAmB,MAAM,iCAAiC,CAAC;AAExF,OAAO,EAAC,SAAS,EAAC,MAAM,gBAAgB,CAAC;AAEzC,OAAO,EAAC,KAAK,OAAO,EAAE,KAAK,MAAM,EAAC,MAAM,SAAS,CAAC;AAIlD,qBAAa,KACT,SAAQ,SAAS;IAGjB,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,SAAS,CAAC,CAAsB;IACxC,OAAO,CAAC,OAAO,CAAC,CAAsB;IAEtC,oBAAoB,EAAE,gBAAgB,CAAoC;;IAOnE,uBAAuB,CAAC,oBAAoB,EAAE,gBAAgB;IAK9D,MAAM,CAAC,GAAG,EAAE,OAAO;IAKnB,YAAY,CAAC,SAAS,EAAE,SAAS;IAKjC,YAAY;IAIZ,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAK5C,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;IAK/C,MAAM,CAAC,WAAW,IAAI,KAAK;IAI3B,IAAI;IAWJ,SAAS,CAAC,MAAM,EAAE,MAAM;IAKxB,mBAAmB,CAAC,WAAW,EAAE,MAAM;IAKvC,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;CA6BxC"}
@@ -1,6 +1,6 @@
1
1
  import { BeLogged, LogClient, LogClient_Function, LogClient_Terminal, Module } from "@intuitionrobotics/ts-common";
2
2
  import { Firebase_ExpressFunction, FirebaseFunction } from '@intuitionrobotics/firebase/backend-functions';
3
- import { HttpServer_Class, RouteResolver } from "../modules/server/HttpServer.js";
3
+ import { HttpServer_Class } from "../modules/server/HttpServer.js";
4
4
  import { ServerApi } from "../modules/server/server-api.js";
5
5
  import { BaseStorm } from "./BaseStorm.js";
6
6
  import express from "express";
@@ -8,10 +8,11 @@ import {} from "express";
8
8
  import { DefaultApiErrorMessageComposer } from "../modules/server/server-errors.js";
9
9
  import { FirebaseModule } from "@intuitionrobotics/firebase/backend";
10
10
  export class Storm extends BaseStorm {
11
- routeResolver;
11
+ // v2.0: consumers build an Express Router by hand and hand it here.
12
+ // The framework `app.use`s it during build(); there is no other path.
13
+ routes;
12
14
  initialPath;
13
15
  functions = [];
14
- apis = [];
15
16
  express;
16
17
  logClient = LogClient_Function;
17
18
  onDestroy;
@@ -53,12 +54,10 @@ export class Storm extends BaseStorm {
53
54
  super.init();
54
55
  return this;
55
56
  }
56
- registerApis(...apis) {
57
- this.apis = apis;
58
- return this;
59
- }
60
- setInitialRouteResolver(routeResolver) {
61
- this.routeResolver = routeResolver;
57
+ // The caller passes a fully-built Express Router; Storm wires it onto the
58
+ // HttpServer's express app at build() time.
59
+ setRoutes(routes) {
60
+ this.routes = routes;
62
61
  return this;
63
62
  }
64
63
  setInitialRoutePath(initialPath) {
@@ -77,8 +76,8 @@ export class Storm extends BaseStorm {
77
76
  this.init();
78
77
  httpServer.init();
79
78
  const urlPrefix = !process.env.GCLOUD_PROJECT ? this.initialPath : "";
80
- if (this.routeResolver) {
81
- httpServer.resolveApi(this.routeResolver, urlPrefix, this.apis);
79
+ if (this.routes) {
80
+ httpServer.mountRouter(this.routes, urlPrefix);
82
81
  httpServer.printRoutes(process.env.GCLOUD_PROJECT ? this.initialPath : "");
83
82
  }
84
83
  if (onStarted)
@@ -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":"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"}
@@ -1,6 +1,5 @@
1
1
  import { Module } from "@intuitionrobotics/ts-common";
2
2
  import type { ObjectTS } from "@intuitionrobotics/ts-common";
3
- import { ServerApi } from "./server-api.js";
4
3
  import type { ApiResponse, HttpRequestData } from "./server-api.js";
5
4
  import { ApiException } from "../../exceptions.js";
6
5
  import type { Express, ExpressRequest, ExpressRequestHandler } from "../../utils/types.js";
@@ -21,32 +20,15 @@ type ConfigType = {
21
20
  };
22
21
  export type HttpErrorHandler = (requestData: HttpRequestData, error: ApiException) => Promise<string>;
23
22
  export type ServerApi_Middleware = (request: ExpressRequest, data: HttpRequestData, response: ApiResponse, scopes: string[]) => Promise<ObjectTS | void>;
24
- type HttpRoute = {
25
- methods: string[];
26
- path: string;
27
- };
28
23
  export declare class HttpServer_Class extends Module<ConfigType> {
29
24
  private static readonly expressMiddleware;
30
25
  private readonly express;
31
- private routes;
32
26
  constructor(_express: Express, configElement: ConfigType);
33
27
  static addMiddleware(middleware: ExpressRequestHandler): typeof HttpServer_Class;
34
- getRoutes(): HttpRoute[];
35
28
  getBaseUrl(): string;
36
29
  init(): void;
37
30
  printRoutes(prefix: string): void;
38
- resolveApi(routeResolver: RouteResolver, urlPrefix: string, apis: ServerApi<any>[]): void;
39
- }
40
- export type RouteEntry = ServerApi<any, any, any> | ServerApi<any, any, any>[] | RouteResolver;
41
- export declare class RouteResolver {
42
- private readonly urlSegment;
43
- private readonly routes;
44
- private middlewares;
45
- constructor(urlSegment?: string);
46
- addRoutes(...entries: RouteEntry[]): this;
47
- setMiddlewares(...middlewares: ServerApi_Middleware[]): this;
48
- resolveApi(urlPrefix: string, baseUrl: string, _exp: Express): void;
49
- routeApis(apis: ServerApi<any>[], urlPrefix: string, baseUrl: string, _exp: Express): void;
31
+ mountRouter(router: import("express").Router, urlPrefix?: string): void;
50
32
  }
51
33
  export declare class HeaderKey {
52
34
  private readonly key;
@@ -1 +1 @@
1
- {"version":3,"file":"HttpServer.d.ts","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HttpServer.d.ts","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":"AAGA,OAAO,EAA2B,MAAM,EAAC,MAAM,8BAA8B,CAAC;AAC9E,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,8BAA8B,CAAC;AAE3D,OAAO,KAAK,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAGjD,OAAO,KAAK,EAAC,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAC,MAAM,sBAAsB,CAAC;AAezF,KAAK,UAAU,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE;QACF,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,EAAE,MAAM,EAAE,CAAC;QAClB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAA;KAC5B,CAAA;IACD,GAAG,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;IAClC,eAAe,EAAE,MAAM,GAAG,MAAM,CAAA;CACnC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEtG,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;AAMxJ,qBAAa,gBACT,SAAQ,MAAM,CAAC,UAAU,CAAC;IAE1B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAA+B;IACxE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU;IAMxD,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,qBAAqB;IAKtD,UAAU;IAIV,IAAI;IA4DG,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAkCjC,WAAW,CAAC,MAAM,EAAE,OAAO,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,MAAW;CAM9E;AAED,qBAAa,SAAS;IAClB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,GAAG,EAAE,MAAM,EAAE,YAAY,GAAE,MAAY;IAKnD,GAAG,CAAC,OAAO,EAAE,cAAc;CAO9B"}
@@ -1,6 +1,6 @@
1
1
  import compression from 'compression';
2
2
  import cors from 'cors';
3
- import { addAllItemToArray, addItemToArray, LogLevel, Module } from "@intuitionrobotics/ts-common";
3
+ import { addItemToArray, LogLevel, Module } from "@intuitionrobotics/ts-common";
4
4
  import { ServerApi } from "./server-api.js";
5
5
  import { ApiException } from "../../exceptions.js";
6
6
  import express from "express";
@@ -18,7 +18,6 @@ const ExposedHeaders = [
18
18
  export class HttpServer_Class extends Module {
19
19
  static expressMiddleware = [];
20
20
  express;
21
- routes;
22
21
  constructor(_express, configElement) {
23
22
  super("HttpServer");
24
23
  this.express = _express;
@@ -28,9 +27,6 @@ export class HttpServer_Class extends Module {
28
27
  HttpServer_Class.expressMiddleware.push(middleware);
29
28
  return this;
30
29
  }
31
- getRoutes() {
32
- return this.routes;
33
- }
34
30
  getBaseUrl() {
35
31
  return this.config.baseUrl;
36
32
  }
@@ -80,82 +76,45 @@ export class HttpServer_Class extends Module {
80
76
  }
81
77
  this.express.options('*', corsWithOptions);
82
78
  }
79
+ // Debug-only: walk the Express router stack and log every (method, path)
80
+ // pair that's been mounted. The route table comes from Express itself —
81
+ // there is no parallel `routes[]` cache to keep in sync.
83
82
  printRoutes(prefix) {
84
83
  if (!ServerApi.isDebug)
85
84
  return;
86
- const label = `Printing ${this.routes.length} Routes`;
87
- console.time(label);
88
- this.routes.forEach(route => this.logVerbose(`${JSON.stringify(route.methods)} ${prefix}${route.path}`));
89
- console.timeEnd(label);
90
- }
91
- resolveApi(routeResolver, urlPrefix, apis) {
92
- console.time('Resolving Apis');
93
- const baseUrl = this.getBaseUrl();
94
- // Load from those passed by init
95
- routeResolver.routeApis(apis, urlPrefix, baseUrl, this.express);
96
- // Load from folder structure recursively
97
- routeResolver.resolveApi(urlPrefix, baseUrl, this.express);
98
85
  const resolveRoutes = (stack) => {
99
- return stack.map((layer) => {
86
+ return stack.flatMap((layer) => {
100
87
  if (layer.route && typeof layer.route.path === "string") {
101
88
  let methods = Object.keys(layer.route.methods);
102
89
  if (methods.length > 20)
103
90
  methods = ["ALL"];
104
- return { methods: methods, path: layer.route.path };
91
+ return [{ methods, path: layer.route.path }];
105
92
  }
106
- if (layer.name === 'router')
93
+ if (layer.name === "router" && layer.handle && layer.handle.stack)
107
94
  return resolveRoutes(layer.handle.stack);
108
- }).filter(route => route);
95
+ return [];
96
+ });
109
97
  };
110
- const routes = resolveRoutes(this.express._router.stack);
111
- this.routes = routes.reduce((toRet, route) => {
112
- const toAdd = Array.isArray(route) ? route : [route];
113
- addAllItemToArray(toRet, toAdd);
114
- return toRet;
115
- }, []);
116
- console.timeEnd('Resolving Apis');
117
- }
118
- }
119
- export class RouteResolver {
120
- urlSegment;
121
- routes = [];
122
- middlewares = [];
123
- constructor(urlSegment = "") {
124
- this.urlSegment = urlSegment;
125
- }
126
- addRoutes(...entries) {
127
- for (const entry of entries) {
128
- if (Array.isArray(entry))
129
- this.routes.push(...entry);
130
- else
131
- this.routes.push(entry);
132
- }
133
- return this;
134
- }
135
- setMiddlewares(...middlewares) {
136
- this.middlewares = middlewares;
137
- return this;
138
- }
139
- resolveApi(urlPrefix, baseUrl, _exp) {
140
- const fullPrefix = this.urlSegment ? `${urlPrefix}/${this.urlSegment}` : urlPrefix;
141
- for (const route of this.routes) {
142
- if (route instanceof RouteResolver) {
143
- if (route.middlewares.length === 0)
144
- route.middlewares = this.middlewares;
145
- route.resolveApi(fullPrefix, baseUrl, _exp);
146
- }
147
- else {
148
- route.addMiddlewares(...this.middlewares);
149
- route.route(_exp, fullPrefix, baseUrl);
150
- }
151
- }
98
+ const routes = resolveRoutes(this.express._router?.stack ?? []);
99
+ const label = `Printing ${routes.length} Routes`;
100
+ console.time(label);
101
+ routes.forEach((r) => this.logVerbose(`${JSON.stringify(r.methods)} ${prefix}${r.path}`));
102
+ console.timeEnd(label);
152
103
  }
153
- // Used by HttpServer.resolveApi() to mount the apis passed via Storm.setApis().
154
- routeApis(apis, urlPrefix, baseUrl, _exp) {
155
- apis.forEach(api => {
156
- api.addMiddlewares(...this.middlewares);
157
- api.route(_exp, urlPrefix, baseUrl);
158
- });
104
+ // v2.0 entrypoint: mount a user-built Express Router directly onto the
105
+ // app. The hand-maintained routes.ts file constructs the Router using
106
+ // the `mount()` helper and `Router.use(...)` for nesting, then this
107
+ // method just `app.use`s it. No RouteResolver, no fs walk, no codegen
108
+ // walker — Express owns the route table.
109
+ //
110
+ // `urlPrefix` is optional and matches what `Storm.setInitialRoutePath`
111
+ // gave callers: a local-dev URL prefix (e.g. "/api"). When empty, the
112
+ // router mounts at the application root.
113
+ mountRouter(router, urlPrefix = "") {
114
+ if (urlPrefix)
115
+ this.express.use(urlPrefix, router);
116
+ else
117
+ this.express.use(router);
159
118
  }
160
119
  }
161
120
  export class HeaderKey {
@@ -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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"}
@@ -0,0 +1,5 @@
1
+ import type { ExpressRouter } from "../../utils/types.js";
2
+ import type { ServerApi } from "./server-api.js";
3
+ export declare function mount<A extends ServerApi<any>>(router: ExpressRouter, path: string, api: A): void;
4
+ export declare function mountMany<A extends ServerApi<any>>(router: ExpressRouter, apis: A[]): void;
5
+ //# sourceMappingURL=mount.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/mount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAiB/C,wBAAgB,KAAK,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,EAC7C,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,CAAC,GACJ,IAAI,CAEN;AAaD,wBAAgB,SAAS,CAAC,CAAC,SAAS,SAAS,CAAC,GAAG,CAAC,EACjD,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,CAAC,EAAE,GACP,IAAI,CAQN"}
@@ -0,0 +1,37 @@
1
+ import { BadImplementationException } from "@intuitionrobotics/ts-common";
2
+ // The single helper that the hand-maintained routes file uses to attach a
3
+ // ServerApi to an Express Router. The endpoint's own `method` (POST, GET,
4
+ // etc.) drives which Router method gets called, which keeps the routes file
5
+ // from ever drifting POST/GET against the class's declared type.
6
+ //
7
+ // import {mount} from "@intuitionrobotics/thunderstorm/backend";
8
+ //
9
+ // const v1 = Router();
10
+ // mount(v1, "/register", new ServerApi_Register());
11
+ // mount(v1, "/types-testing/post-without-response-endpoint", endpointExample);
12
+ //
13
+ // `api.callWrapper` is the bound RequestHandler that runs validation,
14
+ // middleware composition, error mapping, and side-effect release for one
15
+ // request — exactly the same handler the old RouteResolver used.
16
+ export function mount(router, path, api) {
17
+ router[api.method](path, api.callWrapper);
18
+ }
19
+ // Bulk mount for dynamically-built endpoint arrays (e.g. DB API generator
20
+ // output, where each api carries its own URL fragment in `relativePath`).
21
+ //
22
+ // Static endpoints should use `mount()` and declare the path in the routes
23
+ // file. `mountMany()` is the escape hatch for the case where the URL is
24
+ // generated alongside the api at construction time and can't be hoisted
25
+ // into the routes file by hand.
26
+ //
27
+ // const dbApis: ServerApi<any>[] = MyDB.apis(); // each api has its own .relativePath
28
+ // const myThing = Router();
29
+ // mountMany(myThing, dbApis); // each mounts at "/${api.relativePath}"
30
+ export function mountMany(router, apis) {
31
+ for (const api of apis) {
32
+ if (!api.relativePath)
33
+ throw new BadImplementationException("mountMany: api missing relativePath. Either supply it in the api's constructor or use mount() with an explicit path.");
34
+ router[api.method](`/${api.relativePath}`, api.callWrapper);
35
+ }
36
+ }
37
+ //# sourceMappingURL=mount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/mount.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,0BAA0B,EAAC,MAAM,8BAA8B,CAAC;AAExE,0EAA0E;AAC1E,0EAA0E;AAC1E,4EAA4E;AAC5E,iEAAiE;AACjE,EAAE;AACF,mEAAmE;AACnE,EAAE;AACF,yBAAyB;AACzB,sDAAsD;AACtD,iFAAiF;AACjF,EAAE;AACF,sEAAsE;AACtE,yEAAyE;AACzE,iEAAiE;AACjE,MAAM,UAAU,KAAK,CACpB,MAAqB,EACrB,IAAY,EACZ,GAAM;IAEN,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,0EAA0E;AAC1E,0EAA0E;AAC1E,EAAE;AACF,2EAA2E;AAC3E,wEAAwE;AACxE,wEAAwE;AACxE,gCAAgC;AAChC,EAAE;AACF,2FAA2F;AAC3F,8BAA8B;AAC9B,+FAA+F;AAC/F,MAAM,UAAU,SAAS,CACxB,MAAqB,EACrB,IAAS;IAET,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,YAAY;YACpB,MAAM,IAAI,0BAA0B,CACnC,sHAAsH,CACtH,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,YAAY,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;AACF,CAAC"}
@@ -4,7 +4,7 @@ import { type ServerApi_Middleware } from "./HttpServer.js";
4
4
  import { type IncomingHttpHeaders } from "http";
5
5
  import { type ApiTypeBinder, type ApiWithBody, type ApiWithQuery, HttpMethod, type QueryParams } from "../../../shared/types.js";
6
6
  import { ApiException } from "../../exceptions.js";
7
- import { type ExpressRequest, type ExpressResponse, type ExpressRouter } from "../../utils/types.js";
7
+ import { type ExpressRequest, type ExpressResponse } from "../../utils/types.js";
8
8
  export type HttpRequestData = {
9
9
  originalUrl: string;
10
10
  headers: IncomingHttpHeaders;
@@ -18,15 +18,13 @@ export declare abstract class ServerApi<Binder extends ApiTypeBinder<string, R,
18
18
  private printResponse;
19
19
  readonly headersToLog: string[];
20
20
  readonly method: HttpMethod;
21
- private url;
22
21
  readonly relativePath: string;
23
22
  private middlewares?;
24
23
  private bodyValidator?;
25
24
  private queryValidator?;
26
25
  private sideEffects;
27
- protected baseUrl?: string;
28
26
  private scopes;
29
- protected constructor(method: HttpMethod, relativePath: string, tag?: string);
27
+ protected constructor(method: HttpMethod, relativePath?: string, tag?: string);
30
28
  shouldPrintResponse(): boolean;
31
29
  addSideEffect(sideEffect: () => Promise<any>): this;
32
30
  setMiddlewares(...middlewares: ServerApi_Middleware[]): this;
@@ -37,10 +35,8 @@ export declare abstract class ServerApi<Binder extends ApiTypeBinder<string, R,
37
35
  setBodyValidator(bodyValidator: ValidatorTypeResolver<B>): void;
38
36
  setQueryValidator(queryValidator: ValidatorTypeResolver<P>): void;
39
37
  asProxy(): ServerApi<Binder>;
40
- getUrl(): string;
41
38
  dontPrintResponse(): void;
42
39
  setMaxResponsePrintSize(printResponseMaxSizeBytes: number): void;
43
- route(router: ExpressRouter, prefixUrl: string, baseUrl: string): void;
44
40
  assertProperty: <T extends object, K extends keyof T = keyof T>(instance: T, key: K | K[], statusCode?: number, check?: string | ((propValue: T[K]) => void)) => void;
45
41
  callWrapper: (req: ExpressRequest, res: ExpressResponse) => Promise<void>;
46
42
  private releaseSideEffects;
@@ -49,10 +45,10 @@ export declare abstract class ServerApi<Binder extends ApiTypeBinder<string, R,
49
45
  protected abstract process(request: ExpressRequest, response: ApiResponse, queryParams: P, body: B, context: ObjectTS): Promise<R>;
50
46
  }
51
47
  export declare abstract class ServerApi_Get<Binder extends ApiWithQuery<U, R, P>, U extends string = Binder["url"], R = Binder["response"], P extends QueryParams | {} = Binder["queryParams"]> extends ServerApi<Binder> {
52
- protected constructor(apiName: string);
48
+ protected constructor(apiName?: string);
53
49
  }
54
50
  export declare abstract class ServerApi_Post<Binder extends ApiWithBody<U, B, R>, U extends string = Binder["url"], R = Binder["response"], B = Binder["body"]> extends ServerApi<Binder> {
55
- protected constructor(apiName: string);
51
+ protected constructor(apiName?: string);
56
52
  }
57
53
  export declare class ServerApi_Proxy<Binder extends ApiTypeBinder<string, R, B, P>, R = Binder["response"], B = Binder["body"], P extends QueryParams = Binder["queryParams"]> extends ServerApi<Binder> {
58
54
  private readonly api;
@@ -1 +1 @@
1
- {"version":3,"file":"server-api.d.ts","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-api.d.ts","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/server-api.ts"],"names":[],"mappings":"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"}
@@ -15,16 +15,19 @@ export class ServerApi extends Logger {
15
15
  printResponse = true;
16
16
  headersToLog = [];
17
17
  method;
18
- url;
18
+ // `relativePath` is the v2.0 escape hatch for `mountMany()` (dynamic
19
+ // endpoint arrays where the URL fragment lives on each api instance).
20
+ // For static endpoints mounted with `mount(router, "/path", api)`, leave
21
+ // this empty — the routes file owns the path. Defaults to "" so v2.0
22
+ // subclasses can `super()` with no arguments.
19
23
  relativePath;
20
24
  middlewares;
21
25
  bodyValidator;
22
26
  queryValidator;
23
27
  sideEffects = [];
24
- baseUrl;
25
28
  scopes = [];
26
- constructor(method, relativePath, tag) {
27
- super(tag || relativePath);
29
+ constructor(method, relativePath = "", tag) {
30
+ super(tag || relativePath || method);
28
31
  this.setMinLevel(ServerApi.isDebug ? LogLevel.Verbose : LogLevel.Info);
29
32
  this.method = method;
30
33
  this.relativePath = `${relativePath}`;
@@ -64,22 +67,12 @@ export class ServerApi extends Logger {
64
67
  asProxy() {
65
68
  return new ServerApi_Proxy(this);
66
69
  }
67
- getUrl() {
68
- return this.url;
69
- }
70
70
  dontPrintResponse() {
71
71
  this.printResponse = false;
72
72
  }
73
73
  setMaxResponsePrintSize(printResponseMaxSizeBytes) {
74
74
  this.printResponse = printResponseMaxSizeBytes > -1;
75
75
  }
76
- route(router, prefixUrl, baseUrl) {
77
- this.baseUrl = baseUrl;
78
- const fullPath = `${prefixUrl ? prefixUrl : ""}/${this.relativePath}`;
79
- this.setTag(fullPath);
80
- router[this.method](fullPath, this.callWrapper);
81
- this.url = `${baseUrl}${fullPath}`;
82
- }
83
76
  assertProperty = assertProperty;
84
77
  callWrapper = async (req, res) => {
85
78
  await this.call(req, res);
@@ -214,12 +207,16 @@ export class ServerApi extends Logger {
214
207
  }
215
208
  }
216
209
  export class ServerApi_Get extends ServerApi {
217
- constructor(apiName) {
210
+ // `apiName` is the legacy URL fragment — see the note on `ServerApi`'s
211
+ // constructor. Defaults to "" so v2.0-style subclasses can `super()`.
212
+ constructor(apiName = "") {
218
213
  super(HttpMethod.GET, apiName);
219
214
  }
220
215
  }
221
216
  export class ServerApi_Post extends ServerApi {
222
- constructor(apiName) {
217
+ // `apiName` is the legacy URL fragment — see the note on `ServerApi`'s
218
+ // constructor. Defaults to "" so v2.0-style subclasses can `super()`.
219
+ constructor(apiName = "") {
223
220
  super(HttpMethod.POST, apiName);
224
221
  }
225
222
  }
@@ -245,7 +242,10 @@ export class ServerApi_Redirect extends ServerApi {
245
242
  }
246
243
  async process(request, response, queryParams, _body) {
247
244
  const query = queryParams ? _keys(queryParams).reduce((c, k) => c + '&' + k + '=' + queryParams[k], '?') : '';
248
- response.redirect(this.responseCode, `${this.baseUrl}${this.redirectUrl}${query}`);
245
+ // v2.0: `redirectUrl` must be either absolute or Express-relative.
246
+ // Pre-v2 the framework prefixed it with HttpServer.config.baseUrl —
247
+ // callers that relied on that should now pass the full URL themselves.
248
+ response.redirect(this.responseCode, `${this.redirectUrl}${query}`);
249
249
  }
250
250
  }
251
251
  export class ApiResponse {
@@ -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/dist/backend.d.ts CHANGED
@@ -5,6 +5,7 @@ export * from "./app-backend/modules/FirestoreBackupScheduler.js";
5
5
  export * from "./app-backend/modules/server/server-errors.js";
6
6
  export * from "./app-backend/modules/server/server-api.js";
7
7
  export * from "./app-backend/modules/server/HttpServer.js";
8
+ export * from "./app-backend/modules/server/mount.js";
8
9
  export * from "./app-backend/modules/http/AxiosHttpModule.js";
9
10
  export * from "./app-backend/modules/http/types.js";
10
11
  export * from "./app-backend/modules/ForceUpgrade.js";
@@ -1 +1 @@
1
- {"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":"AAqBA,cAAc,kDAAkD,CAAC;AACjE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+CAA+C,CAAC;AAC9D,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uCAAuC,CAAC;AACtD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC"}
1
+ {"version":3,"file":"backend.d.ts","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":"AAqBA,cAAc,kDAAkD,CAAC;AACjE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,mDAAmD,CAAC;AAClE,cAAc,+CAA+C,CAAC;AAC9D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,4CAA4C,CAAC;AAC3D,cAAc,uCAAuC,CAAC;AACtD,cAAc,+CAA+C,CAAC;AAC9D,cAAc,qCAAqC,CAAC;AACpD,cAAc,uCAAuC,CAAC;AACtD,cAAc,0CAA0C,CAAC;AACzD,cAAc,sCAAsC,CAAC;AACrD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uCAAuC,CAAC;AACtD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC"}
package/dist/backend.js CHANGED
@@ -25,6 +25,7 @@ export * from "./app-backend/modules/FirestoreBackupScheduler.js";
25
25
  export * from "./app-backend/modules/server/server-errors.js";
26
26
  export * from "./app-backend/modules/server/server-api.js";
27
27
  export * from "./app-backend/modules/server/HttpServer.js";
28
+ export * from "./app-backend/modules/server/mount.js";
28
29
  export * from "./app-backend/modules/http/AxiosHttpModule.js";
29
30
  export * from "./app-backend/modules/http/types.js";
30
31
  export * from "./app-backend/modules/ForceUpgrade.js";