@rstreamlabs/tunnels 3.6.2 → 3.7.0

package/dist/index.js

@@ -83,6 +83,7 @@ __export(index_exports, {
   resolveTunnelsAPIURL: () => resolveTunnelsAPIURL,
   resolveTunnelsCredentials: () => resolveTunnelsCredentials,
   resolveTunnelsEngine: () => resolveTunnelsEngine,
+  resolveTunnelsRegion: () => resolveTunnelsRegion,
   resolveWebTTYControlRequestParamsSchema: () => resolveWebTTYControlRequestParamsSchema,
   signWebhookPayload: () => signWebhookPayload,
   streamEndpointSchema: () => streamEndpointSchema,
@@ -530,8 +531,24 @@ var routedTunnelSchema = z3.object({
   tokenAuth: z3.boolean().optional(),
   mtls_auth: z3.boolean().optional()
 });
+var routingNodeSchema = z3.object({
+  engineId: nonEmptyStringSchema,
+  region: nonEmptyStringSchema,
+  generation: nonEmptyStringSchema.optional()
+});
+var routingPathSchema = z3.object({
+  mode: z3.enum(["direct", "cross_region"]),
+  crossRegionRoutingAllowed: z3.boolean(),
+  ingress: routingNodeSchema,
+  owner: routingNodeSchema,
+  agentTarget: routingNodeSchema
+});
 var routingSchema = z3.discriminatedUnion("decision", [
-  z3.object({ decision: z3.literal("routed"), tunnel: routedTunnelSchema }),
+  z3.object({
+    decision: z3.literal("routed"),
+    tunnel: routedTunnelSchema,
+    path: routingPathSchema.optional()
+  }),
   z3.object({ decision: z3.literal("not_routed"), failure: failureSchema })
 ]);
 var streamConnectedMetricsSchema = z3.object({
@@ -1615,6 +1632,16 @@ function normalizeEngineAddress(engine) {
 function resolveTunnelsAPIURL(apiUrl) {
   return trimOptionalString(apiUrl) ?? (0, import_rstream6.readEnvironment)().apiUrl ?? import_rstream3.DEFAULT_API_URL;
 }
+function resolveTunnelsRegion(region) {
+  const value = trimOptionalString(region) ?? (0, import_rstream6.readEnvironment)().region;
+  if (value === void 0 || value.toLowerCase() === "auto") return void 0;
+  if (!/^[a-z0-9](?:[a-z0-9._-]{0,62}[a-z0-9])?$/i.test(value)) {
+    throw new Error(
+      "Region can only contain letters, numbers, dots, underscores, or hyphens."
+    );
+  }
+  return value.toLowerCase();
+}
 function resolveTunnelsCredentials(credentials) {
   if (credentials !== void 0) {
     return credentials;
@@ -1642,11 +1669,25 @@ function resolveControlPlaneCredentials(controlPlaneCredentials, credentials, au
   return { token: environmentToken };
 }
 async function resolveTunnelsEngine(config) {
+  const region = resolveTunnelsRegion(config.region);
   const explicitEngine = trimOptionalString(config.engine);
+  const environmentEngine = (0, import_rstream6.readEnvironment)().engine;
+  if (region !== void 0 && (explicitEngine || environmentEngine)) {
+    throw new Error(
+      "Region selection cannot be combined with an explicit engine override."
+    );
+  }
+  if (region !== void 0) {
+    const project = await resolveManagedTunnelsProject(config);
+    const engine = (0, import_rstream4.getTunnelsProjectEngine)(project, region);
+    if (engine) return normalizeEngineAddress(engine);
+    throw new Error(
+      "Failed to resolve the selected regional engine from the managed tunnels project."
+    );
+  }
   if (explicitEngine) {
     return normalizeEngineAddress(explicitEngine);
   }
-  const environmentEngine = (0, import_rstream6.readEnvironment)().engine;
   if (environmentEngine) {
     return normalizeEngineAddress(environmentEngine);
   }
@@ -1657,7 +1698,7 @@ async function resolveTunnelsEngine(config) {
       ...config,
       token
     });
-    const engine = (0, import_rstream4.getTunnelsProjectEngine)(project);
+    const engine = (0, import_rstream4.getTunnelsProjectEngine)(project, region);
     if (engine) {
       return normalizeEngineAddress(engine);
     }
@@ -1686,6 +1727,7 @@ async function resolveManagedTunnelsProject(config) {
   }
   const controlPlane = new import_rstream7.RstreamClient({
     apiUrl: resolveTunnelsAPIURL(config.apiUrl),
+    controlPlaneHeaders: config.controlPlaneHeaders,
     credentials
   });
   return await controlPlane.tunnels.projects.resolveByEndpoint(projectEndpoint);
@@ -2276,9 +2318,30 @@ var RstreamTunnelsClient = class {
     return this.config?.projectEndpoint;
   }
   async getEngine() {
+    const region = resolveTunnelsRegion(this.config?.region);
     const projectEndpoint = normalizeOptionalString3(
       this.config?.projectEndpoint
     );
+    if (region !== void 0) {
+      if (normalizeOptionalString3(this.config?.engine) !== void 0 || (0, import_rstream13.readEnvironment)().engine !== void 0) {
+        throw new Error(
+          "Region selection cannot be combined with an explicit engine override."
+        );
+      }
+      if (projectEndpoint === void 0) {
+        throw new Error(
+          "Managed project endpoint is required for region selection."
+        );
+      }
+      const project = await this.getManagedProject();
+      if (project !== void 0) {
+        const engine = (0, import_rstream11.getTunnelsProjectEngine)(project, region);
+        if (engine) return normalizeEngineAddress(engine);
+      }
+      throw new Error(
+        "Failed to resolve the selected regional engine from the managed tunnels project."
+      );
+    }
     if (projectEndpoint !== void 0 && normalizeOptionalString3(this.config?.engine) === void 0 && (0, import_rstream13.readEnvironment)().engine === void 0) {
       const project = await this.getManagedProject();
       if (project !== void 0) {
@@ -2294,9 +2357,11 @@ var RstreamTunnelsClient = class {
     return await resolveTunnelsEngine({
       apiUrl: this.config?.apiUrl,
       controlPlaneCredentials: this.controlPlaneCredentials,
+      controlPlaneHeaders: this.config?.controlPlaneHeaders,
       credentials: this.credentials,
       engine: this.config?.engine,
-      projectEndpoint: this.config?.projectEndpoint
+      projectEndpoint: this.config?.projectEndpoint,
+      region: this.config?.region
     });
   }
   async getManagedProject() {
@@ -2310,8 +2375,10 @@ var RstreamTunnelsClient = class {
       this.managedProject = resolveManagedTunnelsProject({
         apiUrl: this.config?.apiUrl,
         controlPlaneCredentials: this.controlPlaneCredentials,
+        controlPlaneHeaders: this.config?.controlPlaneHeaders,
         credentials: this.credentials,
-        projectEndpoint
+        projectEndpoint,
+        region: this.config?.region
       }).catch((error) => {
         this.managedProject = void 0;
         throw error;
@@ -2761,6 +2828,7 @@ function parseWebTTYServers(tunnels) {
   resolveTunnelsAPIURL,
   resolveTunnelsCredentials,
   resolveTunnelsEngine,
+  resolveTunnelsRegion,
   resolveWebTTYControlRequestParamsSchema,
   signWebhookPayload,
   streamEndpointSchema,

package/dist/index.mjs

@@ -48,7 +48,7 @@ import {
   webTTYTransportSchema,
   webhookEventsSchema,
   wsEventsSchema
-} from "./chunk-6OUCIT5G.mjs";
+} from "./chunk-K6TZT3PB.mjs";
 
 // src/auth-resource.ts
 import { createAuthTokenParamsSchema } from "@rstreamlabs/rstream/auth-token";
@@ -269,6 +269,16 @@ function normalizeEngineAddress(engine) {
 function resolveTunnelsAPIURL(apiUrl) {
   return trimOptionalString(apiUrl) ?? readEnvironment().apiUrl ?? DEFAULT_API_URL;
 }
+function resolveTunnelsRegion(region) {
+  const value = trimOptionalString(region) ?? readEnvironment().region;
+  if (value === void 0 || value.toLowerCase() === "auto") return void 0;
+  if (!/^[a-z0-9](?:[a-z0-9._-]{0,62}[a-z0-9])?$/i.test(value)) {
+    throw new Error(
+      "Region can only contain letters, numbers, dots, underscores, or hyphens."
+    );
+  }
+  return value.toLowerCase();
+}
 function resolveTunnelsCredentials(credentials) {
   if (credentials !== void 0) {
     return credentials;
@@ -296,11 +306,25 @@ function resolveControlPlaneCredentials(controlPlaneCredentials, credentials, au
   return { token: environmentToken };
 }
 async function resolveTunnelsEngine(config) {
+  const region = resolveTunnelsRegion(config.region);
   const explicitEngine = trimOptionalString(config.engine);
+  const environmentEngine = readEnvironment().engine;
+  if (region !== void 0 && (explicitEngine || environmentEngine)) {
+    throw new Error(
+      "Region selection cannot be combined with an explicit engine override."
+    );
+  }
+  if (region !== void 0) {
+    const project = await resolveManagedTunnelsProject(config);
+    const engine = getTunnelsProjectEngine(project, region);
+    if (engine) return normalizeEngineAddress(engine);
+    throw new Error(
+      "Failed to resolve the selected regional engine from the managed tunnels project."
+    );
+  }
   if (explicitEngine) {
     return normalizeEngineAddress(explicitEngine);
   }
-  const environmentEngine = readEnvironment().engine;
   if (environmentEngine) {
     return normalizeEngineAddress(environmentEngine);
   }
@@ -311,7 +335,7 @@ async function resolveTunnelsEngine(config) {
       ...config,
       token
     });
-    const engine = getTunnelsProjectEngine(project);
+    const engine = getTunnelsProjectEngine(project, region);
     if (engine) {
       return normalizeEngineAddress(engine);
     }
@@ -340,6 +364,7 @@ async function resolveManagedTunnelsProject(config) {
   }
   const controlPlane = new RstreamClient({
     apiUrl: resolveTunnelsAPIURL(config.apiUrl),
+    controlPlaneHeaders: config.controlPlaneHeaders,
     credentials
   });
   return await controlPlane.tunnels.projects.resolveByEndpoint(projectEndpoint);
@@ -930,9 +955,30 @@ var RstreamTunnelsClient = class {
     return this.config?.projectEndpoint;
   }
   async getEngine() {
+    const region = resolveTunnelsRegion(this.config?.region);
     const projectEndpoint = normalizeOptionalString3(
       this.config?.projectEndpoint
     );
+    if (region !== void 0) {
+      if (normalizeOptionalString3(this.config?.engine) !== void 0 || readEnvironment2().engine !== void 0) {
+        throw new Error(
+          "Region selection cannot be combined with an explicit engine override."
+        );
+      }
+      if (projectEndpoint === void 0) {
+        throw new Error(
+          "Managed project endpoint is required for region selection."
+        );
+      }
+      const project = await this.getManagedProject();
+      if (project !== void 0) {
+        const engine = getTunnelsProjectEngine2(project, region);
+        if (engine) return normalizeEngineAddress(engine);
+      }
+      throw new Error(
+        "Failed to resolve the selected regional engine from the managed tunnels project."
+      );
+    }
     if (projectEndpoint !== void 0 && normalizeOptionalString3(this.config?.engine) === void 0 && readEnvironment2().engine === void 0) {
       const project = await this.getManagedProject();
       if (project !== void 0) {
@@ -948,9 +994,11 @@ var RstreamTunnelsClient = class {
     return await resolveTunnelsEngine({
       apiUrl: this.config?.apiUrl,
       controlPlaneCredentials: this.controlPlaneCredentials,
+      controlPlaneHeaders: this.config?.controlPlaneHeaders,
       credentials: this.credentials,
       engine: this.config?.engine,
-      projectEndpoint: this.config?.projectEndpoint
+      projectEndpoint: this.config?.projectEndpoint,
+      region: this.config?.region
     });
   }
   async getManagedProject() {
@@ -964,8 +1012,10 @@ var RstreamTunnelsClient = class {
       this.managedProject = resolveManagedTunnelsProject({
         apiUrl: this.config?.apiUrl,
         controlPlaneCredentials: this.controlPlaneCredentials,
+        controlPlaneHeaders: this.config?.controlPlaneHeaders,
         credentials: this.credentials,
-        projectEndpoint
+        projectEndpoint,
+        region: this.config?.region
       }).catch((error) => {
         this.managedProject = void 0;
         throw error;
@@ -1414,6 +1464,7 @@ export {
   resolveTunnelsAPIURL,
   resolveTunnelsCredentials,
   resolveTunnelsEngine,
+  resolveTunnelsRegion,
   resolveWebTTYControlRequestParamsSchema,
   signWebhookPayload,
   streamEndpointSchema,

package/dist/openapi.js

@@ -270,8 +270,24 @@ var routedTunnelSchema = z3.object({
   tokenAuth: z3.boolean().optional(),
   mtls_auth: z3.boolean().optional()
 });
+var routingNodeSchema = z3.object({
+  engineId: nonEmptyStringSchema,
+  region: nonEmptyStringSchema,
+  generation: nonEmptyStringSchema.optional()
+});
+var routingPathSchema = z3.object({
+  mode: z3.enum(["direct", "cross_region"]),
+  crossRegionRoutingAllowed: z3.boolean(),
+  ingress: routingNodeSchema,
+  owner: routingNodeSchema,
+  agentTarget: routingNodeSchema
+});
 var routingSchema = z3.discriminatedUnion("decision", [
-  z3.object({ decision: z3.literal("routed"), tunnel: routedTunnelSchema }),
+  z3.object({
+    decision: z3.literal("routed"),
+    tunnel: routedTunnelSchema,
+    path: routingPathSchema.optional()
+  }),
   z3.object({ decision: z3.literal("not_routed"), failure: failureSchema })
 ]);
 var streamConnectedMetricsSchema = z3.object({

package/dist/openapi.mjs

@@ -1,7 +1,7 @@
 import {
   engineOpenApiDocument,
   engineOpenApiJson
-} from "./chunk-6OUCIT5G.mjs";
+} from "./chunk-K6TZT3PB.mjs";
 export {
   engineOpenApiDocument,
   engineOpenApiJson

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstreamlabs/tunnels",
-  "version": "3.6.2",
+  "version": "3.7.0",
   "description": "JS/TS SDK for the rstream Engine API and tunnel runtime APIs.",
   "author": "@uartnet <hello@rstream.io>",
   "repository": {
@@ -47,7 +47,7 @@
     "typescript-config": "*"
   },
   "dependencies": {
-    "@rstreamlabs/rstream": "3.6.0",
+    "@rstreamlabs/rstream": "3.7.0",
     "@types/jsonwebtoken": "^9.0.10",
     "jsonwebtoken": "^9.0.3",
     "zod": "^4.4.3"