@intuitionrobotics/thunderstorm 2.0.11 → 2.1.1

package/dist/app-backend/modules/server/ApiFunction.js

@@ -0,0 +1,68 @@
+import express from "express";
+import {} from "express";
+import { Firebase_ExpressFunction, FirebaseFunction } from "@intuitionrobotics/firebase/backend-functions";
+import { HttpServer_Class } from "./HttpServer.js";
+/**
+ * An Express-backed HTTPS Cloud Function as a *regular module* — registered via
+ * `Storm.addModules(...)` like any other function, named after the module
+ * (no more hardcoded "api"), and instantiable as many times as needed:
+ *
+ *   const Api     = new ApiFunction("api",      {router: rootRouter});
+ *   const ApiTest = new ApiFunction("api_test", {router: rootRouter, options: {generation: "v2"}});
+ *   new Storm().addModules(Api, ApiTest, ...modules).build();
+ *
+ * `api_test` deploys the exact same code as a separate function
+ * (`firebase deploy --only functions:api_test`) — a deployed test environment,
+ * or a safe gen-2 canary, without touching the real `api`.
+ *
+ * Server config (baseUrl/bodyParserLimit/cors) resolves through the module
+ * config store: the shared "HttpServer" slice applies to every instance, and
+ * the instance's own slice (config[name]) layers on top.
+ *
+ * When no ApiFunction is registered, Storm builds an implicit default named
+ * "api" from its legacy builder methods (setApp/setRoutes/setInitialRoutePath/
+ * setApiFunctionOptions) — registering ANY instance disables that default.
+ */
+export class ApiFunction extends FirebaseFunction {
+    providedApp;
+    router;
+    initialRoutePath;
+    _app;
+    constructor(name, args = {}) {
+        super(name, undefined, undefined, args.options ?? {});
+        this.providedApp = args.app;
+        this.router = args.router;
+        this.initialRoutePath = args.initialRoutePath;
+    }
+    setRoutes(router) {
+        this.router = router;
+        return this;
+    }
+    setInitialRoutePath(initialRoutePath) {
+        this.initialRoutePath = initialRoutePath;
+        return this;
+    }
+    // Built lazily at getFunction() time: framework middleware (compression/CORS/
+    // json — via HttpServer, whose config getter layers the shared "HttpServer"
+    // slice under this instance's own slice) + the instance's router.
+    get app() {
+        if (this._app)
+            return this._app;
+        const app = this.providedApp ?? express();
+        const httpServer = new HttpServer_Class(app, this.config);
+        httpServer.setup();
+        const urlPrefix = !process.env.GCLOUD_PROJECT ? this.initialRoutePath : "";
+        if (this.router)
+            httpServer.mountRouter(this.router, urlPrefix);
+        return this._app = app;
+    }
+    getFunction = () => {
+        // Delegate the actual trigger wiring (v1/v2 branch, labels, lifecycle) to
+        // the low-level express wrapper, resolving generation lazily.
+        const expressFunction = new Firebase_ExpressFunction(this.app, this.getName(), undefined, undefined, { ...this.options, generation: this.generation });
+        this.onStart.forEach(hook => expressFunction.addOnStart(hook));
+        this.onDestroy.forEach(hook => expressFunction.addOnDestroy(hook));
+        return expressFunction.getFunction();
+    };
+}
+//# sourceMappingURL=ApiFunction.js.map

package/dist/app-backend/modules/server/ApiFunction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ApiFunction.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/ApiFunction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAA2B,MAAM,SAAS,CAAC;AAClD,OAAO,EAEH,wBAAwB,EACxB,gBAAgB,EAEnB,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAwBjD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,OAAO,WACT,SAAQ,gBAAgB;IAEP,WAAW,CAAW;IAC/B,MAAM,CAAU;IAChB,gBAAgB,CAAU;IAC1B,IAAI,CAAW;IAEvB,YAAY,IAAY,EAAE,OAAwB,EAAE;QAChD,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC;IAClD,CAAC;IAED,SAAS,CAAC,MAAc;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,mBAAmB,CAAC,gBAAwB;QACxC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,8EAA8E;IAC9E,4EAA4E;IAC5E,kEAAkE;IAClE,IAAY,GAAG;QACX,IAAI,IAAI,CAAC,IAAI;YACT,OAAO,IAAI,CAAC,IAAI,CAAC;QAErB,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,IAAI,OAAO,EAAE,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1D,UAAU,CAAC,KAAK,EAAE,CAAC;QAEnB,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,IAAI,IAAI,CAAC,MAAM;YACX,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAC3B,CAAC;IAED,WAAW,GAAG,GAAuB,EAAE;QACnC,0EAA0E;QAC1E,8DAA8D;QAC9D,MAAM,eAAe,GAAG,IAAI,wBAAwB,CAChD,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,EAC9C,EAAC,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAC,CAAC,CAAC;QAEpD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QACnE,OAAO,eAAe,CAAC,WAAW,EAAE,CAAC;IACzC,CAAC,CAAC;CACL"}

package/dist/app-backend/modules/server/HttpServer.d.ts

@@ -2,14 +2,14 @@ import { Module } from "@intuitionrobotics/ts-common";
 import type { ObjectTS } from "@intuitionrobotics/ts-common";
 import type { ApiResponse, HttpRequestData } from "./server-api.js";
 import { ApiException } from "../../exceptions.js";
-import type { Express, ExpressRequest, ExpressRequestHandler } from "../../utils/types.js";
+import type { Express, ExpressRequest } from "../../utils/types.js";
 type ConfigType = {
     port: number;
     baseUrl: string;
     cors: {
         origins?: string[];
         methods?: string[];
-        headers: string[];
+        headers?: string[];
         exposedHeaders?: string[];
     };
     ssl: {
@@ -21,12 +21,23 @@ type ConfigType = {
 export type HttpErrorHandler = (requestData: HttpRequestData, error: ApiException) => Promise<string>;
 export type ServerApi_Middleware = (request: ExpressRequest, data: HttpRequestData, response: ApiResponse, scopes: string[]) => Promise<ObjectTS | void>;
 export declare class HttpServer_Class extends Module<ConfigType> {
-    private static readonly expressMiddleware;
     private readonly express;
     constructor(_express: Express, configElement: ConfigType);
-    static addMiddleware(middleware: ExpressRequestHandler): typeof HttpServer_Class;
     getBaseUrl(): string;
-    init(): void;
+    /**
+     * Collapse duplicate slashes in a URL's PATH only — the query string is
+     * preserved verbatim (a naive global replace mangles values like
+     * `?redirect=https://...`).
+     */
+    static normalizeUrlPath(url: string): string;
+    /**
+     * Collapse duplicate slashes and trim the trailing slash WITHOUT mangling
+     * the protocol separator. (The old in-line replace turned `http://` into
+     * `http:/` — which is why configs grew `http:////` workarounds. Both forms
+     * normalize correctly now.)
+     */
+    static normalizeBaseUrl(baseUrl: string): string;
+    setup(): void;
     mountRouter(router: import("express").Router, urlPrefix?: string): void;
 }
 export declare class HeaderKey {

package/dist/app-backend/modules/server/HttpServer.d.ts.map

@@ -1 +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;AACxJ,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;IAkEG,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"}
+{"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,EAAC,MAAM,sBAAsB,CAAC;AAelE,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,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,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;AACxJ,qBAAa,gBACT,SAAQ,MAAM,CAAC,UAAU,CAAC;IAE1B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEtB,QAAQ,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU;IAMxD,UAAU;IAIV;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAO5C;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAUhD,KAAK;IAyEE,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"}

package/dist/app-backend/modules/server/HttpServer.js

@@ -16,53 +16,84 @@ const ExposedHeaders = [
     HeaderKey_JWT
 ];
 export class HttpServer_Class extends Module {
-    static expressMiddleware = [];
     express;
     constructor(_express, configElement) {
         super("HttpServer");
         this.express = _express;
         this.setConfig(configElement);
     }
-    static addMiddleware(middleware) {
-        HttpServer_Class.expressMiddleware.push(middleware);
-        return this;
-    }
     getBaseUrl() {
         return this.config.baseUrl;
     }
-    init() {
+    /**
+     * Collapse duplicate slashes in a URL's PATH only — the query string is
+     * preserved verbatim (a naive global replace mangles values like
+     * `?redirect=https://...`).
+     */
+    static normalizeUrlPath(url) {
+        const queryIndex = url.indexOf("?");
+        const path = queryIndex === -1 ? url : url.substring(0, queryIndex);
+        const query = queryIndex === -1 ? "" : url.substring(queryIndex);
+        return path.replace(/\/{2,}/g, "/") + query;
+    }
+    /**
+     * Collapse duplicate slashes and trim the trailing slash WITHOUT mangling
+     * the protocol separator. (The old in-line replace turned `http://` into
+     * `http:/` — which is why configs grew `http:////` workarounds. Both forms
+     * normalize correctly now.)
+     */
+    static normalizeBaseUrl(baseUrl) {
+        const match = baseUrl.match(/^([a-z]+:)\/+(.*)$/i);
+        const [protocol, rest] = match ? [`${match[1]}//`, match[2]] : ["", baseUrl];
+        return (protocol + rest.replace(/\/{2,}/g, "/")).replace(/\/+$/, "");
+    }
+    // Express middleware/CORS wiring for the api function. Called explicitly by
+    // ApiFunction when the instance's app is resolved — this is api-function
+    // infra, deliberately eager (and cheap), unlike app modules which must not
+    // override the (never-called) init().
+    setup() {
         this.setMinLevel(ServerApi.isDebug ? LogLevel.Verbose : LogLevel.Info);
-        const baseUrl = this.config.baseUrl;
-        if (baseUrl) {
-            if (baseUrl.endsWith("/"))
-                this.config.baseUrl = baseUrl.substring(0, baseUrl.length - 1);
-            this.config.baseUrl = baseUrl.replace(/\/\//g, "/");
-        }
-        this.express.use((req, res, next) => {
+        if (this.config.baseUrl)
+            this.config.baseUrl = HttpServer_Class.normalizeBaseUrl(this.config.baseUrl);
+        this.express.use((req, _res, next) => {
             if (req)
-                req.url = req.url.replace(/\/\//g, "/");
+                req.url = HttpServer_Class.normalizeUrlPath(req.url);
             next();
         });
+        // On Cloud Functions the platform pre-parses JSON bodies before the app
+        // runs, so this only matters for standalone/local `listen` setups.
         const parserLimit = this.config.bodyParserLimit;
         if (parserLimit)
             this.express.use(express.json({ limit: parserLimit }));
         this.express.use(compression());
         const myCors = this.config.cors || {};
-        if (!myCors.exposedHeaders)
-            myCors.exposedHeaders = ExposedHeaders;
-        myCors.headers = DefaultHeaders.reduce((toRet, item) => {
-            if (!toRet.includes(item))
-                addItemToArray(toRet, item);
-            return toRet;
-        }, myCors.headers || []);
         const corsOptions = {
             credentials: true, // Allow cookies/auth headers
             optionsSuccessStatus: 200,
-            exposedHeaders: myCors.exposedHeaders
+            // DO NOT remove/change lightly: the frontend reads these off
+            // responses (e.g. user-account's AccountModule pulls the refreshed
+            // JWT and the function execution id via getResponseHeader).
+            exposedHeaders: myCors.exposedHeaders || ExposedHeaders
         };
+        // Only wired when configured — otherwise the cors package keeps its
+        // defaults: allowedHeaders reflects the preflight's
+        // Access-Control-Request-Headers, methods = GET,HEAD,PUT,PATCH,POST,DELETE.
+        // (These two knobs existed in config but were never connected before.)
+        if (myCors.headers?.length)
+            corsOptions.allowedHeaders = DefaultHeaders.reduce((toRet, item) => {
+                if (!toRet.includes(item))
+                    addItemToArray(toRet, item);
+                return toRet;
+            }, [...myCors.headers]);
+        if (myCors.methods?.length)
+            corsOptions.methods = myCors.methods;
         // Handle origin configuration
         if (!myCors.origins || myCors.origins.length === 0) {
-            // No origins specified - allow all
+            // No origins configured: reflect ANY origin — combined with
+            // credentials this is wide open. Fine for local dev; deployed
+            // environments must configure cors.origins.
+            this.logWarning("CORS: no cors.origins configured — reflecting any origin WITH credentials. " +
+                "Set 'HttpServer.cors.origins' (or the ApiFunction instance's config slice) in deployed environments.");
             corsOptions.origin = true;
         }
         else {
@@ -71,9 +102,6 @@ export class HttpServer_Class extends Module {
         }
         const corsWithOptions = cors(corsOptions);
         this.express.use(corsWithOptions);
-        for (const middleware of HttpServer_Class.expressMiddleware) {
-            this.express.use(middleware);
-        }
         this.express.options('*', corsWithOptions);
     }
     // v2.0 entrypoint: mount a user-built Express Router directly onto the

package/dist/app-backend/modules/server/HttpServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../../src/main/app-backend/modules/server/HttpServer.ts"],"names":[],"mappings":"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"}

package/dist/backend.d.ts

@@ -5,6 +5,7 @@ export * from "./app-backend/modules/FirestoreBackupScheduler.js";
 export * from "./app-backend/modules/server/server-errors.js";
 export * from "./app-backend/modules/server/server-api.js";
 export * from "./app-backend/modules/server/HttpServer.js";
+export * from "./app-backend/modules/server/ApiFunction.js";
 export { HttpMethod } from "./shared/types.js";
 export * from "./app-backend/modules/http/AxiosHttpModule.js";
 export * from "./app-backend/modules/http/types.js";

package/dist/backend.d.ts.map

@@ -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;AAI3D,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,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;AAE5C,cAAc,0CAA0C,CAAC;AACzD,cAAc,oBAAoB,CAAC"}
+{"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,6CAA6C,CAAC;AAI5D,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,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;AAE5C,cAAc,0CAA0C,CAAC;AACzD,cAAc,oBAAoB,CAAC"}

package/dist/backend.js

@@ -25,6 +25,7 @@ export * from "./app-backend/modules/FirestoreBackupScheduler.js";
 export * from "./app-backend/modules/server/server-errors.js";
 export * from "./app-backend/modules/server/server-api.js";
 export * from "./app-backend/modules/server/HttpServer.js";
+export * from "./app-backend/modules/server/ApiFunction.js";
 // Re-exported from /shared so endpoint files can write
 // `import {ServerApi, HttpMethod} from "@intuitionrobotics/thunderstorm/backend"`
 // without a second import line.

package/dist/backend.js.map

@@ -1 +1 @@
-{"version":3,"file":"backend.js","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,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,uDAAuD;AACvD,kFAAkF;AAClF,gCAAgC;AAChC,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,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;AAC5C,wGAAwG;AACxG,cAAc,0CAA0C,CAAC;AACzD,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"backend.js","sourceRoot":"","sources":["../src/main/backend.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,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,6CAA6C,CAAC;AAC5D,uDAAuD;AACvD,kFAAkF;AAClF,gCAAgC;AAChC,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAC7C,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;AAC5C,wGAAwG;AACxG,cAAc,0CAA0C,CAAC;AACzD,cAAc,oBAAoB,CAAC"}

package/dist/shared/BaseHttpModule.d.ts

@@ -10,14 +10,17 @@ export type HttpConfig = {
 export declare abstract class BaseHttpModule_Class<Config extends HttpConfig = HttpConfig> extends Module<Config> {
     private defaultErrorHandlers;
     private defaultSuccessHandlers;
-    protected origin?: string;
-    protected timeout: number;
+    private _origin?;
+    private _timeout?;
     private readonly defaultResponseHandler;
     protected readonly defaultHeaders: {
         [s: string]: (() => string | string[]) | string | string[];
     };
     constructor(name: string);
-    init(): void;
+    protected get origin(): string | undefined;
+    protected set origin(origin: string | undefined);
+    protected get timeout(): number;
+    protected set timeout(timeout: number);
     shouldCompress(): boolean | undefined;
     addDefaultHeader(key: string, header: (() => string | string[]) | string | string[]): void;
     abstract createRequest<Binder extends ApiTypeBinder<U, R, B, P, E>, U extends string = Binder["url"], R = Binder["response"], B = Binder["body"], P extends QueryParams = Binder["queryParams"], E extends void | object = Binder["error"]>(method: HttpMethod, key: string, data?: string): BaseHttpRequest<Binder>;

package/dist/shared/BaseHttpModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseHttpModule.d.ts","sourceRoot":"","sources":["../../src/main/shared/BaseHttpModule.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,KAAK,aAAa,EAAsB,UAAU,EAAE,KAAK,WAAW,EAAC,MAAM,YAAY,CAAC;AAEhG,OAAO,EAAiB,MAAM,EAAuB,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAC,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAE9G,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAErD,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA;AAED,8BAAsB,oBAAoB,CAAC,MAAM,SAAS,UAAU,GAAG,UAAU,CAC7E,SAAQ,MAAM,CAAC,MAAM,CAAC;IAEtB,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,sBAAsB,CAA+B;IAE7D,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAC1B,SAAS,CAAC,OAAO,EAAE,MAAM,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAChE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAM;gBAE3F,IAAI,EAAE,MAAM;IAKxB,IAAI;IAIJ,cAAc;IAId,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE;IAInF,QAAQ,CAAC,aAAa,CAAC,MAAM,SAAS,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9D,CAAC,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAChC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,EACtB,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAClB,CAAC,SAAS,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,EAC7C,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IAEvH,8BAA8B,GAAI,aAAa,eAAe,CAAC,GAAG,CAAC,aAOjE;IAEF,yBAAyB,CAAC,sBAAsB,EAAE,eAAe;IAIjE,4BAA4B,CAAC,sBAAsB,EAAE,eAAe;IAIpE,gBAAgB,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE;IAIjE,kBAAkB,CAAC,oBAAoB,EAAE,qBAAqB,EAAE;IAIhE,oBAAoB,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAc5C;IAEF,oBAAoB,EAAE,qBAAqB,CAUzC;CACL"}
+{"version":3,"file":"BaseHttpModule.d.ts","sourceRoot":"","sources":["../../src/main/shared/BaseHttpModule.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,KAAK,aAAa,EAAsB,UAAU,EAAE,KAAK,WAAW,EAAC,MAAM,YAAY,CAAC;AAEhG,OAAO,EAAiB,MAAM,EAAuB,MAAM,8BAA8B,CAAC;AAE1F,OAAO,EAAC,KAAK,mBAAmB,EAAE,KAAK,qBAAqB,EAAE,KAAK,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAE9G,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAErD,MAAM,MAAM,UAAU,GAAG;IACrB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACrB,CAAA;AAED,8BAAsB,oBAAoB,CAAC,MAAM,SAAS,UAAU,GAAG,UAAU,CAC7E,SAAQ,MAAM,CAAC,MAAM,CAAC;IAEtB,OAAO,CAAC,oBAAoB,CAAkC;IAC9D,OAAO,CAAC,sBAAsB,CAA+B;IAI7D,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;IAChE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAM;gBAE3F,IAAI,EAAE,MAAM;IAKxB,SAAS,KAAK,MAAM,IAAI,MAAM,GAAG,SAAS,CAEzC;IAED,SAAS,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAE9C;IAED,SAAS,KAAK,OAAO,IAAI,MAAM,CAE9B;IAED,SAAS,KAAK,OAAO,CAAC,OAAO,EAAE,MAAM,EAEpC;IAED,cAAc;IAId,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,MAAM,GAAG,MAAM,EAAE;IAInF,QAAQ,CAAC,aAAa,CAAC,MAAM,SAAS,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC9D,CAAC,SAAS,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,EAChC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,EACtB,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,EAClB,CAAC,SAAS,WAAW,GAAG,MAAM,CAAC,aAAa,CAAC,EAC7C,CAAC,SAAS,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;IAEvH,8BAA8B,GAAI,aAAa,eAAe,CAAC,GAAG,CAAC,aAOjE;IAEF,yBAAyB,CAAC,sBAAsB,EAAE,eAAe;IAIjE,4BAA4B,CAAC,sBAAsB,EAAE,eAAe;IAIpE,gBAAgB,CAAC,oBAAoB,EAAE,mBAAmB,CAAC,GAAG,CAAC,EAAE;IAIjE,kBAAkB,CAAC,oBAAoB,EAAE,qBAAqB,EAAE;IAIhE,oBAAoB,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAc5C;IAEF,oBAAoB,EAAE,qBAAqB,CAUzC;CACL"}

package/dist/shared/BaseHttpModule.js

@@ -28,16 +28,27 @@ import { BaseHttpRequest } from "./BaseHttpRequest.js";
 export class BaseHttpModule_Class extends Module {
     defaultErrorHandlers = [];
     defaultSuccessHandlers = [];
-    origin;
-    timeout = 10000;
+    // origin/timeout fall back to config lazily (was init()); explicit assignments
+    // by subclasses still win via the setters.
+    _origin;
+    _timeout;
     defaultResponseHandler = [];
     defaultHeaders = {};
     constructor(name) {
         super(name);
         this.setDefaultConfig({ compress: true });
     }
-    init() {
-        this.timeout = this.config.timeout || this.timeout;
+    get origin() {
+        return this._origin ?? this.config.origin;
+    }
+    set origin(origin) {
+        this._origin = origin;
+    }
+    get timeout() {
+        return this._timeout ?? this.config.timeout ?? 10000;
+    }
+    set timeout(timeout) {
+        this._timeout = timeout;
     }
     shouldCompress() {
         return this.config.compress;

package/dist/shared/BaseHttpModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseHttpModule.js","sourceRoot":"","sources":["../../src/main/shared/BaseHttpModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseHttpModule.js","sourceRoot":"","sources":["../../src/main/shared/BaseHttpModule.ts"],"names":[],"mappings":"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"}