@rstreamlabs/tunnels 3.8.2 → 3.8.3

package/dist/index.d.mts

@@ -234,8 +234,10 @@ type TURNCredentialMode = z.infer<typeof turnCredentialModeSchema>;
 interface CreateAPITURNCredentialsOptions {
     apiUrl?: string;
     credentials: RstreamCredentials;
+    fetch?: typeof globalThis.fetch;
     projectEndpoint?: string;
     projectId?: string;
+    requestTimeoutMilliseconds?: number;
     ttlSeconds?: number;
 }
 interface CreatePATTURNCredentialsOptions {
@@ -271,11 +273,13 @@ interface CreateTURNCredentialsOptions {
     controlPlaneCredentials?: RstreamCredentials;
     credentials?: RstreamCredentials;
     engine?: string;
+    fetch?: typeof globalThis.fetch;
     keyringBaseUrl?: string;
     mode?: TURNCredentialMode;
     now?: Date | number;
     projectEndpoint?: string;
     projectId?: string;
+    requestTimeoutMilliseconds?: number;
     serverPublicKeyHex?: string;
     tokenEndpoint?: string;
     ttlSeconds?: number;
@@ -5511,11 +5515,11 @@ declare const webTTYSessionEventSchema: z.ZodObject<{
     created_at: z.ZodString;
     type: z.ZodEnum<{
         error: "error";
+        close: "close";
         open: "open";
         ack: "ack";
         data: "data";
         resize: "resize";
-        close: "close";
         participant: "participant";
         control: "control";
         recording_state: "recording_state";

package/dist/index.d.ts

@@ -234,8 +234,10 @@ type TURNCredentialMode = z.infer<typeof turnCredentialModeSchema>;
 interface CreateAPITURNCredentialsOptions {
     apiUrl?: string;
     credentials: RstreamCredentials;
+    fetch?: typeof globalThis.fetch;
     projectEndpoint?: string;
     projectId?: string;
+    requestTimeoutMilliseconds?: number;
     ttlSeconds?: number;
 }
 interface CreatePATTURNCredentialsOptions {
@@ -271,11 +273,13 @@ interface CreateTURNCredentialsOptions {
     controlPlaneCredentials?: RstreamCredentials;
     credentials?: RstreamCredentials;
     engine?: string;
+    fetch?: typeof globalThis.fetch;
     keyringBaseUrl?: string;
     mode?: TURNCredentialMode;
     now?: Date | number;
     projectEndpoint?: string;
     projectId?: string;
+    requestTimeoutMilliseconds?: number;
     serverPublicKeyHex?: string;
     tokenEndpoint?: string;
     ttlSeconds?: number;
@@ -5511,11 +5515,11 @@ declare const webTTYSessionEventSchema: z.ZodObject<{
     created_at: z.ZodString;
     type: z.ZodEnum<{
         error: "error";
+        close: "close";
         open: "open";
         ack: "ack";
         data: "data";
         resize: "resize";
-        close: "close";
         participant: "participant";
         control: "control";
         recording_state: "recording_state";

package/dist/index.js

@@ -1775,6 +1775,52 @@ var import_rstream8 = require("@rstreamlabs/rstream");
 var import_rstream9 = require("@rstreamlabs/rstream");
 var import_rstream10 = require("@rstreamlabs/rstream");
 var import_turn = require("@rstreamlabs/rstream/turn");
+
+// src/control-plane-fetch.ts
+function createRequestLifetime(parent, timeoutMilliseconds) {
+  const controller = new AbortController();
+  const abort = () => controller.abort(parent.reason);
+  if (parent.aborted) {
+    abort();
+  } else {
+    parent.addEventListener("abort", abort, { once: true });
+  }
+  const timeout = setTimeout(
+    () => controller.abort(new Error("Control plane request timed out.")),
+    timeoutMilliseconds
+  );
+  return {
+    close: () => {
+      clearTimeout(timeout);
+      parent.removeEventListener("abort", abort);
+    },
+    signal: controller.signal
+  };
+}
+function createBoundedControlPlaneFetch(timeoutMilliseconds) {
+  return async (input, init) => {
+    const request = new Request(input, init);
+    const headers = new Headers(request.headers);
+    headers.set("Connection", "close");
+    const lifetime = createRequestLifetime(request.signal, timeoutMilliseconds);
+    try {
+      const response = await globalThis.fetch(request, {
+        headers,
+        signal: lifetime.signal
+      });
+      const responseBody = response.body === null ? null : new Uint8Array(await response.arrayBuffer());
+      return new Response(responseBody, {
+        headers: Object.fromEntries(response.headers.entries()),
+        status: response.status,
+        statusText: response.statusText
+      });
+    } finally {
+      lifetime.close();
+    }
+  };
+}
+
+// src/turn.ts
 var z8 = __toESM(require("zod"));
 var import_crypto = __toESM(require("crypto"));
 var defaultTURNPort = 3478;
@@ -1782,6 +1828,8 @@ var defaultTURNSPort = 5349;
 var defaultTURNCredentialTTLSeconds = 10 * 60;
 var maxTURNCredentialTTLSeconds = 60 * 60;
 var maxTURNKeyringBytes = 8 * 1024;
+var defaultAPIRequestTimeoutMilliseconds = 1e4;
+var maxAPIRequestTimeoutMilliseconds = 6e4;
 var turnTokenClaimsSchema = z8.object({
   exp: z8.number().int().optional(),
   iat: z8.number().int().optional(),
@@ -1815,6 +1863,15 @@ function normalizeTTLSeconds(ttlSeconds) {
   }
   return ttl;
 }
+function normalizeAPIRequestTimeoutMilliseconds(timeoutMilliseconds) {
+  const timeout = timeoutMilliseconds ?? defaultAPIRequestTimeoutMilliseconds;
+  if (!Number.isInteger(timeout) || timeout < 1 || timeout > maxAPIRequestTimeoutMilliseconds) {
+    throw new Error(
+      "TURN API request timeout must be an integer between 1 and 60000 milliseconds."
+    );
+  }
+  return timeout;
+}
 function createAPITURNCredentialsParams(ttlSeconds) {
   return ttlSeconds === void 0 ? {} : { ttlSeconds: normalizeTTLSeconds(ttlSeconds) };
 }
@@ -2008,11 +2065,16 @@ async function createAPITURNCredentials(options) {
       "Project ID or project endpoint is required for TURN API mode."
     );
   }
+  const requestTimeoutMilliseconds = normalizeAPIRequestTimeoutMilliseconds(
+    options.requestTimeoutMilliseconds
+  );
+  const params = createAPITURNCredentialsParams(options.ttlSeconds);
+  const request = options.fetch ?? createBoundedControlPlaneFetch(requestTimeoutMilliseconds);
   const client = new import_rstream10.RstreamClient({
     apiUrl: options.apiUrl,
-    credentials: options.credentials
+    credentials: options.credentials,
+    fetch: request
   });
-  const params = createAPITURNCredentialsParams(options.ttlSeconds);
   if (projectId) {
     return await client.tunnels.projects.createTurnCredentials(
       projectId,
@@ -2153,8 +2215,10 @@ async function createTURNCredentials(options) {
     return await createAPITURNCredentials({
       apiUrl: options.apiUrl,
       credentials: controlPlaneCredentials,
+      fetch: options.fetch,
       projectEndpoint,
       projectId: options.projectId,
+      requestTimeoutMilliseconds: options.requestTimeoutMilliseconds,
       ttlSeconds: options.ttlSeconds
     });
   }

package/dist/index.mjs

@@ -412,6 +412,52 @@ import { isClientCredentials as isClientCredentials2 } from "@rstreamlabs/rstrea
 import { isTokenCredentials as isTokenCredentials2 } from "@rstreamlabs/rstream";
 import { RstreamClient as RstreamClient2 } from "@rstreamlabs/rstream";
 import { turnCredentialsSchema } from "@rstreamlabs/rstream/turn";
+
+// src/control-plane-fetch.ts
+function createRequestLifetime(parent, timeoutMilliseconds) {
+  const controller = new AbortController();
+  const abort = () => controller.abort(parent.reason);
+  if (parent.aborted) {
+    abort();
+  } else {
+    parent.addEventListener("abort", abort, { once: true });
+  }
+  const timeout = setTimeout(
+    () => controller.abort(new Error("Control plane request timed out.")),
+    timeoutMilliseconds
+  );
+  return {
+    close: () => {
+      clearTimeout(timeout);
+      parent.removeEventListener("abort", abort);
+    },
+    signal: controller.signal
+  };
+}
+function createBoundedControlPlaneFetch(timeoutMilliseconds) {
+  return async (input, init) => {
+    const request = new Request(input, init);
+    const headers = new Headers(request.headers);
+    headers.set("Connection", "close");
+    const lifetime = createRequestLifetime(request.signal, timeoutMilliseconds);
+    try {
+      const response = await globalThis.fetch(request, {
+        headers,
+        signal: lifetime.signal
+      });
+      const responseBody = response.body === null ? null : new Uint8Array(await response.arrayBuffer());
+      return new Response(responseBody, {
+        headers: Object.fromEntries(response.headers.entries()),
+        status: response.status,
+        statusText: response.statusText
+      });
+    } finally {
+      lifetime.close();
+    }
+  };
+}
+
+// src/turn.ts
 import * as z from "zod";
 import crypto from "crypto";
 var defaultTURNPort = 3478;
@@ -419,6 +465,8 @@ var defaultTURNSPort = 5349;
 var defaultTURNCredentialTTLSeconds = 10 * 60;
 var maxTURNCredentialTTLSeconds = 60 * 60;
 var maxTURNKeyringBytes = 8 * 1024;
+var defaultAPIRequestTimeoutMilliseconds = 1e4;
+var maxAPIRequestTimeoutMilliseconds = 6e4;
 var turnTokenClaimsSchema = z.object({
   exp: z.number().int().optional(),
   iat: z.number().int().optional(),
@@ -452,6 +500,15 @@ function normalizeTTLSeconds(ttlSeconds) {
   }
   return ttl;
 }
+function normalizeAPIRequestTimeoutMilliseconds(timeoutMilliseconds) {
+  const timeout = timeoutMilliseconds ?? defaultAPIRequestTimeoutMilliseconds;
+  if (!Number.isInteger(timeout) || timeout < 1 || timeout > maxAPIRequestTimeoutMilliseconds) {
+    throw new Error(
+      "TURN API request timeout must be an integer between 1 and 60000 milliseconds."
+    );
+  }
+  return timeout;
+}
 function createAPITURNCredentialsParams(ttlSeconds) {
   return ttlSeconds === void 0 ? {} : { ttlSeconds: normalizeTTLSeconds(ttlSeconds) };
 }
@@ -645,11 +702,16 @@ async function createAPITURNCredentials(options) {
       "Project ID or project endpoint is required for TURN API mode."
     );
   }
+  const requestTimeoutMilliseconds = normalizeAPIRequestTimeoutMilliseconds(
+    options.requestTimeoutMilliseconds
+  );
+  const params = createAPITURNCredentialsParams(options.ttlSeconds);
+  const request = options.fetch ?? createBoundedControlPlaneFetch(requestTimeoutMilliseconds);
   const client = new RstreamClient2({
     apiUrl: options.apiUrl,
-    credentials: options.credentials
+    credentials: options.credentials,
+    fetch: request
   });
-  const params = createAPITURNCredentialsParams(options.ttlSeconds);
   if (projectId) {
     return await client.tunnels.projects.createTurnCredentials(
       projectId,
@@ -790,8 +852,10 @@ async function createTURNCredentials(options) {
     return await createAPITURNCredentials({
       apiUrl: options.apiUrl,
       credentials: controlPlaneCredentials,
+      fetch: options.fetch,
       projectEndpoint,
       projectId: options.projectId,
+      requestTimeoutMilliseconds: options.requestTimeoutMilliseconds,
       ttlSeconds: options.ttlSeconds
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstreamlabs/tunnels",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "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.8.1",
+    "@rstreamlabs/rstream": "3.8.2",
     "@types/jsonwebtoken": "^9.0.10",
     "jsonwebtoken": "^9.0.3",
     "zod": "^4.4.3"