@s2-dev/streamstore 0.12.0 → 0.13.2

package/src/funcs/recordsAppend.ts

@@ -41,8 +41,7 @@ export function recordsAppend(
     components.AppendAck,
     | errors.ErrorResponse
     | errors.AppendConditionFailed
-    | errors.RetryableError
-    | errors.RetryableError
+    | errors.ErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -69,8 +68,7 @@ async function $do(
       components.AppendAck,
       | errors.ErrorResponse
       | errors.AppendConditionFailed
-      | errors.RetryableError
-      | errors.RetryableError
+      | errors.ErrorResponse
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -110,6 +108,10 @@ async function $do(
   const headers = new Headers(compactMap({
     "Content-Type": "application/json",
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
     "s2-format": encodeSimple("s2-format", payload["s2-format"], {
       explode: false,
       charEncoding: "none",
@@ -150,19 +152,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: [
-      "400",
-      "401",
-      "404",
-      "409",
-      "412",
-      "499",
-      "4XX",
-      "500",
-      "503",
-      "504",
-      "5XX",
-    ],
+    errorCodes: ["400", "401", "404", "409", "412", "4XX", "500", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -179,8 +169,7 @@ async function $do(
     components.AppendAck,
     | errors.ErrorResponse
     | errors.AppendConditionFailed
-    | errors.RetryableError
-    | errors.RetryableError
+    | errors.ErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -192,8 +181,7 @@ async function $do(
     M.json(200, components.AppendAck$inboundSchema),
     M.jsonErr([400, 401, 404, 409], errors.ErrorResponse$inboundSchema),
     M.jsonErr(412, errors.AppendConditionFailed$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
+    M.jsonErr(500, errors.ErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/funcs/recordsCheckTail.ts

@@ -40,8 +40,7 @@ export function recordsCheckTail(
   Result<
     components.TailResponse,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
+    | errors.ErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -67,8 +66,7 @@ async function $do(
     Result<
       components.TailResponse,
       | errors.ErrorResponse
-      | errors.RetryableError
-      | errors.RetryableError
+      | errors.ErrorResponse
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -107,6 +105,10 @@ async function $do(
 
   const headers = new Headers(compactMap({
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
   }));
 
   const secConfig = await extractSecurity(client._options.accessToken);
@@ -143,18 +145,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: [
-      "400",
-      "401",
-      "404",
-      "409",
-      "499",
-      "4XX",
-      "500",
-      "503",
-      "504",
-      "5XX",
-    ],
+    errorCodes: ["400", "401", "404", "409", "4XX", "500", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -170,8 +161,7 @@ async function $do(
   const [result] = await M.match<
     components.TailResponse,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
+    | errors.ErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -182,8 +172,7 @@ async function $do(
   >(
     M.json(200, components.TailResponse$inboundSchema),
     M.jsonErr([400, 401, 404, 409], errors.ErrorResponse$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
+    M.jsonErr(500, errors.ErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/funcs/recordsRead.ts

@@ -45,8 +45,7 @@ export function recordsRead(
     operations.ReadResponse,
     | errors.ErrorResponse
     | errors.TailResponse
-    | errors.RetryableError
-    | errors.RetryableError
+    | errors.ErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -73,8 +72,7 @@ async function $do(
       operations.ReadResponse,
       | errors.ErrorResponse
       | errors.TailResponse
-      | errors.RetryableError
-      | errors.RetryableError
+      | errors.ErrorResponse
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -122,6 +120,10 @@ async function $do(
   const headers = new Headers(compactMap({
     Accept: options?.acceptHeaderOverride
       || "application/json;q=1, text/event-stream;q=0",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
     "s2-format": encodeSimple("s2-format", payload["s2-format"], {
       explode: false,
       charEncoding: "none",
@@ -163,19 +165,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: [
-      "400",
-      "401",
-      "404",
-      "409",
-      "416",
-      "499",
-      "4XX",
-      "500",
-      "503",
-      "504",
-      "5XX",
-    ],
+    errorCodes: ["400", "401", "404", "409", "416", "4XX", "500", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -192,8 +182,7 @@ async function $do(
     operations.ReadResponse,
     | errors.ErrorResponse
     | errors.TailResponse
-    | errors.RetryableError
-    | errors.RetryableError
+    | errors.ErrorResponse
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -206,8 +195,7 @@ async function $do(
     M.sse(200, operations.ReadResponse$inboundSchema),
     M.jsonErr([400, 401, 404, 409], errors.ErrorResponse$inboundSchema),
     M.jsonErr(416, errors.TailResponse$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
+    M.jsonErr(500, errors.ErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/funcs/streamsCreateOrReconfigureStream.ts

@@ -37,8 +37,6 @@ export function streamsCreateOrReconfigureStream(
   Result<
     components.StreamInfo | undefined,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -64,8 +62,6 @@ async function $do(
     Result<
       components.StreamInfo | undefined,
       | errors.ErrorResponse
-      | errors.RetryableError
-      | errors.RetryableError
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -108,6 +104,10 @@ async function $do(
   const headers = new Headers(compactMap({
     "Content-Type": "application/json",
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
     "s2-request-token": encodeSimple(
       "s2-request-token",
       payload["s2-request-token"],
@@ -149,18 +149,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: [
-      "400",
-      "403",
-      "404",
-      "409",
-      "499",
-      "4XX",
-      "500",
-      "503",
-      "504",
-      "5XX",
-    ],
+    errorCodes: ["400", "403", "404", "409", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -176,8 +165,6 @@ async function $do(
   const [result] = await M.match<
     components.StreamInfo | undefined,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -189,8 +176,6 @@ async function $do(
     M.json(201, components.StreamInfo$inboundSchema.optional()),
     M.nil(204, components.StreamInfo$inboundSchema.optional()),
     M.jsonErr([400, 403, 404, 409], errors.ErrorResponse$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/funcs/streamsCreateStream.ts

@@ -3,7 +3,7 @@
  */
 
 import { S2Core } from "../core.js";
-import { encodeJSON } from "../lib/encodings.js";
+import { encodeJSON, encodeSimple } from "../lib/encodings.js";
 import * as M from "../lib/matchers.js";
 import { compactMap } from "../lib/primitives.js";
 import { safeParse } from "../lib/schemas.js";
@@ -22,6 +22,7 @@ import {
 import * as errors from "../models/errors/index.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import { CreateStreamServerList } from "../models/operations/createstream.js";
+import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
 
@@ -30,14 +31,12 @@ import { Result } from "../types/fp.js";
  */
 export function streamsCreateStream(
   client: S2Core,
-  request: components.CreateStreamRequest,
+  request: operations.CreateStreamRequest,
   options?: RequestOptions,
 ): APIPromise<
   Result<
     components.StreamInfo,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -56,15 +55,13 @@ export function streamsCreateStream(
 
 async function $do(
   client: S2Core,
-  request: components.CreateStreamRequest,
+  request: operations.CreateStreamRequest,
   options?: RequestOptions,
 ): Promise<
   [
     Result<
       components.StreamInfo,
       | errors.ErrorResponse
-      | errors.RetryableError
-      | errors.RetryableError
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -78,14 +75,16 @@ async function $do(
 > {
   const parsed = safeParse(
     request,
-    (value) => components.CreateStreamRequest$outboundSchema.parse(value),
+    (value) => operations.CreateStreamRequest$outboundSchema.parse(value),
     "Input validation failed",
   );
   if (!parsed.ok) {
     return [parsed, { status: "invalid" }];
   }
   const payload = parsed.value;
-  const body = encodeJSON("body", payload, { explode: true });
+  const body = encodeJSON("body", payload.CreateStreamRequest, {
+    explode: true,
+  });
 
   const baseURL = options?.serverURL
     || pathToFunc(CreateStreamServerList[0], { charEncoding: "percent" })({
@@ -97,6 +96,10 @@ async function $do(
   const headers = new Headers(compactMap({
     "Content-Type": "application/json",
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
   }));
 
   const secConfig = await extractSecurity(client._options.accessToken);
@@ -133,18 +136,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: [
-      "400",
-      "403",
-      "404",
-      "409",
-      "499",
-      "4XX",
-      "500",
-      "503",
-      "504",
-      "5XX",
-    ],
+    errorCodes: ["400", "403", "404", "409", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -160,8 +152,6 @@ async function $do(
   const [result] = await M.match<
     components.StreamInfo,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -172,8 +162,6 @@ async function $do(
   >(
     M.json(201, components.StreamInfo$inboundSchema),
     M.jsonErr([400, 403, 404, 409], errors.ErrorResponse$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/funcs/streamsDeleteStream.ts

@@ -37,9 +37,6 @@ export function streamsDeleteStream(
   Result<
     void,
     | errors.ErrorResponse
-    | errors.NotFoundError
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -65,9 +62,6 @@ async function $do(
     Result<
       void,
       | errors.ErrorResponse
-      | errors.NotFoundError
-      | errors.RetryableError
-      | errors.RetryableError
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -106,6 +100,10 @@ async function $do(
 
   const headers = new Headers(compactMap({
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
   }));
 
   const secConfig = await extractSecurity(client._options.accessToken);
@@ -142,7 +140,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["400", "403", "404", "499", "4XX", "500", "503", "504", "5XX"],
+    errorCodes: ["400", "403", "404", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -158,9 +156,6 @@ async function $do(
   const [result] = await M.match<
     void,
     | errors.ErrorResponse
-    | errors.NotFoundError
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -170,10 +165,7 @@ async function $do(
     | ConnectionError
   >(
     M.nil(202, z.void()),
-    M.jsonErr([400, 403], errors.ErrorResponse$inboundSchema),
-    M.jsonErr(404, errors.NotFoundError$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
+    M.jsonErr([400, 403, 404], errors.ErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/funcs/streamsGetStreamConfig.ts

@@ -37,8 +37,6 @@ export function streamsGetStreamConfig(
   Result<
     components.StreamConfig,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -64,8 +62,6 @@ async function $do(
     Result<
       components.StreamConfig,
       | errors.ErrorResponse
-      | errors.RetryableError
-      | errors.RetryableError
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -104,6 +100,10 @@ async function $do(
 
   const headers = new Headers(compactMap({
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
   }));
 
   const secConfig = await extractSecurity(client._options.accessToken);
@@ -140,18 +140,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: [
-      "400",
-      "403",
-      "404",
-      "409",
-      "499",
-      "4XX",
-      "500",
-      "503",
-      "504",
-      "5XX",
-    ],
+    errorCodes: ["400", "403", "404", "409", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -167,8 +156,6 @@ async function $do(
   const [result] = await M.match<
     components.StreamConfig,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -179,8 +166,6 @@ async function $do(
   >(
     M.json(200, components.StreamConfig$inboundSchema),
     M.jsonErr([400, 403, 404, 409], errors.ErrorResponse$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/funcs/streamsListStreams.ts

@@ -4,7 +4,7 @@
 
 import { JsonValue, query as jpQuery } from "jsonpath-rfc9535";
 import { S2Core } from "../core.js";
-import { encodeFormQuery } from "../lib/encodings.js";
+import { encodeFormQuery, encodeSimple } from "../lib/encodings.js";
 import * as M from "../lib/matchers.js";
 import { compactMap } from "../lib/primitives.js";
 import { safeParse } from "../lib/schemas.js";
@@ -44,8 +44,6 @@ export function streamsListStreams(
     Result<
       operations.ListStreamsResponse,
       | errors.ErrorResponse
-      | errors.RetryableError
-      | errors.RetryableError
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -74,8 +72,6 @@ async function $do(
       Result<
         operations.ListStreamsResponse,
         | errors.ErrorResponse
-        | errors.RetryableError
-        | errors.RetryableError
         | APIError
         | SDKValidationError
         | UnexpectedClientError
@@ -115,6 +111,10 @@ async function $do(
 
   const headers = new Headers(compactMap({
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
   }));
 
   const secConfig = await extractSecurity(client._options.accessToken);
@@ -152,7 +152,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: ["400", "403", "404", "499", "4XX", "500", "503", "504", "5XX"],
+    errorCodes: ["400", "403", "404", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -168,8 +168,6 @@ async function $do(
   const [result, raw] = await M.match<
     operations.ListStreamsResponse,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -182,8 +180,6 @@ async function $do(
       key: "Result",
     }),
     M.jsonErr([400, 403, 404], errors.ErrorResponse$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });
@@ -202,8 +198,6 @@ async function $do(
       Result<
         operations.ListStreamsResponse,
         | errors.ErrorResponse
-        | errors.RetryableError
-        | errors.RetryableError
         | APIError
         | SDKValidationError
         | UnexpectedClientError

package/src/funcs/streamsReconfigureStream.ts

@@ -37,8 +37,6 @@ export function streamsReconfigureStream(
   Result<
     components.StreamConfig,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -64,8 +62,6 @@ async function $do(
     Result<
       components.StreamConfig,
       | errors.ErrorResponse
-      | errors.RetryableError
-      | errors.RetryableError
       | APIError
       | SDKValidationError
       | UnexpectedClientError
@@ -107,6 +103,10 @@ async function $do(
   const headers = new Headers(compactMap({
     "Content-Type": "application/json",
     Accept: "application/json",
+    "s2-basin": encodeSimple("s2-basin", payload["s2-basin"], {
+      explode: false,
+      charEncoding: "none",
+    }),
   }));
 
   const secConfig = await extractSecurity(client._options.accessToken);
@@ -143,18 +143,7 @@ async function $do(
 
   const doResult = await client._do(req, {
     context,
-    errorCodes: [
-      "400",
-      "403",
-      "404",
-      "409",
-      "499",
-      "4XX",
-      "500",
-      "503",
-      "504",
-      "5XX",
-    ],
+    errorCodes: ["400", "403", "404", "409", "4XX", "5XX"],
     retryConfig: context.retryConfig,
     retryCodes: context.retryCodes,
   });
@@ -170,8 +159,6 @@ async function $do(
   const [result] = await M.match<
     components.StreamConfig,
     | errors.ErrorResponse
-    | errors.RetryableError
-    | errors.RetryableError
     | APIError
     | SDKValidationError
     | UnexpectedClientError
@@ -182,8 +169,6 @@ async function $do(
   >(
     M.json(200, components.StreamConfig$inboundSchema),
     M.jsonErr([400, 403, 404, 409], errors.ErrorResponse$inboundSchema),
-    M.jsonErr(499, errors.RetryableError$inboundSchema),
-    M.jsonErr([500, 503, 504], errors.RetryableError$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
   )(response, { extraFields: responseFields });

package/src/hooks/basin.ts

@@ -0,0 +1,39 @@
+import {
+    BeforeCreateRequestContext,
+    BeforeCreateRequestHook,
+} from "./types.js";
+import { RequestInput } from "../lib/http.js";
+
+export class AddBasinToUrlHook implements BeforeCreateRequestHook {
+    beforeCreateRequest(
+        _hookCtx: BeforeCreateRequestContext,
+        input: RequestInput,
+    ): RequestInput {
+        const headers = input.options?.headers;
+        if (!headers) return input;
+
+        const basinHeader = headers instanceof Headers 
+            ? headers.get("s2-basin")
+            : (headers as Record<string, string>)["s2-basin"];
+
+        if (!basinHeader) return input;
+
+        const url = new URL(input.url);
+        if (!url.hostname.includes('.b.aws.s2.dev')) return input;
+
+        url.hostname = `${basinHeader}.b.aws.s2.dev`;
+        
+        const remainingHeaders = headers instanceof Headers
+            ? Object.fromEntries([...headers.entries()].filter(([key]) => key !== 's2-basin'))
+            : Object.fromEntries(Object.entries(headers).filter(([key]) => key !== 's2-basin'));
+
+        return {
+            ...input,
+            url,
+            options: {
+                ...input.options,
+                headers: remainingHeaders,
+            },
+        };
+    }
+}