@omen.foundation/node-microservice-runtime 0.1.75 → 0.1.77

package/dist/runtime.d.ts

@@ -20,6 +20,13 @@ export declare class MicroserviceRuntime {
     private handleEvent;
     private toRequestContext;
     private findServiceForPath;
+    /**
+     * Parses a query string into a record of parameter names to values.
+     * Handles multiple values for the same parameter name by storing them as an array.
+     * @param queryString The query string (without the leading '?')
+     * @returns A record mapping parameter names to their values (single string or array of strings)
+     */
+    private parseQueryString;
     private dispatch;
     private buildInvocationArguments;
     private sendSuccessResponse;
@@ -30,6 +37,12 @@ export declare class MicroserviceRuntime {
     private printHelpfulUrls;
     private initializeDependencyProviders;
     private createRequestScope;
+    /**
+     * Extracts the path portion without the query string.
+     * @param path The full path potentially containing a query string
+     * @returns The path without the query string
+     */
+    private getPathWithoutQuery;
 }
 export declare function runMicroservice(): Promise<void>;
 interface GenerateOpenApiOptions {

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,iBAAiB,EAOlB,MAAM,YAAY,CAAC;AA2BpB,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAoB;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IACxD,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,OAAO,CAAkB;gBAErB,GAAG,CAAC,EAAE,iBAAiB;IA4H7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6DtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YASjB,sBAAsB;YA2CtB,qBAAqB;YAarB,eAAe;YA+Gf,WAAW;IA8BzB,OAAO,CAAC,gBAAgB;IAkFxB,OAAO,CAAC,kBAAkB;YAUZ,QAAQ;IAsDtB,OAAO,CAAC,wBAAwB;YAmBlB,mBAAmB;YAiBnB,sBAAsB;YAStB,wBAAwB;YAoBxB,mBAAmB;IA2GjC,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,gBAAgB;YA+BV,6BAA6B;IA6B3C,OAAO,CAAC,kBAAkB;CAK3B;AA+GD,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAoDrD;AAED,UAAU,sBAAsB;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,4CAA4C,CAC1D,SAAS,GAAE,OAAO,CAAC,iBAAiB,CAAM,EAC1C,OAAO,GAAE,sBAA2B,GACnC,OAAO,CA6BT"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,iBAAiB,EAOlB,MAAM,YAAY,CAAC;AA2BpB,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAoB;IACxC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;IAC7C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAoB;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAmB;IAC7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAuB;IAClD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAyB;IACxD,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,OAAO,CAAkB;gBAErB,GAAG,CAAC,EAAE,iBAAiB;IA2H7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA6DtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YASjB,sBAAsB;YA2CtB,qBAAqB;YAarB,eAAe;YA+Gf,WAAW;IA8BzB,OAAO,CAAC,gBAAgB;IAuFxB,OAAO,CAAC,kBAAkB;IAW1B;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;YA+BV,QAAQ;IAwDtB,OAAO,CAAC,wBAAwB;YAmBlB,mBAAmB;YAiBnB,sBAAsB;YAStB,wBAAwB;YAsBxB,mBAAmB;IA6GjC,OAAO,CAAC,kBAAkB;IAgB1B,OAAO,CAAC,gBAAgB;YA+BV,6BAA6B;IA6B3C,OAAO,CAAC,kBAAkB;IAO1B;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;CAI5B;AA+GD,wBAAsB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAoDrD;AAED,UAAU,sBAAsB;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,4CAA4C,CAC1D,SAAS,GAAE,OAAO,CAAC,iBAAiB,CAAM,EAC1C,OAAO,GAAE,sBAA2B,GACnC,OAAO,CA6BT"}

package/dist/runtime.js

@@ -4,7 +4,7 @@ import { GatewayRequester } from './requester.js';
 import { AuthManager } from './auth.js';
 import { createLogger } from './logger.js';
 import { loadEnvironmentConfig } from './env.js';
-import { loadAndInjectEnvironmentVariables } from './env-loader.js';
+import { loadAndInjectEnvironmentVariables, loadDeveloperEnvVarsSync } from './env-loader.js';
 import { startCollectorAndWaitForReady } from './collector-manager.js';
 import pino from 'pino';
 // Removed deasync - using non-blocking async pattern instead
@@ -33,7 +33,10 @@ export class MicroserviceRuntime {
     constructor(env) {
         this.env = env ?? loadEnvironmentConfig();
         const envConfig = this.env; // Capture for async IIFE to satisfy TypeScript
-        // STEP 1: Create minimal console logger for startup messages (before collector setup)
+        // STEP 1: Load developer-defined environment variables SYNCHRONOUSLY before logger creation
+        // This ensures BetterStack and other env vars are available when the logger initializes
+        loadDeveloperEnvVarsSync();
+        // STEP 2: Create minimal console logger for startup messages (before collector setup)
         // This ensures we have logging available immediately, even before collector is ready
         const startupLogger = pino({
             name: 'beamable-runtime-startup',
@@ -41,24 +44,19 @@ export class MicroserviceRuntime {
         }, process.stdout);
         // Display runtime version at startup (VERSION is imported synchronously at top of file)
         startupLogger.info(`Starting Beamable Node microservice runtime (version: ${VERSION}).`);
-        // STEP 1.5: Load additional environment variables (developer-defined + Beamable Config)
-        // This runs synchronously but with a timeout - we wait up to 2 seconds for Beamable Config
-        // Developer-defined vars (beam.env) are loaded immediately
-        // Beamable Config is fetched via API with a 2-second timeout to avoid blocking startup
-        // Note: This is wrapped in an IIFE to allow await at the top level of constructor logic
-        // We use a fire-and-forget pattern: load vars but don't block service initialization
+        // STEP 2.5: Load Beamable Config asynchronously (in background, non-blocking)
+        // Developer-defined vars are already loaded synchronously above
+        // Beamable Config is fetched via API with a 2-second timeout
         (async () => {
             try {
-                startupLogger.info('Loading environment variables from beam.env and Beamable Config...');
+                startupLogger.info('Loading Beamable Config environment variables...');
                 await loadAndInjectEnvironmentVariables(envConfig, undefined, true, 2000);
-                startupLogger.info('Environment variable loading completed');
+                startupLogger.info('Beamable Config loading completed');
             }
             catch (error) {
-                startupLogger.warn(`Environment variable loading completed with warnings: ${error instanceof Error ? error.message : String(error)}`);
+                startupLogger.warn(`Beamable Config loading completed with warnings: ${error instanceof Error ? error.message : String(error)}`);
             }
         })();
-        // Continue immediately - env vars will be available as they load
-        // Developer vars are already injected, Beamable Config will arrive within 2 seconds
         // STEP 2: Get registered services to extract service name
         const registered = listRegisteredServices();
         if (registered.length === 0) {
@@ -386,6 +384,9 @@ export class MicroserviceRuntime {
         const method = envelope.method ?? 'post';
         const userId = typeof envelope.from === 'number' ? envelope.from : 0;
         const headers = envelope.headers ?? {};
+        // Parse query parameters from path (e.g., /service/route?param1=value1&param2=value2)
+        const [pathWithoutQuery, queryString] = path.split('?', 2);
+        const query = this.parseQueryString(queryString ?? '');
         // Extract scopes from envelope.scopes array
         // Note: X-DE-SCOPE header contains CID.PID, not scope values
         // The gateway sends scopes in envelope.scopes array
@@ -395,7 +396,7 @@ export class MicroserviceRuntime {
         let scopes = normalizeScopes(envelopeScopes);
         // If this is an admin endpoint and no scopes are provided, infer admin scope
         // The gateway may not always send scopes for admin routes
-        const pathLower = path.toLowerCase();
+        const pathLower = pathWithoutQuery.toLowerCase();
         if (pathLower.includes('/admin/') && scopes.size === 0) {
             scopes = normalizeScopes(['admin']);
         }
@@ -427,9 +428,9 @@ export class MicroserviceRuntime {
                 payload = rawPayload;
             }
         }
-        const targetService = this.findServiceForPath(path);
+        const targetService = this.findServiceForPath(pathWithoutQuery);
         const services = this.serviceManager.createFacade(userId, scopes, targetService?.definition.name);
-        const provider = this.createRequestScope(path, targetService);
+        const provider = this.createRequestScope(pathWithoutQuery, targetService);
         const context = {
             id: envelope.id,
             path,
@@ -438,6 +439,7 @@ export class MicroserviceRuntime {
             userId,
             payload,
             body,
+            query,
             scopes,
             headers,
             cid: this.env.cid,
@@ -461,14 +463,51 @@ export class MicroserviceRuntime {
     findServiceForPath(path) {
         // Gateway sends paths with lowercase service names, so we need case-insensitive matching
         // Match by comparing lowercase versions to handle gateway's lowercase path format
+        // Note: path should already have query string stripped before calling this method
         const pathLower = path.toLowerCase();
         return this.services.find((service) => {
             const qualifiedNameLower = service.definition.qualifiedName.toLowerCase();
             return pathLower.startsWith(`${qualifiedNameLower}/`);
         });
     }
+    /**
+     * Parses a query string into a record of parameter names to values.
+     * Handles multiple values for the same parameter name by storing them as an array.
+     * @param queryString The query string (without the leading '?')
+     * @returns A record mapping parameter names to their values (single string or array of strings)
+     */
+    parseQueryString(queryString) {
+        if (!queryString || queryString.trim().length === 0) {
+            return {};
+        }
+        const params = {};
+        const pairs = queryString.split('&');
+        for (const pair of pairs) {
+            const [key, value = ''] = pair.split('=', 2);
+            if (key) {
+                const decodedKey = decodeURIComponent(key);
+                const decodedValue = decodeURIComponent(value);
+                // If the key already exists, convert to array or append to existing array
+                if (decodedKey in params) {
+                    const existing = params[decodedKey];
+                    if (Array.isArray(existing)) {
+                        existing.push(decodedValue);
+                    }
+                    else {
+                        params[decodedKey] = [existing, decodedValue];
+                    }
+                }
+                else {
+                    params[decodedKey] = decodedValue;
+                }
+            }
+        }
+        return params;
+    }
     async dispatch(ctx) {
-        const service = this.findServiceForPath(ctx.path);
+        // Extract path without query string for routing
+        const pathWithoutQuery = this.getPathWithoutQuery(ctx.path);
+        const service = this.findServiceForPath(pathWithoutQuery);
         if (!service) {
             throw new UnknownRouteError(ctx.path);
         }
@@ -479,7 +518,7 @@ export class MicroserviceRuntime {
             return;
         }
         // Extract route from path - handle case-insensitive path matching
-        const pathLower = ctx.path.toLowerCase();
+        const pathLower = pathWithoutQuery.toLowerCase();
         const qualifiedNameLower = service.definition.qualifiedName.toLowerCase();
         const route = pathLower.substring(qualifiedNameLower.length + 1);
         const metadata = service.definition.callables.get(route);
@@ -554,14 +593,16 @@ export class MicroserviceRuntime {
     }
     async tryHandleFederationRoute(ctx, service) {
         // Gateway sends paths with lowercase service names, so we need case-insensitive matching
-        const pathLower = ctx.path.toLowerCase();
+        // Extract path without query string for routing
+        const pathWithoutQuery = this.getPathWithoutQuery(ctx.path);
+        const pathLower = pathWithoutQuery.toLowerCase();
         const qualifiedNameLower = service.definition.qualifiedName.toLowerCase();
         const prefixLower = `${qualifiedNameLower}/`;
         if (!pathLower.startsWith(prefixLower)) {
             return false;
         }
         // Extract relative path - use lowercase length since gateway sends lowercase paths
-        const relativePath = ctx.path.substring(qualifiedNameLower.length + 1);
+        const relativePath = pathWithoutQuery.substring(qualifiedNameLower.length + 1);
         const handler = service.federationRegistry.resolve(relativePath);
         if (!handler) {
             return false;
@@ -573,7 +614,9 @@ export class MicroserviceRuntime {
     async tryHandleAdminRoute(ctx, service) {
         // Gateway sends paths with lowercase service names, so we need case-insensitive matching
         // Check if path starts with the admin prefix (case-insensitive)
-        const pathLower = ctx.path.toLowerCase();
+        // Extract path without query string for routing
+        const pathWithoutQuery = this.getPathWithoutQuery(ctx.path);
+        const pathLower = pathWithoutQuery.toLowerCase();
         const adminPrefixLower = `${service.definition.qualifiedName.toLowerCase()}/admin/`;
         if (!pathLower.startsWith(adminPrefixLower)) {
             return false;
@@ -730,10 +773,20 @@ export class MicroserviceRuntime {
         }
     }
     createRequestScope(path, service) {
+        // Path should already have query string stripped before calling this method
         const targetService = service ?? this.findServiceForPath(path);
         const provider = targetService?.provider ?? new DependencyBuilder().build();
         return provider.createScope();
     }
+    /**
+     * Extracts the path portion without the query string.
+     * @param path The full path potentially containing a query string
+     * @returns The path without the query string
+     */
+    getPathWithoutQuery(path) {
+        const [pathWithoutQuery] = path.split('?', 2);
+        return pathWithoutQuery;
+    }
 }
 function enforceAccess(access, ctx) {
     switch (access) {