@s2-dev/streamstore 0.2.7 → 0.2.10

package/src/funcs/streamAppend.ts

@@ -10,7 +10,6 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import * as components from "../models/components/index.js";
 import { APIError } from "../models/errors/apierror.js";
 import {
   ConnectionError,
@@ -37,7 +36,7 @@ export async function streamAppend(
   options?: RequestOptions,
 ): Promise<
   Result<
-    components.AppendOutput,
+    operations.AppendResponse,
     | errors.ErrorResponse
     | errors.ErrorResponse
     | APIError
@@ -130,7 +129,7 @@ export async function streamAppend(
   };
 
   const [result] = await M.match<
-    components.AppendOutput,
+    operations.AppendResponse,
     | errors.ErrorResponse
     | errors.ErrorResponse
     | APIError
@@ -141,12 +140,14 @@ export async function streamAppend(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, components.AppendOutput$inboundSchema),
+    M.json(200, operations.AppendResponse$inboundSchema, {
+      key: "AppendOutput",
+    }),
     M.jsonErr([400, 401, 404], errors.ErrorResponse$inboundSchema),
     M.jsonErr(500, errors.ErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return result;
   }

package/src/funcs/streamCheckTail.ts

@@ -10,7 +10,6 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import * as components from "../models/components/index.js";
 import { APIError } from "../models/errors/apierror.js";
 import {
   ConnectionError,
@@ -37,7 +36,7 @@ export async function streamCheckTail(
   options?: RequestOptions,
 ): Promise<
   Result<
-    components.CheckTailResponse,
+    operations.CheckTailResponse,
     | errors.ErrorResponse
     | errors.ErrorResponse
     | APIError
@@ -125,7 +124,7 @@ export async function streamCheckTail(
   };
 
   const [result] = await M.match<
-    components.CheckTailResponse,
+    operations.CheckTailResponse,
     | errors.ErrorResponse
     | errors.ErrorResponse
     | APIError
@@ -136,12 +135,14 @@ export async function streamCheckTail(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, components.CheckTailResponse$inboundSchema),
+    M.json(200, operations.CheckTailResponse$inboundSchema, {
+      key: "CheckTailResponse",
+    }),
     M.jsonErr([400, 401, 404], errors.ErrorResponse$inboundSchema),
     M.jsonErr(500, errors.ErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return result;
   }

package/src/funcs/streamRead.ts

@@ -151,13 +151,13 @@ export async function streamRead(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.ReadResponse$inboundSchema),
-    M.sse(200, operations.ReadResponse$inboundSchema),
+    M.json(200, operations.ReadResponse$inboundSchema, { key: "Output" }),
+    M.sse(200, operations.ReadResponse$inboundSchema, { key: "ReadResponse" }),
     M.jsonErr([400, 401, 404], errors.ErrorResponse$inboundSchema),
     M.jsonErr(500, errors.ErrorResponse$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return result;
   }

package/src/lib/config.ts

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

package/src/lib/matchers.ts

@@ -160,6 +160,7 @@ export type MatchedError<Matchers> = Matchers extends Matcher<any, infer E>[]
   : never;
 export type MatchFunc<T, E> = (
   response: Response,
+  request: Request,
   options?: { resultKey?: string; extraFields?: Record<string, unknown> },
 ) => Promise<[result: Result<T, E>, raw: unknown]>;
 
@@ -168,6 +169,7 @@ export function match<T, E>(
 ): MatchFunc<T, E | APIError | SDKValidationError> {
   return async function matchFunc(
     response: Response,
+    request: Request,
     options?: { resultKey?: string; extraFields?: Record<string, unknown> },
   ): Promise<
     [result: Result<T, E | APIError | SDKValidationError>, raw: unknown]
@@ -189,15 +191,14 @@ export function match<T, E>(
     }
 
     if (!matcher) {
-      const responseBody = await response.text();
+      await discardResponseBody(response);
       return [{
         ok: false,
-        error: new APIError(
-          "Unexpected API response status or content-type",
+        error: new APIError("Unexpected API response status or content-type", {
           response,
-          responseBody,
-        ),
-      }, responseBody];
+          request,
+        }),
+      }, raw];
     }
 
     const encoding = matcher.enc;
@@ -223,7 +224,7 @@ export function match<T, E>(
         raw = await discardResponseBody(response);
         break;
       case "fail":
-        raw = await response.text();
+        raw = await discardResponseBody(response);
         break;
       default:
         encoding satisfies never;
@@ -233,11 +234,7 @@ export function match<T, E>(
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new APIError(
-          "API error occurred",
-          response,
-          typeof raw === "string" ? raw : "",
-        ),
+        error: new APIError("API error occurred", { response, request }),
       }, raw];
     }
 
@@ -256,14 +253,11 @@ export function match<T, E>(
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
         [resultKey]: raw,
       };
-    } else if (matcher.hdrs) {
+    } else {
       data = {
         ...options?.extraFields,
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
-        ...(isPlainObject(raw) ? raw : null),
       };
-    } else {
-      data = raw;
     }
 
     if ("err" in matcher) {

package/src/models/components/formatoption.ts

@@ -0,0 +1,31 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { ClosedEnum } from "../../types/enums.js";
+
+export const FormatOption = {
+  Json: "json",
+  JsonBinsafe: "json-binsafe",
+} as const;
+export type FormatOption = ClosedEnum<typeof FormatOption>;
+
+/** @internal */
+export const FormatOption$inboundSchema: z.ZodNativeEnum<typeof FormatOption> =
+  z.nativeEnum(FormatOption);
+
+/** @internal */
+export const FormatOption$outboundSchema: z.ZodNativeEnum<typeof FormatOption> =
+  FormatOption$inboundSchema;
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace FormatOption$ {
+  /** @deprecated use `FormatOption$inboundSchema` instead. */
+  export const inboundSchema = FormatOption$inboundSchema;
+  /** @deprecated use `FormatOption$outboundSchema` instead. */
+  export const outboundSchema = FormatOption$outboundSchema;
+}

package/src/models/components/httpmetadata.ts

@@ -0,0 +1,87 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { remap as remap$ } from "../../lib/primitives.js";
+import { safeParse } from "../../lib/schemas.js";
+import { Result as SafeParseResult } from "../../types/fp.js";
+import { SDKValidationError } from "../errors/sdkvalidationerror.js";
+
+export type HTTPMetadata = {
+  /**
+   * Raw HTTP response; suitable for custom response parsing
+   */
+  response: Response;
+  /**
+   * Raw HTTP request; suitable for debugging
+   */
+  request: Request;
+};
+
+/** @internal */
+export const HTTPMetadata$inboundSchema: z.ZodType<
+  HTTPMetadata,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  Response: z.instanceof(Response),
+  Request: z.instanceof(Request),
+}).transform((v) => {
+  return remap$(v, {
+    "Response": "response",
+    "Request": "request",
+  });
+});
+
+/** @internal */
+export type HTTPMetadata$Outbound = {
+  Response: never;
+  Request: never;
+};
+
+/** @internal */
+export const HTTPMetadata$outboundSchema: z.ZodType<
+  HTTPMetadata$Outbound,
+  z.ZodTypeDef,
+  HTTPMetadata
+> = z.object({
+  response: z.instanceof(Response).transform(() => {
+    throw new Error("Response cannot be serialized");
+  }),
+  request: z.instanceof(Request).transform(() => {
+    throw new Error("Response cannot be serialized");
+  }),
+}).transform((v) => {
+  return remap$(v, {
+    response: "Response",
+    request: "Request",
+  });
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace HTTPMetadata$ {
+  /** @deprecated use `HTTPMetadata$inboundSchema` instead. */
+  export const inboundSchema = HTTPMetadata$inboundSchema;
+  /** @deprecated use `HTTPMetadata$outboundSchema` instead. */
+  export const outboundSchema = HTTPMetadata$outboundSchema;
+  /** @deprecated use `HTTPMetadata$Outbound` instead. */
+  export type Outbound = HTTPMetadata$Outbound;
+}
+
+export function httpMetadataToJSON(httpMetadata: HTTPMetadata): string {
+  return JSON.stringify(HTTPMetadata$outboundSchema.parse(httpMetadata));
+}
+
+export function httpMetadataFromJSON(
+  jsonString: string,
+): SafeParseResult<HTTPMetadata, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => HTTPMetadata$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'HTTPMetadata' from JSON`,
+  );
+}

package/src/models/components/index.ts

@@ -12,7 +12,9 @@ export * from "./basinstate.js";
 export * from "./checktailresponse.js";
 export * from "./createbasinrequest.js";
 export * from "./createstreamrequest.js";
+export * from "./formatoption.js";
 export * from "./header.js";
+export * from "./httpmetadata.js";
 export * from "./listbasinsresponse.js";
 export * from "./liststreamsresponse.js";
 export * from "./output.js";

package/src/models/errors/apierror.ts

@@ -3,25 +3,19 @@
  */
 
 export class APIError extends Error {
-  public readonly statusCode: number;
-  public readonly contentType: string;
-
   constructor(
     message: string,
-    public readonly rawResponse: Response,
-    public readonly body: string = "",
+    public readonly httpMeta: {
+      response: Response;
+      request: Request;
+    },
   ) {
-    const statusCode = rawResponse.status;
-    const contentType = rawResponse.headers.get("content-type") || "";
-    const bodyString = body.length > 0 ? `\n${body}` : "";
-
     super(
-      `${message}: Status ${statusCode} Content-Type ${contentType} Body ${bodyString}`,
+      `${message}: Status ${httpMeta.response.status} Content-Type ${
+        httpMeta.response.headers.get("content-type") || ""
+      }`,
     );
 
-    this.statusCode = statusCode;
-    this.contentType = contentType;
-
     this.name = "APIError";
   }
 }

package/src/models/operations/append.ts

@@ -5,7 +5,6 @@
 import * as z from "zod";
 import { remap as remap$ } from "../../lib/primitives.js";
 import { safeParse } from "../../lib/schemas.js";
-import { ClosedEnum } from "../../types/enums.js";
 import { Result as SafeParseResult } from "../../types/fp.js";
 import * as components from "../components/index.js";
 import { SDKValidationError } from "../errors/sdkvalidationerror.js";
@@ -17,19 +16,13 @@ export const AppendServerList = [
   "https://{basin}.b.aws.s2.dev/v1alpha",
 ] as const;
 
-export const Header1 = {
-  Json: "json",
-  JsonBinsafe: "json-binsafe",
-} as const;
-export type Header1 = ClosedEnum<typeof Header1>;
-
 /**
  * json: utf-8 plaintext data.
  *
  * @remarks
  * json-binsafe: base64 encoded binary data.
  */
-export type HeaderS2Format = Header1;
+export type HeaderS2Format = components.FormatOption;
 
 export type AppendRequest = {
   /**
@@ -38,7 +31,7 @@ export type AppendRequest = {
    * @remarks
    * json-binsafe: base64 encoded binary data.
    */
-  s2Format?: Header1 | undefined;
+  s2Format?: components.FormatOption | undefined;
   /**
    * Name of the stream.
    */
@@ -46,31 +39,17 @@ export type AppendRequest = {
   appendInput: components.AppendInput;
 };
 
-/** @internal */
-export const Header1$inboundSchema: z.ZodNativeEnum<typeof Header1> = z
-  .nativeEnum(Header1);
-
-/** @internal */
-export const Header1$outboundSchema: z.ZodNativeEnum<typeof Header1> =
-  Header1$inboundSchema;
-
-/**
- * @internal
- * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
- */
-export namespace Header1$ {
-  /** @deprecated use `Header1$inboundSchema` instead. */
-  export const inboundSchema = Header1$inboundSchema;
-  /** @deprecated use `Header1$outboundSchema` instead. */
-  export const outboundSchema = Header1$outboundSchema;
-}
+export type AppendResponse = {
+  httpMeta: components.HTTPMetadata;
+  appendOutput?: components.AppendOutput | undefined;
+};
 
 /** @internal */
 export const HeaderS2Format$inboundSchema: z.ZodType<
   HeaderS2Format,
   z.ZodTypeDef,
   unknown
-> = Header1$inboundSchema;
+> = components.FormatOption$inboundSchema;
 
 /** @internal */
 export type HeaderS2Format$Outbound = string;
@@ -80,7 +59,7 @@ export const HeaderS2Format$outboundSchema: z.ZodType<
   HeaderS2Format$Outbound,
   z.ZodTypeDef,
   HeaderS2Format
-> = Header1$outboundSchema;
+> = components.FormatOption$outboundSchema;
 
 /**
  * @internal
@@ -115,7 +94,7 @@ export const AppendRequest$inboundSchema: z.ZodType<
   z.ZodTypeDef,
   unknown
 > = z.object({
-  "s2-format": Header1$inboundSchema.optional(),
+  "s2-format": components.FormatOption$inboundSchema.optional(),
   stream: z.string(),
   AppendInput: components.AppendInput$inboundSchema,
 }).transform((v) => {
@@ -138,7 +117,7 @@ export const AppendRequest$outboundSchema: z.ZodType<
   z.ZodTypeDef,
   AppendRequest
 > = z.object({
-  s2Format: Header1$outboundSchema.optional(),
+  s2Format: components.FormatOption$outboundSchema.optional(),
   stream: z.string(),
   appendInput: components.AppendInput$outboundSchema,
 }).transform((v) => {
@@ -174,3 +153,66 @@ export function appendRequestFromJSON(
     `Failed to parse 'AppendRequest' from JSON`,
   );
 }
+
+/** @internal */
+export const AppendResponse$inboundSchema: z.ZodType<
+  AppendResponse,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  HttpMeta: components.HTTPMetadata$inboundSchema,
+  AppendOutput: components.AppendOutput$inboundSchema.optional(),
+}).transform((v) => {
+  return remap$(v, {
+    "HttpMeta": "httpMeta",
+    "AppendOutput": "appendOutput",
+  });
+});
+
+/** @internal */
+export type AppendResponse$Outbound = {
+  HttpMeta: components.HTTPMetadata$Outbound;
+  AppendOutput?: components.AppendOutput$Outbound | undefined;
+};
+
+/** @internal */
+export const AppendResponse$outboundSchema: z.ZodType<
+  AppendResponse$Outbound,
+  z.ZodTypeDef,
+  AppendResponse
+> = z.object({
+  httpMeta: components.HTTPMetadata$outboundSchema,
+  appendOutput: components.AppendOutput$outboundSchema.optional(),
+}).transform((v) => {
+  return remap$(v, {
+    httpMeta: "HttpMeta",
+    appendOutput: "AppendOutput",
+  });
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace AppendResponse$ {
+  /** @deprecated use `AppendResponse$inboundSchema` instead. */
+  export const inboundSchema = AppendResponse$inboundSchema;
+  /** @deprecated use `AppendResponse$outboundSchema` instead. */
+  export const outboundSchema = AppendResponse$outboundSchema;
+  /** @deprecated use `AppendResponse$Outbound` instead. */
+  export type Outbound = AppendResponse$Outbound;
+}
+
+export function appendResponseToJSON(appendResponse: AppendResponse): string {
+  return JSON.stringify(AppendResponse$outboundSchema.parse(appendResponse));
+}
+
+export function appendResponseFromJSON(
+  jsonString: string,
+): SafeParseResult<AppendResponse, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => AppendResponse$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'AppendResponse' from JSON`,
+  );
+}

package/src/models/operations/checktail.ts

@@ -3,8 +3,10 @@
  */
 
 import * as z from "zod";
+import { remap as remap$ } from "../../lib/primitives.js";
 import { safeParse } from "../../lib/schemas.js";
 import { Result as SafeParseResult } from "../../types/fp.js";
+import * as components from "../components/index.js";
 import { SDKValidationError } from "../errors/sdkvalidationerror.js";
 
 export const CheckTailServerList = [
@@ -21,6 +23,11 @@ export type CheckTailRequest = {
   stream: string;
 };
 
+export type CheckTailResponse = {
+  httpMeta: components.HTTPMetadata;
+  checkTailResponse?: components.CheckTailResponse | undefined;
+};
+
 /** @internal */
 export const CheckTailRequest$inboundSchema: z.ZodType<
   CheckTailRequest,
@@ -74,3 +81,70 @@ export function checkTailRequestFromJSON(
     `Failed to parse 'CheckTailRequest' from JSON`,
   );
 }
+
+/** @internal */
+export const CheckTailResponse$inboundSchema: z.ZodType<
+  CheckTailResponse,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  HttpMeta: components.HTTPMetadata$inboundSchema,
+  CheckTailResponse: components.CheckTailResponse$inboundSchema.optional(),
+}).transform((v) => {
+  return remap$(v, {
+    "HttpMeta": "httpMeta",
+    "CheckTailResponse": "checkTailResponse",
+  });
+});
+
+/** @internal */
+export type CheckTailResponse$Outbound = {
+  HttpMeta: components.HTTPMetadata$Outbound;
+  CheckTailResponse?: components.CheckTailResponse$Outbound | undefined;
+};
+
+/** @internal */
+export const CheckTailResponse$outboundSchema: z.ZodType<
+  CheckTailResponse$Outbound,
+  z.ZodTypeDef,
+  CheckTailResponse
+> = z.object({
+  httpMeta: components.HTTPMetadata$outboundSchema,
+  checkTailResponse: components.CheckTailResponse$outboundSchema.optional(),
+}).transform((v) => {
+  return remap$(v, {
+    httpMeta: "HttpMeta",
+    checkTailResponse: "CheckTailResponse",
+  });
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace CheckTailResponse$ {
+  /** @deprecated use `CheckTailResponse$inboundSchema` instead. */
+  export const inboundSchema = CheckTailResponse$inboundSchema;
+  /** @deprecated use `CheckTailResponse$outboundSchema` instead. */
+  export const outboundSchema = CheckTailResponse$outboundSchema;
+  /** @deprecated use `CheckTailResponse$Outbound` instead. */
+  export type Outbound = CheckTailResponse$Outbound;
+}
+
+export function checkTailResponseToJSON(
+  checkTailResponse: CheckTailResponse,
+): string {
+  return JSON.stringify(
+    CheckTailResponse$outboundSchema.parse(checkTailResponse),
+  );
+}
+
+export function checkTailResponseFromJSON(
+  jsonString: string,
+): SafeParseResult<CheckTailResponse, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => CheckTailResponse$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'CheckTailResponse' from JSON`,
+  );
+}