kinetex 1.1.0 → 1.2.0

package/dist/browser/kinetex.js

@@ -1,4 +1,4 @@
-/* kinetex v1.1.0 | MIT | https://github.com/kinetexjs/kinetex */
+/* kinetex v1.2.0 | MIT | https://github.com/kinetexjs/kinetex */
 "use strict";
 var kinetex = (() => {
   var __create = Object.create;
@@ -283,8 +283,11 @@ var kinetex = (() => {
   function parseIPv4Host(host) {
     if (host.includes(":") || !/^[0-9a-fA-FxX.]+$/.test(host))
       return null;
-    const parts = host.split(".");
-    if (parts.length > 4)
+    const bare = host.endsWith(".") ? host.slice(0, -1) : host;
+    if (bare === "")
+      return null;
+    const parts = bare.split(".");
+    if (parts.length > 4 || parts.length < 1)
       return null;
     if (parts.length === 1) {
       const v = parseIPv4Component(parts[0]);
@@ -292,17 +295,21 @@ var kinetex = (() => {
         return null;
       return v >>> 0;
     }
-    const nums = [];
-    for (const p of parts) {
-      const v = parseIPv4Component(p);
-      const isLast = p === parts[parts.length - 1];
-      if (v === null || v > (isLast && nums.length === 3 ? 255 : 255))
+    const octets = [];
+    for (let i = 0; i < parts.length - 1; i++) {
+      const v = parseIPv4Component(parts[i]);
+      if (v === null || v > 255)
         return null;
-      nums.push(v);
+      octets.push(v);
+    }
+    const last = parseIPv4Component(parts[parts.length - 1]);
+    const lastCap = 2 ** (8 * (5 - parts.length));
+    if (last === null || last >= lastCap)
+      return null;
+    for (let shift = 8 * (4 - parts.length); shift >= 0; shift -= 8) {
+      octets.push(last >>> shift & 255);
     }
-    while (nums.length < 4)
-      nums.push(0);
-    return (nums[0] << 24 | nums[1] << 16 | nums[2] << 8 | nums[3]) >>> 0;
+    return (octets[0] << 24 | octets[1] << 16 | octets[2] << 8 | octets[3]) >>> 0;
   }
   function parseIPv6Host(host) {
     if (!host.includes(":"))
@@ -4913,6 +4920,8 @@ var kinetex = (() => {
           __publicField(this, "sessionUsage", /* @__PURE__ */ new Map());
           __publicField(this, "_strict");
           __publicField(this, "_onDroppedHeader");
+          /** Optional CA bundle for origins with self-signed / private-PKI certificates. */
+          __publicField(this, "_ca");
           /** FIX 11: Configurable connect timeout (replaces hardcoded 30 000 ms) */
           __publicField(this, "_connectTimeoutMs");
           /** FIX 11: Configurable per-request stream timeout (replaces hardcoded 30 000 ms) */
@@ -4924,6 +4933,7 @@ var kinetex = (() => {
           this.maxSessions = options.maxSessions ?? 100;
           this._strict = options.strict ?? false;
           this._onDroppedHeader = options.onDroppedHeader;
+          this._ca = options.ca;
           this._connectTimeoutMs = options.connectTimeoutMs ?? 3e4;
           this._requestTimeoutMs = options.requestTimeoutMs ?? 3e4;
         }
@@ -4973,7 +4983,10 @@ var kinetex = (() => {
             }
           }
           const session = await new Promise((resolve, reject) => {
-            const s = http2.connect(origin, { rejectUnauthorized: true });
+            const s = http2.connect(origin, {
+              rejectUnauthorized: true,
+              ...this._ca !== void 0 ? { ca: this._ca } : {}
+            });
             const connectTimeout = setTimeout(() => {
               s.destroy();
               reject(new KinetexError(`HTTP/2 connection to ${origin} timed out`, "ETIMEOUT", {
@@ -5086,30 +5099,28 @@ var kinetex = (() => {
               ":authority": currentUrl.host,
               ...currentReq.headers
             };
-            if (this._strict) {
-              for (const [hName, hValue] of Object.entries(h2ReqHeaders)) {
-                if (hName.startsWith(":"))
-                  continue;
-                const hStr = Array.isArray(hValue) ? hValue.join(", ") : String(hValue);
-                let hasForbidden = false;
-                for (let ci = 0; ci < hStr.length; ci++) {
-                  const code = hStr.charCodeAt(ci);
-                  if (code >= 0 && code <= 8 || code >= 10 && code <= 31 || code === 127) {
-                    hasForbidden = true;
-                    break;
-                  }
+            for (const [hName, hValue] of Object.entries(h2ReqHeaders)) {
+              if (hName.startsWith(":"))
+                continue;
+              const hStr = Array.isArray(hValue) ? hValue.join(", ") : String(hValue);
+              let hasForbidden = false;
+              for (let ci = 0; ci < hStr.length; ci++) {
+                const code = hStr.charCodeAt(ci);
+                if (code >= 0 && code <= 8 || code >= 10 && code <= 31 || code === 127) {
+                  hasForbidden = true;
+                  break;
                 }
-                if (hasForbidden) {
-                  if (this._strict) {
-                    throw new KinetexError(`Strict mode: header "${hName}" contains forbidden control characters`, "EVALIDATION", { request: currentReq });
-                  }
-                  if (this._onDroppedHeader) {
-                    this._onDroppedHeader(hName, hStr);
-                  } else if (typeof console !== "undefined") {
-                    console.warn(`[kinetex] Invalid header dropped (HTTP/2): "${hName}" \u2014 value contains illegal control characters. Pass strictHeaders: true to throw instead.`);
-                  }
-                  delete h2ReqHeaders[hName];
+              }
+              if (hasForbidden) {
+                if (this._strict) {
+                  throw new KinetexError(`Strict mode: header "${hName}" contains forbidden control characters`, "EVALIDATION", { request: currentReq });
                 }
+                if (this._onDroppedHeader) {
+                  this._onDroppedHeader(hName, hStr);
+                } else if (typeof console !== "undefined") {
+                  console.warn(`[kinetex] Invalid header dropped (HTTP/2): "${hName}" \u2014 value contains illegal control characters. Pass strictHeaders: true to throw instead.`);
+                }
+                delete h2ReqHeaders[hName];
               }
             }
             const endStream = !currentReq.body || currentReq.method === "GET" || currentReq.method === "HEAD";
@@ -9515,7 +9526,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
       fetchHeaders["content-type"] = "application/json";
     const controller = new AbortController();
     const timer = config.timeoutMs > 0 ? setTimeout(() => controller.abort(), config.timeoutMs) : null;
-    signal?.addEventListener("abort", () => controller.abort(), { once: true });
+    const onExternalAbort = () => controller.abort();
+    signal?.addEventListener("abort", onExternalAbort, { once: true });
     let response;
     try {
       response = await config.fetch(fetchUrl, {
@@ -9534,6 +9546,7 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
     } finally {
       if (timer)
         clearTimeout(timer);
+      signal?.removeEventListener("abort", onExternalAbort);
     }
     return parseGraphQLResponse(response, req);
   }
@@ -9892,7 +9905,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
           delete headers["content-type"];
           const form = buildMultipartBody(req, uploads);
           const controller = new AbortController();
-          options.signal?.addEventListener("abort", () => controller.abort(), { once: true });
+          const onExternalAbort = () => controller.abort();
+          options.signal?.addEventListener("abort", onExternalAbort, { once: true });
           this.config.onRequest(req);
           let response;
           try {
@@ -9906,6 +9920,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
             const clientErr = new GraphQLClientError(err instanceof Error ? err.message : "Upload network error", "ENETWORK", void 0, req, void 0, err);
             this.config.onError(clientErr, req);
             throw clientErr;
+          } finally {
+            options.signal?.removeEventListener("abort", onExternalAbort);
           }
           const gqlRes = await parseGraphQLResponse(response, req);
           this.config.onResponse(gqlRes, req);
@@ -9936,7 +9952,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
         async batch(requests, options = {}) {
           const headers = await buildHeaders(this.config);
           const controller = new AbortController();
-          options.signal?.addEventListener("abort", () => controller.abort(), { once: true });
+          const onExternalAbort = () => controller.abort();
+          options.signal?.addEventListener("abort", onExternalAbort, { once: true });
           let response;
           try {
             response = await this.config.fetch(this.config.url, {
@@ -9947,6 +9964,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
             });
           } catch (err) {
             throw new GraphQLClientError(err instanceof Error ? err.message : "Batch network error", "ENETWORK", void 0, requests[0], void 0, err);
+          } finally {
+            options.signal?.removeEventListener("abort", onExternalAbort);
           }
           const rawResults = sanitizeParsedJSON(await response.json());
           if (!Array.isArray(rawResults)) {
@@ -11088,11 +11107,12 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
           controller.error(new DOMException("Upload aborted", "AbortError"));
           return;
         }
-        options.signal?.addEventListener("abort", () => {
+        const onUploadAbort = () => {
           reader.cancel("aborted").catch(() => {
           });
           controller.error(new DOMException("Upload aborted", "AbortError"));
-        }, { once: true });
+        };
+        options.signal?.addEventListener("abort", onUploadAbort, { once: true });
         try {
           while (true) {
             const { done, value } = await reader.read();
@@ -11107,6 +11127,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
         } catch (err) {
           tracker.complete();
           controller.error(err);
+        } finally {
+          options.signal?.removeEventListener("abort", onUploadAbort);
         }
       }
     });
@@ -11197,11 +11219,11 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
       });
       throw new DOMException("Stream aborted", "AbortError");
     }
+    const abortHandler = () => {
+      reader.cancel("aborted").catch(() => {
+      });
+    };
     if (options.signal) {
-      const abortHandler = () => {
-        reader.cancel("aborted").catch(() => {
-        });
-      };
       options.signal.addEventListener("abort", abortHandler, { once: true });
     }
     try {
@@ -11214,6 +11236,7 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
       }
     } finally {
       reader.releaseLock();
+      options.signal?.removeEventListener("abort", abortHandler);
     }
     tracker.complete();
     const totalBytes = chunks.reduce((acc, c) => acc + c.byteLength, 0);
@@ -12027,6 +12050,10 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
       __publicField(this, "_openWaiters", []);
       __publicField(this, "_correlations", /* @__PURE__ */ new Map());
       __publicField(this, "_aborted", false);
+      /** Optional external abort signal from config (listener detached on close). */
+      __publicField(this, "_externalSignal", null);
+      /** Bound abort handler for the optional external `cfg.signal` (removed on close). */
+      __publicField(this, "_onExternalAbort", () => this.close(1e3, "AbortSignal aborted"));
       // ── Async iterator ──────────────────────────────────────────────────────
       __publicField(this, "_iterQueue", []);
       __publicField(this, "_iterWaiter", null);
@@ -12090,7 +12117,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
           this._rooms.push({ room: r, joinedAt: 0 });
         }
       }
-      cfg.signal?.addEventListener("abort", () => this.close(1e3, "AbortSignal aborted"), {
+      this._externalSignal = cfg.signal ?? null;
+      this._externalSignal?.addEventListener("abort", this._onExternalAbort, {
         once: true
       });
     }
@@ -12171,6 +12199,8 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
      */
     close(code = 1e3, reason = "Client closed") {
       this._aborted = true;
+      this._externalSignal?.removeEventListener("abort", this._onExternalAbort);
+      this._externalSignal = null;
       this._stopAll();
       for (const w of this._drainWaiters.splice(0))
         w();
@@ -13310,27 +13340,33 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
       }, ms);
       const existing = ctx.request.signal;
       if (existing) {
-        existing.addEventListener("abort", () => {
+        const onExistingAbort = () => {
           clearTimeout(timer);
           controller.abort(existing.reason);
-        }, { once: true });
+        };
+        existing.addEventListener("abort", onExistingAbort, { once: true });
+        ctx.store.set(TIMEOUT_SIGNAL_KEY, { existing, onExistingAbort });
       }
       ctx.request = { ...ctx.request, signal: controller.signal };
       ctx.store.set(TIMEOUT_TIMER_KEY, timer);
     };
-    const responseInterceptor = (ctx) => {
+    const cleanupTimeout = (ctx) => {
       const timer = ctx.store.get(TIMEOUT_TIMER_KEY);
       if (timer) {
         clearTimeout(timer);
         ctx.store.delete(TIMEOUT_TIMER_KEY);
       }
+      const merged = ctx.store.get(TIMEOUT_SIGNAL_KEY);
+      if (merged) {
+        merged.existing.removeEventListener("abort", merged.onExistingAbort);
+        ctx.store.delete(TIMEOUT_SIGNAL_KEY);
+      }
+    };
+    const responseInterceptor = (ctx) => {
+      cleanupTimeout(ctx);
     };
     const errorInterceptor = (ctx) => {
-      const timer = ctx.store.get(TIMEOUT_TIMER_KEY);
-      if (timer) {
-        clearTimeout(timer);
-        ctx.store.delete(TIMEOUT_TIMER_KEY);
-      }
+      cleanupTimeout(ctx);
     };
     return {
       id: "timeout",
@@ -13340,6 +13376,7 @@ ${text}`, "ENETWORK", void 0, req, void 0, new Error(`HTTP ${response.status}`))
     };
   }
   var TIMEOUT_TIMER_KEY = /* @__PURE__ */ Symbol("timeoutTimer");
+  var TIMEOUT_SIGNAL_KEY = /* @__PURE__ */ Symbol("timeoutSignal");
   var TimeoutError2 = class extends Error {
     constructor(message, timeoutMs) {
       super(message);