@typedb/driver-http 3.12.2 → 3.13.6

package/dist/index.cjs

@@ -9,10 +9,11 @@ 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;
   }
@@ -23,14 +24,23 @@ function resolveOrigin(params, primaryAddress) {
     for (const addr of params.addresses) {
       if (hostPortFromOrigin(addr) === target) return addr;
     }
+    return originWithScheme(primaryAddress, params.addresses[0]);
   } else {
     for (const ta of params.translatedAddresses) {
       if (hostPortFromOrigin(ta.internal) === target || hostPortFromOrigin(ta.external) === target) {
         return ta.external;
       }
     }
+    return originWithScheme(primaryAddress, params.translatedAddresses[0].external);
+  }
+}
+function originWithScheme(address, referenceOrigin) {
+  if (SCHEME_PREFIX_REGEX.test(address)) return address;
+  try {
+    return `${new URL(referenceOrigin).protocol}//${address}`;
+  } catch (e2) {
+    return `https://${address}`;
   }
-  return primaryAddress;
 }
 function allOrigins(params) {
   if (isBasicParams(params)) return params.addresses;
@@ -190,6 +200,7 @@ var TypeDBHttpDriver = class {
     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;
@@ -200,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;
@@ -219,7 +231,7 @@ var TypeDBHttpDriver = class {
     let resp;
     try {
       resp = await fetch(url, { method, body: bodyString, headers });
-    } catch (e2) {
+    } catch (e3) {
       return null;
     }
     if (resp.status === HTTP_UNAUTHORIZED) {
@@ -228,7 +240,7 @@ var TypeDBHttpDriver = class {
       headers = this.authHeaders(tokenResp.ok.token, options);
       try {
         resp = await fetch(url, { method, body: bodyString, headers });
-      } catch (e3) {
+      } catch (e4) {
         return null;
       }
     }
@@ -244,7 +256,7 @@ var TypeDBHttpDriver = class {
     let json;
     try {
       json = await resp.json();
-    } catch (e4) {
+    } catch (e5) {
       return false;
     }
     if (!isMisdirectedError(json)) return false;
@@ -253,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;
@@ -297,7 +308,7 @@ var TypeDBHttpDriver = class {
     let resp;
     try {
       resp = await fetch(url, { method: "POST", body: JSON.stringify(body), headers: { "Content-Type": "application/json" } });
-    } catch (e5) {
+    } catch (e6) {
       return driverError("HDR2", `Cannot connect to server at ${this.currentOrigin}`);
     }
     const json = await this.jsonOrNull(resp);
@@ -311,7 +322,7 @@ var TypeDBHttpDriver = class {
   async jsonOrNull(resp) {
     try {
       return await resp.json();
-    } catch (e6) {
+    } catch (e7) {
       return null;
     }
   }

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 an advertised primaryAddress (a full origin) to the matching configured address, else itself. */
 declare function resolveOrigin(params: DriverParams, primaryAddress: string): string;
 /** Return all configured origins for connection error fallback. */
 declare function allOrigins(params: DriverParams): string[];
@@ -125,7 +123,7 @@ type ConjunctionIndex$1 = number;
 type VariableInfo = {
     name: string | null;
 };
-type ConstraintAny = ConstraintIsa | ConstraintIsaExact | ConstraintHas | ConstraintLinks | ConstraintSub | ConstraintSubExact | ConstraintOwns | ConstraintRelates | ConstraintPlays | ConstraintExpression | ConstraintFunction | ConstraintComparison | ConstraintIs | ConstraintIid | ConstraintKind | ConstraintValue | ConstraintLabel | ConstraintOr | ConstraintNot | ConstraintTry;
+type ConstraintAny = ConstraintIsa | ConstraintIsaExact | ConstraintHas | ConstraintLinks | ConstraintSub | ConstraintSubExact | ConstraintOwns | ConstraintRelates | ConstraintPlays | ConstraintExpression | ConstraintFunction | ConstraintComparison | ConstraintIs | ConstraintIid | ConstraintDeleteConcepts | ConstraintKind | ConstraintValue | ConstraintLabel | ConstraintOr | ConstraintNot | ConstraintTry;
 type ConstraintSpan = {
     begin: number;
     end: number;
@@ -218,6 +216,11 @@ interface ConstraintIid {
     concept: ConstraintVertexVariable;
     iid: string;
 }
+interface ConstraintDeleteConcepts {
+    tag: "deleteConcepts";
+    textSpan: ConstraintSpan;
+    variables: ConstraintVertexVariable[];
+}
 interface ConstraintLabel {
     tag: "label";
     textSpan: ConstraintSpan;
@@ -535,4 +538,4 @@ type GivenRows = {
     [varName: string]: GivenRowEntry;
 }[];
 
-export { type AnalyzeOptions, type AnalyzeResponse, type AnalyzedConjunction, type AnalyzedFetch, type AnalyzedFunction, type AnalyzedPipeline, type Answer, type AnswerType, type ApiError, type ApiErrorResponse, type ApiOkResponse, type ApiResponse, type Attribute, type AttributeType, type Concept, type ConceptDocument, type ConceptDocumentsQueryResponse, type ConceptRow, type ConceptRowAnswer, type ConceptRowsQueryResponse, type ConceptRowsQueryResponseLegacy, type ConjunctionAnnotations, type ConstraintAny, type ConstraintComparison, type ConstraintExpression, type ConstraintExpressionLegacy, type ConstraintFunction, type ConstraintHas, type ConstraintIid, type ConstraintIs, type ConstraintIsa, type ConstraintIsaExact, type ConstraintKind, type ConstraintLabel, type ConstraintLinks, type ConstraintLinksLegacy, type ConstraintNot, type ConstraintOr, type ConstraintOwns, type ConstraintPlays, type ConstraintRelates, type ConstraintSpan, type ConstraintSub, type ConstraintSubExact, type ConstraintTry, type ConstraintValue, type ConstraintVertexAny, type ConstraintVertexLabel, type ConstraintVertexNamedRole, type ConstraintVertexValue, type ConstraintVertexVariable, type Database, type DatabasesListResponse, type Distribution, type DriverParams, type DriverParamsBasic, type DriverParamsTranslated, type EdgeKind, type Entity, type EntityType, type FetchAnnotationFieldEntry, type FunctionReturnStructure, type FunctionSingleReturnSelector, type Given, type GivenRowEntry, type GivenRows, type InstantiableType, type MisdirectedError, type OkQueryResponse, type PipelineStage, type QueryConjunctionLegacy, type QueryOptions, type QueryResponse, type QueryResponseBase, type QueryStructureLegacy, type QueryType, type Reducer, type Relation, type RelationType, type ReplicationRole, type ReplicationStatus, type RoleType, type Server, type ServersListResponse, type SignInResponse, type ThingKind, type TransactionOpenResponse, type TransactionOptions, type TransactionType, type TranslatedAddress, type Type, TypeDBHttpDriver, type TypeKind, type User, type UsersListResponse, type Value, type ValueKind, type ValueType, type VariableAnnotations, type VariableId, type VariableInfo, type VersionResponse, allOrigins, driverError, getVariableName, hostPortFromOrigin, isApiError, isApiErrorResponse, isBasicParams, isMisdirectedError, isOkResponse, isQueryResponseLegacy, isTranslatedParams, remoteOrigin, resolveOrigin };
+export { type AnalyzeOptions, type AnalyzeResponse, type AnalyzedConjunction, type AnalyzedFetch, type AnalyzedFunction, type AnalyzedPipeline, type Answer, type AnswerType, type ApiError, type ApiErrorResponse, type ApiOkResponse, type ApiResponse, type Attribute, type AttributeType, type Concept, type ConceptDocument, type ConceptDocumentsQueryResponse, type ConceptRow, type ConceptRowAnswer, type ConceptRowsQueryResponse, type ConceptRowsQueryResponseLegacy, type ConjunctionAnnotations, type ConstraintAny, type ConstraintComparison, type ConstraintDeleteConcepts, type ConstraintExpression, type ConstraintExpressionLegacy, type ConstraintFunction, type ConstraintHas, type ConstraintIid, type ConstraintIs, type ConstraintIsa, type ConstraintIsaExact, type ConstraintKind, type ConstraintLabel, type ConstraintLinks, type ConstraintLinksLegacy, type ConstraintNot, type ConstraintOr, type ConstraintOwns, type ConstraintPlays, type ConstraintRelates, type ConstraintSpan, type ConstraintSub, type ConstraintSubExact, type ConstraintTry, type ConstraintValue, type ConstraintVertexAny, type ConstraintVertexLabel, type ConstraintVertexNamedRole, type ConstraintVertexValue, type ConstraintVertexVariable, type Database, type DatabasesListResponse, type Distribution, type DriverParams, type DriverParamsBasic, type DriverParamsTranslated, type EdgeKind, type Entity, type EntityType, type FetchAnnotationFieldEntry, type FunctionReturnStructure, type FunctionSingleReturnSelector, type Given, type GivenRowEntry, type GivenRows, type InstantiableType, type MisdirectedError, type OkQueryResponse, type PipelineStage, type QueryConjunctionLegacy, type QueryOptions, type QueryResponse, type QueryResponseBase, type QueryStructureLegacy, type QueryType, type Reducer, type Relation, type RelationType, type ReplicationRole, type ReplicationStatus, type RoleType, type Server, type ServersListResponse, type SignInResponse, type ThingKind, type TransactionOpenResponse, type TransactionOptions, type TransactionType, type TranslatedAddress, type Type, TypeDBHttpDriver, type TypeKind, type User, type UsersListResponse, type Value, type ValueKind, type ValueType, type VariableAnnotations, type VariableId, type VariableInfo, type VersionResponse, allOrigins, driverError, getVariableName, hostPortFromOrigin, isApiError, isApiErrorResponse, isBasicParams, isMisdirectedError, isOkResponse, isQueryResponseLegacy, isTranslatedParams, remoteOrigin, resolveOrigin };

package/dist/index.mjs

@@ -9,10 +9,11 @@ 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;
   }
@@ -23,14 +24,23 @@ function resolveOrigin(params, primaryAddress) {
     for (const addr of params.addresses) {
       if (hostPortFromOrigin(addr) === target) return addr;
     }
+    return originWithScheme(primaryAddress, params.addresses[0]);
   } else {
     for (const ta of params.translatedAddresses) {
       if (hostPortFromOrigin(ta.internal) === target || hostPortFromOrigin(ta.external) === target) {
         return ta.external;
       }
     }
+    return originWithScheme(primaryAddress, params.translatedAddresses[0].external);
+  }
+}
+function originWithScheme(address, referenceOrigin) {
+  if (SCHEME_PREFIX_REGEX.test(address)) return address;
+  try {
+    return `${new URL(referenceOrigin).protocol}//${address}`;
+  } catch {
+    return `https://${address}`;
   }
-  return primaryAddress;
 }
 function allOrigins(params) {
   if (isBasicParams(params)) return params.addresses;
@@ -190,6 +200,7 @@ var TypeDBHttpDriver = class {
     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;
@@ -200,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;
@@ -253,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;

package/package.json

@@ -1 +1 @@
-{"name": "@typedb/driver-http", "version": "3.12.2", "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.13.6", "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"}}