@steamsets/client-ts 0.25.14 → 0.26.0

package/src/funcs/staffList.ts

@@ -16,8 +16,9 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
-import { SDKError } from "../models/errors/sdkerror.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
+import { SteamSetsError } from "../models/errors/steamsetserror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
@@ -29,14 +30,14 @@ export function staffList(
   Result<
     operations.StaffListStaffResponse,
     | errors.ErrorModel
-    | errors.ErrorModel
-    | SDKError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | SteamSetsError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >
 > {
   return new APIPromise($do(
@@ -53,14 +54,14 @@ async function $do(
     Result<
       operations.StaffListStaffResponse,
       | errors.ErrorModel
-      | errors.ErrorModel
-      | SDKError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | SteamSetsError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     APICall,
   ]
@@ -76,6 +77,7 @@ async function $do(
   const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "staff.listStaff",
     oAuth2Scopes: [],
@@ -106,6 +108,7 @@ async function $do(
     path: path,
     headers: headers,
     uaHeader: "x-speakeasy-user-agent",
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
@@ -131,14 +134,14 @@ async function $do(
   const [result] = await M.match<
     operations.StaffListStaffResponse,
     | errors.ErrorModel
-    | errors.ErrorModel
-    | SDKError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | SteamSetsError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(200, operations.StaffListStaffResponse$inboundSchema, {
       key: "LeaderboardAccounts",

package/src/funcs/statsGet.ts

@@ -16,8 +16,9 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
-import { SDKError } from "../models/errors/sdkerror.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
+import { SteamSetsError } from "../models/errors/steamsetserror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
 import { Result } from "../types/fp.js";
@@ -29,14 +30,14 @@ export function statsGet(
   Result<
     operations.StatsGetStatsResponse,
     | errors.ErrorModel
-    | errors.ErrorModel
-    | SDKError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | SteamSetsError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >
 > {
   return new APIPromise($do(
@@ -53,14 +54,14 @@ async function $do(
     Result<
       operations.StatsGetStatsResponse,
       | errors.ErrorModel
-      | errors.ErrorModel
-      | SDKError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | SteamSetsError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     APICall,
   ]
@@ -76,6 +77,7 @@ async function $do(
   const requestSecurity = resolveGlobalSecurity(securityInput);
 
   const context = {
+    options: client._options,
     baseURL: options?.serverURL ?? client._baseURL ?? "",
     operationID: "stats.getStats",
     oAuth2Scopes: [],
@@ -106,6 +108,7 @@ async function $do(
     path: path,
     headers: headers,
     uaHeader: "x-speakeasy-user-agent",
+    userAgent: client._options.userAgent,
     timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
@@ -131,14 +134,14 @@ async function $do(
   const [result] = await M.match<
     operations.StatsGetStatsResponse,
     | errors.ErrorModel
-    | errors.ErrorModel
-    | SDKError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | SteamSetsError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(200, operations.StatsGetStatsResponse$inboundSchema, {
       key: "V1Stats",

package/src/hooks/types.ts

@@ -2,6 +2,7 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
+import { SDKOptions } from "../lib/config.js";
 import { HTTPClient, RequestInput } from "../lib/http.js";
 import { RetryConfig } from "../lib/retries.js";
 import { SecurityState } from "../lib/security.js";
@@ -13,6 +14,7 @@ export type HookContext = {
   securitySource?: any | (() => Promise<any>);
   retryConfig: RetryConfig;
   resolvedSecurity: SecurityState | null;
+  options: SDKOptions;
 };
 
 export type Awaitable<T> = T | Promise<T>;

package/src/index.ts

@@ -4,4 +4,6 @@
 
 export * from "./lib/config.js";
 export * as files from "./lib/files.js";
+export { HTTPClient } from "./lib/http.js";
+export type { Fetcher, HTTPClientOptions } from "./lib/http.js";
 export * from "./sdk/sdk.js";

package/src/lib/config.ts

@@ -27,6 +27,10 @@ export type SDKOptions = {
    * Allows overriding the default server URL used by the SDK
    */
   serverURL?: string | undefined;
+  /**
+   * Allows overriding the default user agent used by the SDK
+   */
+  userAgent?: string | undefined;
   /**
    * Allows overriding the default retry config used by the SDK
    */
@@ -55,8 +59,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "0.25.14",
-  genVersion: "2.593.3",
+  sdkVersion: "0.26.0",
+  genVersion: "2.623.2",
   userAgent:
-    "speakeasy-sdk/typescript 0.25.14 2.593.3 1.0.0 @steamsets/client-ts",
+    "speakeasy-sdk/typescript 0.26.0 2.623.2 1.0.0 @steamsets/client-ts",
 } as const;

package/src/lib/matchers.ts

@@ -2,12 +2,11 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKError } from "../models/errors/sdkerror.js";
-import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
-import { Result } from "../types/fp.js";
+import { ERR, OK, Result } from "../types/fp.js";
 import { matchResponse, matchStatusCode, StatusCodePredicate } from "./http.js";
 import { isPlainObject } from "./is-plain-object.js";
-import { safeParse } from "./schemas.js";
 
 export type Encoding =
   | "jsonl"
@@ -182,13 +181,13 @@ export type MatchFunc<T, E> = (
 
 export function match<T, E>(
   ...matchers: Array<Matcher<T, E>>
-): MatchFunc<T, E | SDKError | SDKValidationError> {
+): MatchFunc<T, E | SDKError | ResponseValidationError> {
   return async function matchFunc(
     response: Response,
     request: Request,
     options?: { resultKey?: string; extraFields?: Record<string, unknown> },
   ): Promise<
-    [result: Result<T, E | SDKError | SDKValidationError>, raw: unknown]
+    [result: Result<T, E | SDKError | ResponseValidationError>, raw: unknown]
   > {
     let raw: unknown;
     let matcher: Matcher<T, E> | undefined;
@@ -207,20 +206,22 @@ export function match<T, E>(
     }
 
     if (!matcher) {
-      await discardResponseBody(response);
       return [{
         ok: false,
-        error: new SDKError("Unexpected API response status or content-type", {
+        error: new SDKError("Unexpected Status or Content-Type", {
           response,
           request,
+          body: await response.text().catch(() => ""),
         }),
       }, raw];
     }
 
     const encoding = matcher.enc;
+    let body = "";
     switch (encoding) {
       case "json":
-        raw = await response.json();
+        body = await response.text();
+        raw = JSON.parse(body);
         break;
       case "jsonl":
         raw = response.body;
@@ -232,16 +233,19 @@ export function match<T, E>(
         raw = response.body;
         break;
       case "text":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       case "sse":
         raw = response.body;
         break;
       case "nil":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       case "fail":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       default:
         encoding satisfies never;
@@ -251,7 +255,7 @@ export function match<T, E>(
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new SDKError("API error occurred", { response, request }),
+        error: new SDKError("API error occurred", { request, response, body }),
       }, raw];
     }
 
@@ -263,6 +267,9 @@ export function match<T, E>(
         ...options?.extraFields,
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
         ...(isPlainObject(raw) ? raw : null),
+        request$: request,
+        response$: response,
+        body$: body,
       };
     } else if (resultKey) {
       data = {
@@ -278,18 +285,20 @@ export function match<T, E>(
     }
 
     if ("err" in matcher) {
-      const result = safeParse(
+      const result = safeParseResponse(
         data,
         (v: unknown) => matcher.schema.parse(v),
         "Response validation failed",
+        { request, response, body },
       );
       return [result.ok ? { ok: false, error: result.value } : result, raw];
     } else {
       return [
-        safeParse(
+        safeParseResponse(
           data,
           (v: unknown) => matcher.schema.parse(v),
           "Response validation failed",
+          { request, response, body },
         ),
         raw,
       ];
@@ -312,25 +321,22 @@ export function unpackHeaders(headers: Headers): Record<string, string[]> {
   return out;
 }
 
-/**
- * Discards the response body to free up resources.
- *
- * To learn why this is need, see the undici docs:
- * https://undici.nodejs.org/#/?id=garbage-collection
- */
-export async function discardResponseBody(res: Response) {
-  const reader = res.body?.getReader();
-  if (reader == null) {
-    return;
-  }
-
+function safeParseResponse<Inp, Out>(
+  rawValue: Inp,
+  fn: (value: Inp) => Out,
+  errorMessage: string,
+  httpMeta: { response: Response; request: Request; body: string },
+): Result<Out, ResponseValidationError> {
   try {
-    let done = false;
-    while (!done) {
-      const res = await reader.read();
-      done = res.done;
-    }
-  } finally {
-    reader.releaseLock();
+    return OK(fn(rawValue));
+  } catch (err) {
+    return ERR(
+      new ResponseValidationError(errorMessage, {
+        cause: err,
+        rawValue,
+        rawMessage: errorMessage,
+        ...httpMeta,
+      }),
+    );
   }
 }

package/src/lib/sdks.ts

@@ -46,12 +46,14 @@ export type RequestOptions = {
    */
   serverURL?: string | URL;
   /**
+   * @deprecated `fetchOptions` has been flattened into `RequestOptions`.
+   *
    * Sets various request options on the `fetch` call made by an SDK method.
    *
    * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/Request#options|Request}
    */
   fetchOptions?: Omit<RequestInit, "method" | "body">;
-};
+} & Omit<RequestInit, "method" | "body">;
 
 type RequestConfig = {
   method: string;
@@ -62,6 +64,7 @@ type RequestConfig = {
   headers?: HeadersInit;
   security?: SecurityState | null;
   uaHeader?: string;
+  userAgent?: string | undefined;
   timeoutMs?: number;
 };
 
@@ -93,19 +96,21 @@ export class ClientSDK {
     } else {
       this.#hooks = new SDKHooks();
     }
-    this._options = { ...options, hooks: this.#hooks };
-
     const url = serverURLFromOptions(options);
     if (url) {
       url.pathname = url.pathname.replace(/\/+$/, "") + "/";
     }
+
     const { baseURL, client } = this.#hooks.sdkInit({
       baseURL: url,
       client: options.httpClient || new HTTPClient(),
     });
     this._baseURL = baseURL;
     this.#httpClient = client;
-    this.#logger = options.debugLogger;
+
+    this._options = { ...options, hooks: this.#hooks };
+
+    this.#logger = this._options.debugLogger;
   }
 
   public _createRequest(
@@ -168,7 +173,9 @@ export class ClientSDK {
     cookie = cookie.startsWith("; ") ? cookie.slice(2) : cookie;
     headers.set("cookie", cookie);
 
-    const userHeaders = new Headers(options?.fetchOptions?.headers);
+    const userHeaders = new Headers(
+      options?.headers ?? options?.fetchOptions?.headers,
+    );
     for (const [k, v] of userHeaders) {
       headers.set(k, v);
     }
@@ -176,23 +183,22 @@ export class ClientSDK {
     // Only set user agent header in non-browser-like environments since CORS
     // policy disallows setting it in browsers e.g. Chrome throws an error.
     if (!isBrowserLike) {
-      headers.set(conf.uaHeader ?? "user-agent", SDK_METADATA.userAgent);
+      headers.set(
+        conf.uaHeader ?? "user-agent",
+        conf.userAgent ?? SDK_METADATA.userAgent,
+      );
     }
 
-    let fetchOptions = options?.fetchOptions;
+    const fetchOptions: Omit<RequestInit, "method" | "body"> = {
+      ...options?.fetchOptions,
+      ...options,
+    };
     if (!fetchOptions?.signal && conf.timeoutMs && conf.timeoutMs > 0) {
       const timeoutSignal = AbortSignal.timeout(conf.timeoutMs);
-      if (!fetchOptions) {
-        fetchOptions = { signal: timeoutSignal };
-      } else {
-        fetchOptions.signal = timeoutSignal;
-      }
+      fetchOptions.signal = timeoutSignal;
     }
 
     if (conf.body instanceof ReadableStream) {
-      if (!fetchOptions) {
-        fetchOptions = {};
-      }
       Object.assign(fetchOptions, { duplex: "half" });
     }
 

package/src/models/components/index.ts

@@ -41,8 +41,10 @@ export * from "./state.js";
 export * from "./v1accountapp.js";
 export * from "./v1accountbadgebookmark.js";
 export * from "./v1accountbadgebookmarksresponsebody.js";
+export * from "./v1accountbadgecountstats.js";
 export * from "./v1accountbadgeownedbadge.js";
 export * from "./v1accountbadgeownedbadgesresponsebody.js";
+export * from "./v1accountbadgestats.js";
 export * from "./v1accountbookmarkbadgerequestbody.js";
 export * from "./v1accountbookmarkbadgeresponsebody.js";
 export * from "./v1accountcompare.js";
@@ -113,6 +115,10 @@ export * from "./v1appbadge.js";
 export * from "./v1applistbadgesrequestbody.js";
 export * from "./v1applistbadgesresponsebody.js";
 export * from "./v1apporder.js";
+export * from "./v1badgelistbadgepricefilters.js";
+export * from "./v1badgelistbadgepriceorder.js";
+export * from "./v1badgelistbadgepricesrequestbody.js";
+export * from "./v1badgelistbadgepricesresponsebody.js";
 export * from "./v1badgelisttagsresponsebody.js";
 export * from "./v1badgeorder.js";
 export * from "./v1badgesearchbadgesresponsebody.js";

package/src/models/components/v1accountbadgecountstats.ts

@@ -0,0 +1,74 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { safeParse } from "../../lib/schemas.js";
+import { Result as SafeParseResult } from "../../types/fp.js";
+import { SDKValidationError } from "../errors/sdkvalidationerror.js";
+
+export type V1AccountBadgeCountStats = {
+  foils: number;
+  normals: number;
+  specials: number;
+};
+
+/** @internal */
+export const V1AccountBadgeCountStats$inboundSchema: z.ZodType<
+  V1AccountBadgeCountStats,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  foils: z.number().int(),
+  normals: z.number().int(),
+  specials: z.number().int(),
+});
+
+/** @internal */
+export type V1AccountBadgeCountStats$Outbound = {
+  foils: number;
+  normals: number;
+  specials: number;
+};
+
+/** @internal */
+export const V1AccountBadgeCountStats$outboundSchema: z.ZodType<
+  V1AccountBadgeCountStats$Outbound,
+  z.ZodTypeDef,
+  V1AccountBadgeCountStats
+> = z.object({
+  foils: z.number().int(),
+  normals: z.number().int(),
+  specials: z.number().int(),
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace V1AccountBadgeCountStats$ {
+  /** @deprecated use `V1AccountBadgeCountStats$inboundSchema` instead. */
+  export const inboundSchema = V1AccountBadgeCountStats$inboundSchema;
+  /** @deprecated use `V1AccountBadgeCountStats$outboundSchema` instead. */
+  export const outboundSchema = V1AccountBadgeCountStats$outboundSchema;
+  /** @deprecated use `V1AccountBadgeCountStats$Outbound` instead. */
+  export type Outbound = V1AccountBadgeCountStats$Outbound;
+}
+
+export function v1AccountBadgeCountStatsToJSON(
+  v1AccountBadgeCountStats: V1AccountBadgeCountStats,
+): string {
+  return JSON.stringify(
+    V1AccountBadgeCountStats$outboundSchema.parse(v1AccountBadgeCountStats),
+  );
+}
+
+export function v1AccountBadgeCountStatsFromJSON(
+  jsonString: string,
+): SafeParseResult<V1AccountBadgeCountStats, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => V1AccountBadgeCountStats$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'V1AccountBadgeCountStats' from JSON`,
+  );
+}

package/src/models/components/v1accountbadgestats.ts

@@ -0,0 +1,96 @@
+/*
+ * 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";
+import {
+  V1AccountBadgeCountStats,
+  V1AccountBadgeCountStats$inboundSchema,
+  V1AccountBadgeCountStats$Outbound,
+  V1AccountBadgeCountStats$outboundSchema,
+} from "./v1accountbadgecountstats.js";
+
+export type V1AccountBadgeStats = {
+  /**
+   * A URL to the JSON Schema for this object.
+   */
+  dollarSchema?: string | undefined;
+  count: V1AccountBadgeCountStats;
+  levels: { [k: string]: number };
+  scarcities: { [k: string]: number };
+};
+
+/** @internal */
+export const V1AccountBadgeStats$inboundSchema: z.ZodType<
+  V1AccountBadgeStats,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  $schema: z.string().optional(),
+  count: V1AccountBadgeCountStats$inboundSchema,
+  levels: z.record(z.number().int()),
+  scarcities: z.record(z.number().int()),
+}).transform((v) => {
+  return remap$(v, {
+    "$schema": "dollarSchema",
+  });
+});
+
+/** @internal */
+export type V1AccountBadgeStats$Outbound = {
+  $schema?: string | undefined;
+  count: V1AccountBadgeCountStats$Outbound;
+  levels: { [k: string]: number };
+  scarcities: { [k: string]: number };
+};
+
+/** @internal */
+export const V1AccountBadgeStats$outboundSchema: z.ZodType<
+  V1AccountBadgeStats$Outbound,
+  z.ZodTypeDef,
+  V1AccountBadgeStats
+> = z.object({
+  dollarSchema: z.string().optional(),
+  count: V1AccountBadgeCountStats$outboundSchema,
+  levels: z.record(z.number().int()),
+  scarcities: z.record(z.number().int()),
+}).transform((v) => {
+  return remap$(v, {
+    dollarSchema: "$schema",
+  });
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace V1AccountBadgeStats$ {
+  /** @deprecated use `V1AccountBadgeStats$inboundSchema` instead. */
+  export const inboundSchema = V1AccountBadgeStats$inboundSchema;
+  /** @deprecated use `V1AccountBadgeStats$outboundSchema` instead. */
+  export const outboundSchema = V1AccountBadgeStats$outboundSchema;
+  /** @deprecated use `V1AccountBadgeStats$Outbound` instead. */
+  export type Outbound = V1AccountBadgeStats$Outbound;
+}
+
+export function v1AccountBadgeStatsToJSON(
+  v1AccountBadgeStats: V1AccountBadgeStats,
+): string {
+  return JSON.stringify(
+    V1AccountBadgeStats$outboundSchema.parse(v1AccountBadgeStats),
+  );
+}
+
+export function v1AccountBadgeStatsFromJSON(
+  jsonString: string,
+): SafeParseResult<V1AccountBadgeStats, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => V1AccountBadgeStats$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'V1AccountBadgeStats' from JSON`,
+  );
+}