@hushscript/sdk 1.1.0 → 1.1.2

package/dist/index.js

@@ -1,5 +1,6 @@
 import { inspect } from 'util';
 import createClient from 'openapi-fetch';
+import { getMaxListeners, defaultMaxListeners, setMaxListeners } from 'events';
 import { setImmediate } from 'timers/promises';
 import { parseBlob } from 'music-metadata';
 import { randomUUID } from 'crypto';
@@ -9,7 +10,7 @@ import { stat, open } from 'fs/promises';
 
 // package.json
 var package_default = {
-  version: "1.1.0"};
+  version: "1.1.2"};
 
 // src/clock.ts
 var systemClock = {
@@ -1061,8 +1062,6 @@ function guardApi(raw) {
   guard("request", raw.request);
   return guarded2;
 }
-
-// src/http/fetch.ts
 var BODY_CHUNK_BYTES = 256 * 1024;
 var NEVER_SENT = /^(?:ECONNREFUSED|ENOTFOUND|EAI_AGAIN|UND_ERR_CONNECT_TIMEOUT|ERR_TLS_CERT_ALTNAME_INVALID|CERT_|DEPTH_ZERO_|UNABLE_TO_|SELF_SIGNED_)/;
 function isTransportFailure(error) {
@@ -1095,6 +1094,10 @@ function bodyStream(bytes, progress) {
   );
 }
 var NULL_BODY_STATUSES = /* @__PURE__ */ new Set([204, 205, 304]);
+function callerSignal(input, init) {
+  if (init?.signal !== void 0) return init.signal;
+  return input instanceof Request ? input.signal : null;
+}
 function whenAborted(signal) {
   return new Promise((_resolve, reject) => {
     if (signal.aborted) reject(signal.reason);
@@ -1138,13 +1141,13 @@ async function pause(cfg, ms, signal) {
     throw error;
   }
 }
-async function attempt(timeoutMs, cfg, request, callerSignal) {
+async function attempt(timeoutMs, cfg, request, callerSignal2) {
   const controller = new AbortController();
   const stopTimer = new AbortController();
   const onCallerAbort = () => {
-    controller.abort(callerSignal.reason);
+    controller.abort(callerSignal2.reason);
   };
-  callerSignal.addEventListener("abort", onCallerAbort);
+  callerSignal2.addEventListener("abort", onCallerAbort);
   let timedOut = false;
   cfg.clock.sleep(timeoutMs, stopTimer.signal).then(
     () => {
@@ -1181,34 +1184,37 @@ async function attempt(timeoutMs, cfg, request, callerSignal) {
     return { failure: { error, sent, timedOut, foreign } };
   } finally {
     stopTimer.abort();
-    callerSignal.removeEventListener("abort", onCallerAbort);
+    callerSignal2.removeEventListener("abort", onCallerAbort);
   }
 }
-function terminalFailure(timeoutMs, retryClass, operation, failure, callerSignal) {
+function terminalFailure(timeoutMs, retryClass, operation, failure, callerSignal2) {
   const code = errorCode(failure.error);
-  const callerAborted = isAborted(callerSignal);
+  const callerAborted = isAborted(callerSignal2);
   const reason = callerAborted ? "The request was aborted." : failure.timedOut ? `The request timed out after ${String(timeoutMs / 1e3)} s.` : `The request failed before a response arrived (${describeError(failure.error)}${code === void 0 ? "" : `; code ${code}`}).`;
   if (retryClass === "never" && failure.sent) {
     return new OutcomeUnknownError({
       message: `${reason} The request was sent, so its outcome is unknown.`,
       hint: OutcomeUnknownError.hintFor(operation),
-      cause: callerAborted ? aborted2(callerSignal) : failure.error
+      cause: callerAborted ? aborted2(callerSignal2) : failure.error
     });
   }
-  if (callerAborted) return aborted2(callerSignal);
+  if (callerAborted) return aborted2(callerSignal2);
   return new NetworkError({ message: reason, cause: failure.error });
 }
 function hardenedFetch(cfg, retryClass, options = {}) {
   const timeoutMs = options.timeoutMs ?? cfg.timeoutMs;
-  const guarded2 = async (input, init, wire) => {
+  const guarded2 = async (input, init, wire, signal) => {
     const direct = init?.body instanceof Uint8Array ? init.body : null;
-    const request = new Request(input, direct === null ? init : { ...init, body: null });
+    const request = new Request(input, {
+      ...init,
+      ...direct === null ? {} : { body: null },
+      signal: null
+    });
     const url2 = new URL(request.url);
     const method = request.method.toUpperCase();
     const operation = operationFor(method, url2.pathname);
     const apiOrigin = new URL(cfg.baseUrl).origin;
     const target = describeTarget(url2, apiOrigin);
-    const signal = request.signal;
     const buffer = direct ?? new Uint8Array(await request.arrayBuffer());
     const bytes = buffer.byteLength > 0 ? buffer : null;
     const headers = new Headers(request.headers);
@@ -1296,8 +1302,18 @@ function hardenedFetch(cfg, retryClass, options = {}) {
   };
   return async (input, init) => {
     const wire = { sent: false, everSent: false };
+    const caller = callerSignal(input, init);
+    const controller = new AbortController();
+    const forward = () => {
+      controller.abort(caller?.reason);
+    };
     try {
-      return await guarded2(input, init, wire);
+      if (caller?.aborted === true) forward();
+      else if (caller !== null) {
+        if (getMaxListeners(caller) === defaultMaxListeners) setMaxListeners(1500, caller);
+        caller.addEventListener("abort", forward);
+      }
+      return await guarded2(input, init, wire, controller.signal);
     } catch (error) {
       if (error instanceof HushscriptError) throw wire.everSent ? error : markNotSent(error);
       if (retryClass === "never" && wire.sent) {
@@ -1308,6 +1324,8 @@ function hardenedFetch(cfg, retryClass, options = {}) {
       }
       const wrapped = asHushscriptError(error, wire.everSent);
       throw wire.everSent ? wrapped : markNotSent(wrapped);
+    } finally {
+      caller?.removeEventListener("abort", forward);
     }
   };
 }
@@ -1315,10 +1333,12 @@ function hardenedFetch(cfg, retryClass, options = {}) {
 // src/http/transport.ts
 function createTransport(config) {
   return async (input, init) => {
-    const request = new Request(input, init);
+    const request = new Request(input, { ...init, signal: null });
     const pathname = new URL(request.url).pathname;
     const body = request.method.toUpperCase() === "POST" && pathname === "/v1/uploads" ? await request.clone().text() : null;
-    return hardenedFetch(config, retryClassForRequest(request.method, pathname, body))(request);
+    return hardenedFetch(config, retryClassForRequest(request.method, pathname, body))(request, {
+      signal: callerSignal(input, init)
+    });
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hushscript/sdk",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Official TypeScript SDK for the Hushscript transcription API.",
   "license": "MIT",
   "type": "module",
@@ -41,34 +41,37 @@
     "conformance": "node --disable-warning=ExperimentalWarning conformance/runner.ts"
   },
   "dependencies": {
-    "music-metadata": "^12.2.3",
+    "music-metadata": "^12.3.2",
     "openapi-fetch": "^0.17.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.5",
     "@eslint/js": "10.0.1",
-    "@stryker-mutator/core": "10.0.0",
-    "@stryker-mutator/vitest-runner": "10.0.0",
+    "@stryker-mutator/core": "10.1.1",
+    "@stryker-mutator/vitest-runner": "10.1.1",
     "@types/node": "24.19.2",
     "@vitest/coverage-v8": "5.0.5",
-    "eslint": "10.13.0",
+    "eslint": "10.14.0",
     "eslint-plugin-n": "18.5.0",
-    "eslint-plugin-regexp": "3.3.1",
+    "eslint-plugin-regexp": "3.3.2",
     "fast-check": "4.10.2",
     "globals": "17.13.0",
-    "knip": "6.42.1",
+    "knip": "6.44.0",
     "openapi-typescript": "7.13.0",
     "prettier": "3.9.10",
     "publint": "0.3.25",
     "tsup": "9.0.0",
     "typescript": "6.0.3",
     "typescript-floor": "npm:typescript@5.5.4",
-    "typescript-eslint": "8.72.0",
+    "typescript-eslint": "8.72.1",
     "vitest": "5.0.5"
   },
   "overrides": {
     "openapi-typescript": {
       "typescript": "$typescript"
+    },
+    "typed-rest-client": {
+      "qs": "6.16.1"
     }
   }
 }