@typedb/driver-http 3.12.1 → 3.12.3

package/dist/index.cjs

@@ -9,35 +9,37 @@ function remoteOrigin(params) {
   if (isBasicParams(params)) return `${params.addresses[0]}`;
   else return `${params.translatedAddresses[0].external}`;
 }
+var SCHEME_PREFIX_REGEX = /^[a-z][a-z0-9+.-]*:\/\//i;
 function hostPortFromOrigin(origin) {
+  if (!SCHEME_PREFIX_REGEX.test(origin)) return origin;
   try {
-    const url = new URL(origin);
-    return url.host;
+    return new URL(origin).host;
   } catch (e) {
     return origin;
   }
 }
 function resolveOrigin(params, primaryAddress) {
+  const target = hostPortFromOrigin(primaryAddress);
   if (isBasicParams(params)) {
     for (const addr of params.addresses) {
-      if (hostPortFromOrigin(addr) === primaryAddress) return addr;
+      if (hostPortFromOrigin(addr) === target) return addr;
     }
-    return deriveOriginWithScheme(params.addresses[0], primaryAddress);
+    return originWithScheme(primaryAddress, params.addresses[0]);
   } else {
     for (const ta of params.translatedAddresses) {
-      if (hostPortFromOrigin(ta.internal) === primaryAddress || hostPortFromOrigin(ta.external) === primaryAddress) {
+      if (hostPortFromOrigin(ta.internal) === target || hostPortFromOrigin(ta.external) === target) {
         return ta.external;
       }
     }
-    return deriveOriginWithScheme(params.translatedAddresses[0].external, primaryAddress);
+    return originWithScheme(primaryAddress, params.translatedAddresses[0].external);
   }
 }
-function deriveOriginWithScheme(referenceUrl, hostPort) {
+function originWithScheme(address, referenceOrigin) {
+  if (SCHEME_PREFIX_REGEX.test(address)) return address;
   try {
-    const url = new URL(referenceUrl);
-    return `${url.protocol}//${hostPort}`;
+    return `${new URL(referenceOrigin).protocol}//${address}`;
   } catch (e2) {
-    return `https://${hostPort}`;
+    return `https://${address}`;
   }
 }
 function allOrigins(params) {
@@ -73,7 +75,9 @@ function getVariableName(structure, variable) {
 // ../../../../../../../../../execroot/_main/bazel-out/k8-opt/bin/http-ts/src/index.ts
 var HTTP_UNAUTHORIZED = 401;
 var HTTP_MISDIRECTED = 421;
-var TRANSIENT_SIGNIN_ERROR_CODES = /* @__PURE__ */ new Set(["HDR2", "SRV14"]);
+var TRANSIENT_SIGNIN_ERROR_CODES = /* @__PURE__ */ new Set(["HDR2", "SRV14", "CSV8", "CSV9"]);
+var PRIMARY_FAILOVER_RETRIES = 3;
+var PRIMARY_SELECTION_WAIT_MS = 2e3;
 function isApiErrResp(value) {
   return value !== null && "err" in value;
 }
@@ -188,6 +192,15 @@ var TypeDBHttpDriver = class {
     }
   }
   async apiReq(method, path, body, options) {
+    let result = await this.apiReqOnce(method, path, body, options);
+    for (let retry = 0; retry < PRIMARY_FAILOVER_RETRIES && result.status === HTTP_MISDIRECTED; retry++) {
+      await new Promise((resolve) => setTimeout(resolve, PRIMARY_SELECTION_WAIT_MS));
+      result = await this.apiReqOnce(method, path, body, options);
+    }
+    return result;
+  }
+  async apiReqOnce(method, path, body, options) {
+    const triedOrigins = /* @__PURE__ */ new Set([this.currentOrigin]);
     const initial = await this.tryApiReq(method, path, body, options);
     if (isApiErrResp(initial)) return initial;
     let result = initial;
@@ -198,7 +211,8 @@ var TypeDBHttpDriver = class {
     }
     if (result === null || !result.ok) {
       const startOrigin = this.currentOrigin;
-      const fallback = await this.tryFallbackOrigins(method, path, body, options);
+      triedOrigins.add(startOrigin);
+      const fallback = await this.tryFallbackOrigins(method, path, body, options, triedOrigins);
       if (isApiErrResp(fallback)) return fallback;
       if (fallback !== null && (result === null || fallback.ok)) {
         result = fallback;
@@ -251,12 +265,11 @@ var TypeDBHttpDriver = class {
     this.switchOrigin(newOrigin);
     return true;
   }
-  async tryFallbackOrigins(method, path, body, options) {
+  async tryFallbackOrigins(method, path, body, options, triedOrigins) {
     const origins = allOrigins(this.params);
-    const failedOrigin = this.currentOrigin;
     let lastError = null;
     for (const origin of origins) {
-      if (origin === failedOrigin) continue;
+      if (triedOrigins.has(origin)) continue;
       this.switchOrigin(origin);
       const initial = await this.tryApiReq(method, path, body, options);
       if (initial === null) continue;
@@ -299,19 +312,19 @@ var TypeDBHttpDriver = class {
       return driverError("HDR2", `Cannot connect to server at ${this.currentOrigin}`);
     }
     const json = await this.jsonOrNull(resp);
-    if (resp.ok) {
+    if (resp.ok && typeof _optionalChain([json, 'optionalAccess', _5 => _5.token]) === "string") {
       this.token = json.token;
       return { ok: json };
     }
     if (isApiError(json)) return { err: json, status: resp.status };
-    throw resp;
+    return driverError("HDR2", `Unexpected signin response from ${this.currentOrigin} (HTTP ${resp.status})`);
   }
   async jsonOrNull(resp) {
-    const contentLengthRaw = resp.headers.get("Content-Length");
-    if (!contentLengthRaw) return null;
-    const contentLength = parseInt(contentLengthRaw || "");
-    if (isNaN(contentLength)) throw `Received invalid Content-Length header: ${contentLengthRaw}`;
-    return contentLength > 0 ? await resp.json() : null;
+    try {
+      return await resp.json();
+    } catch (e7) {
+      return null;
+    }
   }
   async stringOrNull(resp) {
     const contentLengthRaw = resp.headers.get("Content-Length");

package/dist/index.d.ts

@@ -16,9 +16,7 @@ type DriverParams = DriverParamsBasic | DriverParamsTranslated;
 declare function isBasicParams(params: DriverParams): params is DriverParamsBasic;
 declare function isTranslatedParams(params: DriverParams): params is DriverParamsTranslated;
 declare function remoteOrigin(params: DriverParams): string;
-/** Extract host:port from a URL string. "https://127.0.0.1:18000" → "127.0.0.1:18000" */
 declare function hostPortFromOrigin(origin: string): string;
-/** Resolve a bare primaryAddress (host:port) to a full URL using configured params. */
 declare function resolveOrigin(params: DriverParams, primaryAddress: string): string;
 /** Return all configured origins for connection error fallback. */
 declare function allOrigins(params: DriverParams): string[];
@@ -498,6 +496,7 @@ declare class TypeDBHttpDriver {
     private jsonApiReq;
     private stringApiReq;
     private apiReq;
+    private apiReqOnce;
     private tryApiReq;
     private followMisdirected;
     private switchToRedirectTarget;

package/dist/index.mjs

@@ -9,35 +9,37 @@ function remoteOrigin(params) {
   if (isBasicParams(params)) return `${params.addresses[0]}`;
   else return `${params.translatedAddresses[0].external}`;
 }
+var SCHEME_PREFIX_REGEX = /^[a-z][a-z0-9+.-]*:\/\//i;
 function hostPortFromOrigin(origin) {
+  if (!SCHEME_PREFIX_REGEX.test(origin)) return origin;
   try {
-    const url = new URL(origin);
-    return url.host;
+    return new URL(origin).host;
   } catch {
     return origin;
   }
 }
 function resolveOrigin(params, primaryAddress) {
+  const target = hostPortFromOrigin(primaryAddress);
   if (isBasicParams(params)) {
     for (const addr of params.addresses) {
-      if (hostPortFromOrigin(addr) === primaryAddress) return addr;
+      if (hostPortFromOrigin(addr) === target) return addr;
     }
-    return deriveOriginWithScheme(params.addresses[0], primaryAddress);
+    return originWithScheme(primaryAddress, params.addresses[0]);
   } else {
     for (const ta of params.translatedAddresses) {
-      if (hostPortFromOrigin(ta.internal) === primaryAddress || hostPortFromOrigin(ta.external) === primaryAddress) {
+      if (hostPortFromOrigin(ta.internal) === target || hostPortFromOrigin(ta.external) === target) {
         return ta.external;
       }
     }
-    return deriveOriginWithScheme(params.translatedAddresses[0].external, primaryAddress);
+    return originWithScheme(primaryAddress, params.translatedAddresses[0].external);
   }
 }
-function deriveOriginWithScheme(referenceUrl, hostPort) {
+function originWithScheme(address, referenceOrigin) {
+  if (SCHEME_PREFIX_REGEX.test(address)) return address;
   try {
-    const url = new URL(referenceUrl);
-    return `${url.protocol}//${hostPort}`;
+    return `${new URL(referenceOrigin).protocol}//${address}`;
   } catch {
-    return `https://${hostPort}`;
+    return `https://${address}`;
   }
 }
 function allOrigins(params) {
@@ -73,7 +75,9 @@ function getVariableName(structure, variable) {
 // ../../../../../../../../../execroot/_main/bazel-out/k8-opt/bin/http-ts/src/index.ts
 var HTTP_UNAUTHORIZED = 401;
 var HTTP_MISDIRECTED = 421;
-var TRANSIENT_SIGNIN_ERROR_CODES = /* @__PURE__ */ new Set(["HDR2", "SRV14"]);
+var TRANSIENT_SIGNIN_ERROR_CODES = /* @__PURE__ */ new Set(["HDR2", "SRV14", "CSV8", "CSV9"]);
+var PRIMARY_FAILOVER_RETRIES = 3;
+var PRIMARY_SELECTION_WAIT_MS = 2e3;
 function isApiErrResp(value) {
   return value !== null && "err" in value;
 }
@@ -188,6 +192,15 @@ var TypeDBHttpDriver = class {
     }
   }
   async apiReq(method, path, body, options) {
+    let result = await this.apiReqOnce(method, path, body, options);
+    for (let retry = 0; retry < PRIMARY_FAILOVER_RETRIES && result.status === HTTP_MISDIRECTED; retry++) {
+      await new Promise((resolve) => setTimeout(resolve, PRIMARY_SELECTION_WAIT_MS));
+      result = await this.apiReqOnce(method, path, body, options);
+    }
+    return result;
+  }
+  async apiReqOnce(method, path, body, options) {
+    const triedOrigins = /* @__PURE__ */ new Set([this.currentOrigin]);
     const initial = await this.tryApiReq(method, path, body, options);
     if (isApiErrResp(initial)) return initial;
     let result = initial;
@@ -198,7 +211,8 @@ var TypeDBHttpDriver = class {
     }
     if (result === null || !result.ok) {
       const startOrigin = this.currentOrigin;
-      const fallback = await this.tryFallbackOrigins(method, path, body, options);
+      triedOrigins.add(startOrigin);
+      const fallback = await this.tryFallbackOrigins(method, path, body, options, triedOrigins);
       if (isApiErrResp(fallback)) return fallback;
       if (fallback !== null && (result === null || fallback.ok)) {
         result = fallback;
@@ -251,12 +265,11 @@ var TypeDBHttpDriver = class {
     this.switchOrigin(newOrigin);
     return true;
   }
-  async tryFallbackOrigins(method, path, body, options) {
+  async tryFallbackOrigins(method, path, body, options, triedOrigins) {
     const origins = allOrigins(this.params);
-    const failedOrigin = this.currentOrigin;
     let lastError = null;
     for (const origin of origins) {
-      if (origin === failedOrigin) continue;
+      if (triedOrigins.has(origin)) continue;
       this.switchOrigin(origin);
       const initial = await this.tryApiReq(method, path, body, options);
       if (initial === null) continue;
@@ -299,19 +312,19 @@ var TypeDBHttpDriver = class {
       return driverError("HDR2", `Cannot connect to server at ${this.currentOrigin}`);
     }
     const json = await this.jsonOrNull(resp);
-    if (resp.ok) {
+    if (resp.ok && typeof json?.token === "string") {
       this.token = json.token;
       return { ok: json };
     }
     if (isApiError(json)) return { err: json, status: resp.status };
-    throw resp;
+    return driverError("HDR2", `Unexpected signin response from ${this.currentOrigin} (HTTP ${resp.status})`);
   }
   async jsonOrNull(resp) {
-    const contentLengthRaw = resp.headers.get("Content-Length");
-    if (!contentLengthRaw) return null;
-    const contentLength = parseInt(contentLengthRaw || "");
-    if (isNaN(contentLength)) throw `Received invalid Content-Length header: ${contentLengthRaw}`;
-    return contentLength > 0 ? await resp.json() : null;
+    try {
+      return await resp.json();
+    } catch {
+      return null;
+    }
   }
   async stringOrNull(resp) {
     const contentLengthRaw = resp.headers.get("Content-Length");

package/package.json

@@ -1 +1 @@
-{"name": "@typedb/driver-http", "version": "3.12.1", "description": "TypeDB HTTP Driver", "author": "TypeDB Community <community@typedb.com>", "license": "Apache-2.0", "homepage": "https://typedb.com", "repository": {"type": "git", "url": "https://github.com/typedb/typedb-driver"}, "bugs": {"url": "https://github.com/typedb/typedb-driver/issues"}, "keywords": ["database", "typedb"], "main": "dist/index.cjs", "module": "dist/index.mjs", "types": "dist/index.d.ts", "type": "module", "exports": {".": {"types": "./dist/index.d.ts", "import": "./dist/index.mjs", "require": "./dist/index.cjs"}}, "scripts": {"build:dev": "tsc", "build": "tsup", "test": "cucumber-js", "docs": "typedoc"}, "packageManager": "pnpm@8.15.9", "packageConfig": {"access": "public"}, "devDependencies": {"@cucumber/cucumber": "9.0.0", "@types/node": "24.0.12", "tsup": "8.5.0", "typedoc": "^0.28.7", "typescript": "5.8.3"}}
+{"name": "@typedb/driver-http", "version": "3.12.3", "description": "TypeDB HTTP Driver", "author": "TypeDB Community <community@typedb.com>", "license": "Apache-2.0", "homepage": "https://typedb.com", "repository": {"type": "git", "url": "https://github.com/typedb/typedb-driver"}, "bugs": {"url": "https://github.com/typedb/typedb-driver/issues"}, "keywords": ["database", "typedb"], "main": "dist/index.cjs", "module": "dist/index.mjs", "types": "dist/index.d.ts", "type": "module", "exports": {".": {"types": "./dist/index.d.ts", "import": "./dist/index.mjs", "require": "./dist/index.cjs"}}, "scripts": {"build:dev": "tsc", "build": "tsup", "test": "cucumber-js", "docs": "typedoc"}, "packageManager": "pnpm@8.15.9", "packageConfig": {"access": "public"}, "devDependencies": {"@cucumber/cucumber": "9.0.0", "@types/node": "24.0.12", "tsup": "8.5.0", "typedoc": "^0.28.7", "typescript": "5.8.3"}}