@s2-dev/streamstore 0.12.0 → 0.13.1

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,
+            },
+        };
+    }
+}

package/src/hooks/registration.ts

@@ -1,4 +1,5 @@
 // import { CompressionHook } from "./compression.js";
+import { AddBasinToUrlHook } from "./basin.js";
 import { Hooks } from "./types.js";
 
 /*
@@ -7,10 +8,10 @@ import { Hooks } from "./types.js";
  * in this file or in separate files in the hooks folder.
  */
 
-// @ts-expect-error remove this line when you add your first hook and hooks is used
 export function initHooks(hooks: Hooks) {
   // Add hooks by calling hooks.register{ClientInit/BeforeCreateRequest/BeforeRequest/AfterSuccess/AfterError}Hook
   // with an instance of a hook that implements that specific Hook interface
   // Hooks are registered per SDK instance, and are valid for the lifetime of the SDK instance
   // hooks.registerBeforeCreateRequestHook(new CompressionHook());
+  hooks.registerBeforeCreateRequestHook(new AddBasinToUrlHook());  
 }

package/src/lib/config.ts

@@ -54,8 +54,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "0.12.0",
-  genVersion: "2.604.2",
+  sdkVersion: "0.13.1",
+  genVersion: "2.605.0",
   userAgent:
-    "speakeasy-sdk/typescript 0.12.0 2.604.2 1.0.0 @s2-dev/streamstore",
+    "speakeasy-sdk/typescript 0.13.1 2.605.0 1.0.0 @s2-dev/streamstore",
 } as const;

package/src/mcp-server/cli/start/impl.ts

@@ -50,7 +50,7 @@ async function startStdio(flags: StartCommandFlags) {
     logger,
     allowedTools: flags.tool,
     scopes: flags.scope,
-    ...{ accessToken: flags["access-token"] },
+    ...{ accessToken: flags["access-token"] ?? "" },
     serverURL: flags["server-url"],
     serverIdx: flags["server-index"],
   });
@@ -71,7 +71,7 @@ async function startSSE(flags: StartCommandFlags) {
     logger,
     allowedTools: flags.tool,
     scopes: flags.scope,
-    ...{ accessToken: flags["access-token"] },
+    ...{ accessToken: flags["access-token"] ?? "" },
     serverURL: flags["server-url"],
     serverIdx: flags["server-index"],
   });

package/src/mcp-server/mcp-server.ts

@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "0.12.0",
+    currentVersion: "0.13.1",
   },
 });
 

package/src/mcp-server/server.ts

@@ -42,7 +42,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "S2",
-    version: "0.12.0",
+    version: "0.13.1",
   });
 
   const client = new S2Core({

package/src/mcp-server/tools/accessTokensIssueAccessToken.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$accessTokensIssueAccessToken: ToolDefinition<typeof args> = {
   name: "access-tokens-issue-access-token",
   description: `Issue a new access token.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await accessTokensIssueAccessToken(

package/src/mcp-server/tools/accessTokensListAccessTokens.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$accessTokensListAccessTokens: ToolDefinition<typeof args> = {
   name: "access-tokens-list-access-tokens",
   description: `List access tokens.`,
-  scopes: ["read"],
+  scopes: ["read", "read", "read"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await accessTokensListAccessTokens(

package/src/mcp-server/tools/accessTokensRevokeAccessToken.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$accessTokensRevokeAccessToken: ToolDefinition<typeof args> = {
   name: "access-tokens-revoke-access-token",
   description: `Revoke an access token.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await accessTokensRevokeAccessToken(

package/src/mcp-server/tools/basinsCreateBasin.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$basinsCreateBasin: ToolDefinition<typeof args> = {
   name: "basins-create-basin",
   description: `Create a basin.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await basinsCreateBasin(

package/src/mcp-server/tools/basinsCreateOrReconfigureBasin.ts

@@ -14,7 +14,7 @@ export const tool$basinsCreateOrReconfigureBasin: ToolDefinition<typeof args> =
   {
     name: "basins-create-or-reconfigure-basin",
     description: `Create or reconfigure a basin.`,
-    scopes: ["write"],
+    scopes: ["write", "write", "write"],
     args,
     tool: async (client, args, ctx) => {
       const [result, apiCall] = await basinsCreateOrReconfigureBasin(

package/src/mcp-server/tools/basinsDeleteBasin.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$basinsDeleteBasin: ToolDefinition<typeof args> = {
   name: "basins-delete-basin",
   description: `Delete a basin.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await basinsDeleteBasin(

package/src/mcp-server/tools/basinsGetBasinConfig.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$basinsGetBasinConfig: ToolDefinition<typeof args> = {
   name: "basins-get-basin-config",
   description: `Get basin config.`,
-  scopes: ["read"],
+  scopes: ["read", "read", "read"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await basinsGetBasinConfig(

package/src/mcp-server/tools/basinsListBasins.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$basinsListBasins: ToolDefinition<typeof args> = {
   name: "basins-list-basins",
   description: `List basins.`,
-  scopes: ["read"],
+  scopes: ["read", "read", "read"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await basinsListBasins(

package/src/mcp-server/tools/basinsReconfigureBasin.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$basinsReconfigureBasin: ToolDefinition<typeof args> = {
   name: "basins-reconfigure-basin",
   description: `Reconfigure a basin.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await basinsReconfigureBasin(

package/src/mcp-server/tools/recordsAppend.ts

@@ -15,7 +15,7 @@ export const tool$recordsAppend: ToolDefinition<typeof args> = {
   description: `Append records.
 
 Append a batch of records to a stream.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await recordsAppend(

package/src/mcp-server/tools/recordsCheckTail.ts

@@ -15,7 +15,7 @@ export const tool$recordsCheckTail: ToolDefinition<typeof args> = {
   description: `Check the tail.
 
 Check the tail of a stream.`,
-  scopes: ["read"],
+  scopes: ["read", "read", "read"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await recordsCheckTail(

package/src/mcp-server/tools/recordsRead.ts

@@ -15,7 +15,7 @@ export const tool$recordsRead: ToolDefinition<typeof args> = {
   description: `Retrieve records.
 
 Retrieve a batch of records, or set \`Accept: text/event-stream\` to stream using server-sent events.`,
-  scopes: ["read"],
+  scopes: ["read", "read", "read"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await recordsRead(

package/src/mcp-server/tools/streamsCreateOrReconfigureStream.ts

@@ -15,7 +15,7 @@ export const tool$streamsCreateOrReconfigureStream: ToolDefinition<
 > = {
   name: "streams-create-or-reconfigure-stream",
   description: `Create or reconfigure a stream.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await streamsCreateOrReconfigureStream(

package/src/mcp-server/tools/streamsCreateStream.ts

@@ -3,17 +3,17 @@
  */
 
 import { streamsCreateStream } from "../../funcs/streamsCreateStream.js";
-import * as components from "../../models/components/index.js";
+import * as operations from "../../models/operations/index.js";
 import { formatResult, ToolDefinition } from "../tools.js";
 
 const args = {
-  request: components.CreateStreamRequest$inboundSchema,
+  request: operations.CreateStreamRequest$inboundSchema,
 };
 
 export const tool$streamsCreateStream: ToolDefinition<typeof args> = {
   name: "streams-create-stream",
   description: `Create a stream.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await streamsCreateStream(

package/src/mcp-server/tools/streamsDeleteStream.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$streamsDeleteStream: ToolDefinition<typeof args> = {
   name: "streams-delete-stream",
   description: `Delete a stream.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await streamsDeleteStream(

package/src/mcp-server/tools/streamsGetStreamConfig.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$streamsGetStreamConfig: ToolDefinition<typeof args> = {
   name: "streams-get-stream-config",
   description: `Get stream configuration.`,
-  scopes: ["read"],
+  scopes: ["read", "read", "read"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await streamsGetStreamConfig(

package/src/mcp-server/tools/streamsListStreams.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$streamsListStreams: ToolDefinition<typeof args> = {
   name: "streams-list-streams",
   description: `List streams.`,
-  scopes: ["read"],
+  scopes: ["read", "read", "read"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await streamsListStreams(

package/src/mcp-server/tools/streamsReconfigureStream.ts

@@ -13,7 +13,7 @@ const args = {
 export const tool$streamsReconfigureStream: ToolDefinition<typeof args> = {
   name: "streams-reconfigure-stream",
   description: `Reconfigure a stream.`,
-  scopes: ["write"],
+  scopes: ["write", "write", "write"],
   args,
   tool: async (client, args, ctx) => {
     const [result, apiCall] = await streamsReconfigureStream(

package/src/models/errors/errorresponse.ts

@@ -7,23 +7,22 @@ import * as z from "zod";
 export type ErrorResponseData = {
   code?: string | null | undefined;
   message: string;
-  error: string;
 };
 
 export class ErrorResponse extends Error {
   code?: string | null | undefined;
-  error: string;
 
   /** The original data that was passed to this error instance. */
   data$: ErrorResponseData;
 
   constructor(err: ErrorResponseData) {
-    const message = err.error || "API error occurred";
+    const message = "message" in err && typeof err.message === "string"
+      ? err.message
+      : `API error occurred: ${JSON.stringify(err)}`;
     super(message);
     this.data$ = err;
 
     if (err.code != null) this.code = err.code;
-    this.error = err.error;
 
     this.name = "ErrorResponse";
   }
@@ -37,7 +36,6 @@ export const ErrorResponse$inboundSchema: z.ZodType<
 > = z.object({
   code: z.nullable(z.string()).optional(),
   message: z.string(),
-  error: z.string(),
 })
   .transform((v) => {
     return new ErrorResponse(v);
@@ -47,7 +45,6 @@ export const ErrorResponse$inboundSchema: z.ZodType<
 export type ErrorResponse$Outbound = {
   code?: string | null | undefined;
   message: string;
-  error: string;
 };
 
 /** @internal */
@@ -60,7 +57,6 @@ export const ErrorResponse$outboundSchema: z.ZodType<
   .pipe(z.object({
     code: z.nullable(z.string()).optional(),
     message: z.string(),
-    error: z.string(),
   }));
 
 /**

package/src/models/errors/index.ts

@@ -6,7 +6,5 @@ export * from "./apierror.js";
 export * from "./appendconditionfailed.js";
 export * from "./errorresponse.js";
 export * from "./httpclienterrors.js";
-export * from "./notfounderror.js";
-export * from "./retryableerror.js";
 export * from "./sdkvalidationerror.js";
 export * from "./tailresponse.js";