@rstreamlabs/tunnels 1.0.11 → 2.0.0

package/dist/index.mjs

@@ -13,211 +13,13 @@ import {
   streamSummarySchema,
   streamTLSInfoSchema,
   tunnelFilterSchema,
-  tunnelSchema,
   webhookEventsSchema,
   wsEventsSchema
-} from "./chunk-NHUJ3FYM.mjs";
+} from "./chunk-UUZYVELQ.mjs";
 
 // src/auth-resource.ts
+import { createAuthTokenParamsSchema } from "@rstreamlabs/rstream/auth-token";
 import { createClientCredentialsToken } from "@rstreamlabs/rstream";
-
-// src/zod.ts
-import * as z from "zod";
-var StringFilter = z.union([
-  z.string(),
-  z.object({ exact: z.string() }).strict(),
-  z.object({ oneof: z.array(z.string()) }).strict(),
-  z.object({ regex: z.string() }).strict()
-]);
-function transform(field) {
-  if (field instanceof z.ZodOptional) {
-    return z.optional(transform(field.unwrap()));
-  }
-  if (field instanceof z.ZodString) {
-    return z.optional(StringFilter);
-  }
-  if (field instanceof z.ZodRecord) {
-    return z.optional(z.record(field.keyType, transform(field.valueType)));
-  }
-  return z.optional(field);
-}
-function filters(base) {
-  const entries = Object.entries(base.shape).map(([key, field]) => [
-    key,
-    transform(field)
-  ]);
-  const shape = Object.fromEntries(entries);
-  const node = z.lazy(
-    () => z.union([
-      z.object(shape).strict(),
-      z.object({ AND: z.array(node) }).strict(),
-      z.object({ OR: z.array(node) }).strict()
-    ])
-  );
-  return node;
-}
-function select(base) {
-  const entries = Object.entries(base.shape).map(([key]) => {
-    return [key, z.boolean().optional()];
-  });
-  const shape = Object.fromEntries(entries);
-  return z.object(shape).strict();
-}
-
-// src/auth.ts
-import * as z2 from "zod";
-var nonEmptyStringSchema = z2.string().trim().min(1);
-var authTokenPermissionsSchema = z2.array(z2.string());
-var authTokenTunnelsScopesSchema = z2.object({
-  // Scopes for creating tunnels
-  create: z2.union([
-    z2.boolean(),
-    z2.object({
-      filters: filters(
-        tunnelSchema.omit({
-          client_id: true,
-          user_id: true,
-          workspace_id: true,
-          project_id: true,
-          cluster_id: true,
-          plan: true,
-          provider: true,
-          region: true,
-          status: true,
-          id: true,
-          creation_date: true
-        })
-      ).optional()
-    }).strict()
-  ]).optional(),
-  // Scopes for connecting to tunnels
-  connect: z2.union([
-    z2.boolean(),
-    z2.object({
-      filters: filters(tunnelSchema).optional(),
-      params: filters(
-        z2.object({
-          path: z2.string().optional()
-        })
-      ).optional()
-    }).strict()
-  ]).optional(),
-  // Scopes for listing tunnels
-  list: z2.union([
-    z2.boolean(),
-    z2.object({
-      filters: filters(tunnelSchema).optional(),
-      select: select(tunnelSchema).optional()
-    }).strict()
-  ]).optional()
-}).strict().superRefine((scopes, ctx) => {
-  if (scopes.create === void 0 && scopes.connect === void 0 && scopes.list === void 0) {
-    ctx.addIssue({
-      code: z2.ZodIssueCode.custom,
-      message: "At least one tunnel scope action is required."
-    });
-  }
-});
-var authTokenScopesSchema = z2.object({
-  tunnels: authTokenTunnelsScopesSchema.optional()
-  // Scopes related to tunnels
-}).strict().superRefine((scopes, ctx) => {
-  if (scopes.tunnels === void 0) {
-    ctx.addIssue({
-      code: z2.ZodIssueCode.custom,
-      message: "Tunnel scopes are required.",
-      path: ["tunnels"]
-    });
-  }
-});
-var authTokenTunnelGrantLeafSchema = z2.object({
-  workspaces: z2.array(nonEmptyStringSchema).min(1).optional(),
-  projects: z2.array(nonEmptyStringSchema).min(1).optional(),
-  scopes: authTokenScopesSchema.optional()
-}).strict().superRefine((grant, ctx) => {
-  if (grant.workspaces !== void 0 && grant.projects !== void 0) {
-    ctx.addIssue({
-      code: z2.ZodIssueCode.custom,
-      message: "A grant cannot target workspaces and projects at the same time.",
-      path: ["projects"]
-    });
-  }
-  if (grant.workspaces === void 0 && grant.projects === void 0 && grant.scopes === void 0) {
-    ctx.addIssue({
-      code: z2.ZodIssueCode.custom,
-      message: "A grant must target workspaces, projects, or scopes.",
-      path: ["workspaces"]
-    });
-  }
-});
-var authTokenTunnelGrantSchema = z2.lazy(
-  () => z2.union([
-    authTokenTunnelGrantLeafSchema,
-    z2.object({ AND: z2.array(authTokenTunnelGrantSchema).min(1) }).strict(),
-    z2.object({ OR: z2.array(authTokenTunnelGrantSchema).min(1) }).strict()
-  ])
-);
-var authTokenCommonSchema = {
-  aud: z2.union([z2.string(), z2.array(z2.string())]).optional(),
-  exp: z2.number().optional(),
-  tunnelsGrants: authTokenTunnelGrantSchema.optional(),
-  iat: z2.number().optional(),
-  iss: z2.string().optional(),
-  jti: z2.string().optional(),
-  metadata: z2.object({
-    engine: z2.string().optional()
-  }).strict().optional(),
-  nbf: z2.number().optional(),
-  sub: z2.string().optional()
-};
-var authTokenSchema = z2.union([
-  z2.object({
-    type: z2.literal("auth"),
-    userId: z2.string(),
-    permissions: authTokenPermissionsSchema.nullable(),
-    ...authTokenCommonSchema
-  }).strict(),
-  z2.object({
-    type: z2.literal("pat"),
-    tokendpoint: z2.string().optional(),
-    token_endpoint: z2.string().optional(),
-    ...authTokenCommonSchema
-  }).strict(),
-  z2.object({
-    type: z2.literal("app"),
-    clientId: z2.string(),
-    permissions: authTokenPermissionsSchema.nullable(),
-    ...authTokenCommonSchema
-  }).strict()
-]);
-var tokenSchema = authTokenSchema;
-var createAuthTokenParamsSchema = z2.object({
-  expires_in: z2.number().int().min(1).max(3600).default(60),
-  scopes: authTokenScopesSchema.optional(),
-  tunnelsGrants: authTokenTunnelGrantSchema.optional(),
-  metadata: z2.unknown().optional()
-  // Additional metadata
-}).strict().superRefine((params, ctx) => {
-  if (params.scopes !== void 0 && params.tunnelsGrants !== void 0) {
-    ctx.addIssue({
-      code: z2.ZodIssueCode.custom,
-      message: "Use either scopes or tunnelsGrants, not both.",
-      path: ["tunnelsGrants"]
-    });
-  }
-  if (params.scopes === void 0 && params.tunnelsGrants === void 0) {
-    ctx.addIssue({
-      code: z2.ZodIssueCode.custom,
-      message: "Explicit scopes or tunnelsGrants are required.",
-      path: ["scopes"]
-    });
-  }
-});
-var createAuthTokenResponseSchema = z2.object({
-  token: z2.string()
-});
-
-// src/auth-resource.ts
 import { isClientCredentials } from "@rstreamlabs/rstream";
 var RstreamAuthResource = class {
   client;
@@ -508,6 +310,7 @@ async function resolveManagedTunnelsProject(config) {
 }
 
 // src/tunnels-resource.ts
+import { tunnelSchema } from "@rstreamlabs/rstream/tunnel";
 function tunnelPathId(id) {
   const normalized = id.trim();
   if (!normalized) {
@@ -547,21 +350,21 @@ import { readEnvironment as readEnvironment2 } from "@rstreamlabs/rstream";
 import { isClientCredentials as isClientCredentials2 } from "@rstreamlabs/rstream";
 import { isTokenCredentials as isTokenCredentials2 } from "@rstreamlabs/rstream";
 import { RstreamClient as RstreamClient2 } from "@rstreamlabs/rstream";
-import { turnCredentialsSchema } from "@rstreamlabs/rstream";
-import * as z3 from "zod";
+import { turnCredentialsSchema } from "@rstreamlabs/rstream/turn";
+import * as z from "zod";
 import crypto from "crypto";
 var defaultTURNPort = 3478;
 var defaultTURNSPort = 5349;
 var defaultTURNCredentialTTLSeconds = 10 * 60;
 var maxTURNCredentialTTLSeconds = 60 * 60;
-var turnTokenClaimsSchema = z3.object({
-  exp: z3.number().int().optional(),
-  iat: z3.number().int().optional(),
-  token_endpoint: z3.string().regex(/^[0-9a-f]{8}$/i).optional(),
-  tokendpoint: z3.string().regex(/^[0-9a-f]{8}$/i).optional(),
-  type: z3.enum(["app", "auth", "pat"])
+var turnTokenClaimsSchema = z.object({
+  exp: z.number().int().optional(),
+  iat: z.number().int().optional(),
+  token_endpoint: z.string().regex(/^[0-9a-f]{8}$/i).optional(),
+  tokendpoint: z.string().regex(/^[0-9a-f]{8}$/i).optional(),
+  type: z.enum(["app", "auth", "pat"])
 });
-var turnCredentialModeSchema = z3.enum(["api", "app", "pat"]);
+var turnCredentialModeSchema = z.enum(["api", "app", "pat"]);
 function normalizeOptionalString2(value) {
   const normalized = value?.trim();
   return normalized ? normalized : void 0;
@@ -1149,6 +952,7 @@ function normalizeOptionalString3(value) {
 }
 
 // src/watch.ts
+import { authTokenSchema } from "@rstreamlabs/rstream/auth-token";
 import jwt from "jsonwebtoken";
 var maxWatchTokenLifetimeSeconds = 3600;
 var watchTokenIssuedAtSkewSeconds = 300;
@@ -1315,7 +1119,7 @@ var Watch = class {
 };
 
 // src/webtty.ts
-import * as z4 from "zod";
+import * as z2 from "zod";
 var osFamilies = [
   "linux",
   "macos",
@@ -1324,25 +1128,25 @@ var osFamilies = [
   "openbsd",
   "freebsd"
 ];
-var webttyServerSchema = z4.object({
-  tunnel_id: z4.string(),
-  host: z4.string(),
-  token_auth: z4.boolean(),
-  os_family: z4.enum(osFamilies).optional(),
-  arch: z4.string().optional(),
-  os_id: z4.string().optional(),
+var webttyServerSchema = z2.object({
+  tunnel_id: z2.string(),
+  host: z2.string(),
+  token_auth: z2.boolean(),
+  os_family: z2.enum(osFamilies).optional(),
+  arch: z2.string().optional(),
+  os_id: z2.string().optional(),
   // /etc/os-release::ID (ubuntu, debian, rocky, etc.)
-  os_version_id: z4.string().optional(),
+  os_version_id: z2.string().optional(),
   // /etc/os-release::VERSION_ID (24.04, 22.04, 11, 10.0.19045, ...)
-  os_version_codename: z4.string().optional(),
+  os_version_codename: z2.string().optional(),
   // /etc/os-release::VERSION_CODENAME (jammy, noble...)
-  os_pretty_name: z4.string().optional(),
+  os_pretty_name: z2.string().optional(),
   // /etc/os-release::PRETTY_NAME
-  kernel_release: z4.string().optional(),
+  kernel_release: z2.string().optional(),
   // uname -r
-  hostname: z4.string().optional(),
+  hostname: z2.string().optional(),
   // uname -n
-  labels: z4.record(z4.string(), z4.string().optional()).optional()
+  labels: z2.record(z2.string(), z2.string().optional()).optional()
 });
 function parser(tunnel) {
   if (tunnel.status !== "online") return null;
@@ -1394,18 +1198,11 @@ export {
   RstreamWebhookResource as RstreamWebhookRessource,
   RstreamTunnelsClient as Tunnels,
   Watch,
-  authTokenPermissionsSchema,
-  authTokenSchema,
-  authTokenScopesSchema,
-  authTokenTunnelGrantSchema,
-  authTokenTunnelsScopesSchema,
   clientFilterSchema,
   clientSchema,
   createAPITURNCredentials,
   createAPPTURNCredentials,
   createAuthTokenFromClientCredentials,
-  createAuthTokenParamsSchema,
-  createAuthTokenResponseSchema,
   createPATTURNCredentials,
   createTURNCredentials,
   engineOpenApiDocument,
@@ -1426,9 +1223,7 @@ export {
   streamEndpointSchema,
   streamSummarySchema,
   streamTLSInfoSchema,
-  tokenSchema,
   tunnelFilterSchema,
-  tunnelSchema,
   turnCredentialModeSchema,
   webhookEventsSchema,
   webttyServerSchema,

package/dist/openapi.js

@@ -74,44 +74,9 @@ var listClientsParamsSchema = z.object({
 var listClientsResponseSchema = z.array(clientSchema);
 
 // src/tunnel.ts
+var import_tunnel = require("@rstreamlabs/rstream/tunnel");
 var z2 = __toESM(require("zod"));
-var tunnelSchema = z2.object({
-  // common properties
-  client_id: z2.string(),
-  user_id: z2.string().optional(),
-  workspace_id: z2.string().optional(),
-  project_id: z2.string().optional(),
-  cluster_id: z2.string().optional(),
-  plan: z2.string().optional(),
-  provider: z2.string().optional(),
-  region: z2.string().optional(),
-  status: z2.enum(["online", "offline"]),
-  // tunnel properties
-  id: z2.string(),
-  creation_date: z2.union([z2.string().datetime(), z2.date()]).optional(),
-  name: z2.string().optional(),
-  type: z2.enum(["bytestream", "datagram"]).optional(),
-  publish: z2.boolean().optional(),
-  protocol: z2.enum(["tls", "dtls", "quic", "http"]).optional(),
-  labels: z2.record(z2.string(), z2.string()).optional(),
-  geo_ip: z2.array(z2.string()).optional(),
-  trusted_ips: z2.array(z2.string()).optional(),
-  host: z2.string().optional(),
-  hostname: z2.string().optional(),
-  port: z2.number().int().min(1).max(65535).optional(),
-  tls_mode: z2.enum(["passthrough", "terminated"]).optional(),
-  tls_alpns: z2.array(z2.string()).optional(),
-  tls_min_version: z2.string().optional(),
-  tls_ciphers: z2.array(z2.string()).optional(),
-  mtls_auth: z2.boolean().optional(),
-  http_version: z2.enum(["http/1.1", "h2", "h2c", "h3"]).optional(),
-  http_use_tls: z2.boolean().optional(),
-  upstream_tls: z2.boolean().optional(),
-  token_auth: z2.boolean().optional(),
-  rstream_auth: z2.boolean().optional(),
-  challenge_mode: z2.boolean().optional()
-});
-var tunnelFilterSchema = tunnelSchema.pick({
+var tunnelFilterSchema = import_tunnel.tunnelSchema.pick({
   id: true,
   name: true,
   type: true,
@@ -128,7 +93,10 @@ var listTunnelsParamsSchema = z2.object({
   limit: z2.number().int().min(1).optional(),
   filters: tunnelFilterSchema.optional()
 });
-var listTunnelsResponseSchema = z2.array(tunnelSchema);
+var listTunnelsResponseSchema = z2.array(import_tunnel.tunnelSchema);
+
+// src/openapi.ts
+var import_tunnel5 = require("@rstreamlabs/rstream/tunnel");
 
 // src/stream.ts
 var z3 = __toESM(require("zod"));
@@ -334,12 +302,13 @@ var streamSummarySchema = z3.object({
 });
 
 // src/event.ts
+var import_tunnel2 = require("@rstreamlabs/rstream/tunnel");
 var z4 = __toESM(require("zod"));
 var isoDateTimeSchema2 = z4.string().datetime({ offset: true });
 var initialStateSchema = z4.object({
   snapshot_at: isoDateTimeSchema2,
   clients: z4.array(clientSchema),
-  tunnels: z4.array(tunnelSchema)
+  tunnels: z4.array(import_tunnel2.tunnelSchema)
 });
 var eventBaseSchema = z4.object({
   id: z4.string().optional(),
@@ -373,15 +342,15 @@ var commonEventsSchema = [
   }),
   withEventBase({
     type: z4.literal("tunnel.created"),
-    object: tunnelSchema
+    object: import_tunnel2.tunnelSchema
   }),
   withEventBase({
     type: z4.literal("tunnel.updated"),
-    object: tunnelSchema
+    object: import_tunnel2.tunnelSchema
   }),
   withEventBase({
     type: z4.literal("tunnel.deleted"),
-    object: tunnelSchema
+    object: import_tunnel2.tunnelSchema
   })
 ];
 var wsEventsSchema = z4.union([
@@ -607,7 +576,7 @@ var engineOpenApiDocument = {
       Event: jsonSchemaFor(wsEventsSchema),
       ListClientsParams: jsonSchemaFor(listClientsParamsSchema),
       ListTunnelsParams: jsonSchemaFor(listTunnelsParamsSchema),
-      TunnelListItem: jsonSchemaFor(tunnelSchema),
+      TunnelListItem: jsonSchemaFor(import_tunnel5.tunnelSchema),
       WatchParams: jsonSchemaFor(watchParamsSchema)
     }
   },

package/dist/openapi.mjs

@@ -1,7 +1,7 @@
 import {
   engineOpenApiDocument,
   engineOpenApiJson
-} from "./chunk-NHUJ3FYM.mjs";
+} from "./chunk-UUZYVELQ.mjs";
 export {
   engineOpenApiDocument,
   engineOpenApiJson

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rstreamlabs/tunnels",
-  "version": "1.0.11",
+  "version": "2.0.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": "2.1.4",
+    "@rstreamlabs/rstream": "2.1.5",
     "@types/jsonwebtoken": "^9.0.10",
     "jsonwebtoken": "^9.0.3",
     "zod": "^4.3.6"