@steamsets/client-ts 0.25.13 → 0.26.0

package/src/lib/matchers.ts

@@ -2,14 +2,14 @@
  * 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"
   | "json"
   | "text"
   | "bytes"
@@ -19,6 +19,7 @@ export type Encoding =
   | "fail";
 
 const DEFAULT_CONTENT_TYPES: Record<Encoding, string> = {
+  jsonl: "application/jsonl",
   json: "application/json",
   text: "text/plain",
   bytes: "application/octet-stream",
@@ -72,6 +73,21 @@ export function json<T>(
   return { ...options, enc: "json", codes, schema };
 }
 
+export function jsonl<T>(
+  codes: StatusCodePredicate,
+  schema: Schema<T>,
+  options?: MatchOptions,
+): ValueMatcher<T> {
+  return { ...options, enc: "jsonl", codes, schema };
+}
+
+export function jsonlErr<E>(
+  codes: StatusCodePredicate,
+  schema: Schema<E>,
+  options?: MatchOptions,
+): ErrorMatcher<E> {
+  return { ...options, err: true, enc: "jsonl", codes, schema };
+}
 export function textErr<E>(
   codes: StatusCodePredicate,
   schema: Schema<E>,
@@ -165,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;
@@ -190,20 +206,25 @@ 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;
         break;
       case "bytes":
         raw = new Uint8Array(await response.arrayBuffer());
@@ -212,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;
@@ -231,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];
     }
 
@@ -243,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 = {
@@ -258,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,
       ];
@@ -292,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" });
     }
 
@@ -298,7 +304,9 @@ export class ClientSDK {
   }
 }
 
-const jsonLikeContentTypeRE = /^application\/(?:.{0,100}\+)?json/;
+const jsonLikeContentTypeRE = /(application|text)\/.*?\+*json.*/;
+const jsonlLikeContentTypeRE =
+  /(application|text)\/(.*?\+*\bjsonl\b.*|.*?\+*\bx-ndjson\b.*)/;
 async function logRequest(logger: Logger | undefined, req: Request) {
   if (!logger) {
     return;
@@ -364,9 +372,13 @@ async function logResponse(
   logger.group("Body:");
   switch (true) {
     case matchContentType(res, "application/json")
-      || jsonLikeContentTypeRE.test(ct):
+      || jsonLikeContentTypeRE.test(ct) && !jsonlLikeContentTypeRE.test(ct):
       logger.log(await res.clone().json());
       break;
+    case matchContentType(res, "application/jsonl")
+      || jsonlLikeContentTypeRE.test(ct):
+      logger.log(await res.clone().text());
+      break;
     case matchContentType(res, "text/event-stream"):
       logger.log(`<${contentType}>`);
       break;

package/src/models/components/index.ts

@@ -41,10 +41,14 @@ 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";
+export * from "./v1accountcomparebadgeorder.js";
 export * from "./v1accountcomparebadgesrequestbody.js";
 export * from "./v1accountcomparebadgesresponsebody.js";
 export * from "./v1accountcomparedappbadge.js";
@@ -111,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`,
+  );
+}

package/src/models/components/v1accountcompare.ts

@@ -0,0 +1,104 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { safeParse } from "../../lib/schemas.js";
+import { ClosedEnum } from "../../types/enums.js";
+import { Result as SafeParseResult } from "../../types/fp.js";
+import { SDKValidationError } from "../errors/sdkvalidationerror.js";
+
+export const Mode = {
+  All: "all",
+  Missing: "missing",
+  Owned: "owned",
+  ReverseOwned: "reverse_owned",
+  BothMissing: "both_missing",
+  BothOwned: "both_owned",
+} as const;
+export type Mode = ClosedEnum<typeof Mode>;
+
+export type V1AccountCompare = {
+  /**
+   * The SteamID to compare against
+   */
+  against: string;
+  mode?: Mode | undefined;
+};
+
+/** @internal */
+export const Mode$inboundSchema: z.ZodNativeEnum<typeof Mode> = z.nativeEnum(
+  Mode,
+);
+
+/** @internal */
+export const Mode$outboundSchema: z.ZodNativeEnum<typeof Mode> =
+  Mode$inboundSchema;
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace Mode$ {
+  /** @deprecated use `Mode$inboundSchema` instead. */
+  export const inboundSchema = Mode$inboundSchema;
+  /** @deprecated use `Mode$outboundSchema` instead. */
+  export const outboundSchema = Mode$outboundSchema;
+}
+
+/** @internal */
+export const V1AccountCompare$inboundSchema: z.ZodType<
+  V1AccountCompare,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  against: z.string(),
+  mode: Mode$inboundSchema.default("missing"),
+});
+
+/** @internal */
+export type V1AccountCompare$Outbound = {
+  against: string;
+  mode: string;
+};
+
+/** @internal */
+export const V1AccountCompare$outboundSchema: z.ZodType<
+  V1AccountCompare$Outbound,
+  z.ZodTypeDef,
+  V1AccountCompare
+> = z.object({
+  against: z.string(),
+  mode: Mode$outboundSchema.default("missing"),
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace V1AccountCompare$ {
+  /** @deprecated use `V1AccountCompare$inboundSchema` instead. */
+  export const inboundSchema = V1AccountCompare$inboundSchema;
+  /** @deprecated use `V1AccountCompare$outboundSchema` instead. */
+  export const outboundSchema = V1AccountCompare$outboundSchema;
+  /** @deprecated use `V1AccountCompare$Outbound` instead. */
+  export type Outbound = V1AccountCompare$Outbound;
+}
+
+export function v1AccountCompareToJSON(
+  v1AccountCompare: V1AccountCompare,
+): string {
+  return JSON.stringify(
+    V1AccountCompare$outboundSchema.parse(v1AccountCompare),
+  );
+}
+
+export function v1AccountCompareFromJSON(
+  jsonString: string,
+): SafeParseResult<V1AccountCompare, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => V1AccountCompare$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'V1AccountCompare' from JSON`,
+  );
+}