@datastax/astra-db-ts - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1-0

dist/api/devops-api-http-client.js

@@ -134,3 +134,3 @@ "use strict";
         timeout ?? (timeout = this.fetchCtx.maxTimeMS ?? (12 * 60 * 1000));
-        return new timeout_managers_1.TimeoutManager(timeout, (info) => new errors_1.DevOpsAPITimeoutError(info.url, timeout));
+        return new timeout_managers_1.TimeoutManager(timeout, (url) => new errors_1.DevOpsAPITimeoutError(url, timeout));
     }
@@ -137,0 +137,0 @@ }

dist/api/http-client.js

@@ -30,3 +30,2 @@ "use strict";
 const constants_1 = require("../api/constants");
-const fetch_h2_1 = require("fetch-h2");
 /**
@@ -86,3 +85,3 @@ * @internal
         if (info.timeoutManager.msRemaining <= 0) {
-            throw info.timeoutManager.mkTimeoutError(info);
+            throw info.timeoutManager.mkTimeoutError(info.url);
         }
@@ -94,18 +93,8 @@ const params = info.params ?? {};
             : info.url;
-        try {
-            const resp = await this.fetchCtx.preferred.fetch(url, {
-                body: info.data,
-                method: info.method,
-                timeout: info.timeoutManager.msRemaining,
-                headers: this.baseHeaders,
-            });
-            resp.body = await resp.text();
-            return resp;
-        }
-        catch (e) {
-            if (e instanceof fetch_h2_1.TimeoutError) {
-                throw info.timeoutManager.mkTimeoutError(info);
-            }
-            throw e;
-        }
+        return await this.fetchCtx.preferred.fetch(url, {
+            body: info.data,
+            method: info.method,
+            timeoutManager: info.timeoutManager,
+            headers: this.baseHeaders,
+        });
     }
@@ -112,0 +101,0 @@ }

dist/client/data-api-client.js

@@ -27,5 +27,2 @@ "use strict";
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _DataAPIClient_options, _a;
@@ -36,6 +33,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const astra_admin_1 = require("../devops/astra-admin");
-const events_1 = __importDefault(require("events"));
+const events_1 = require("events");
 const utils_1 = require("../data-api/utils");
-const fetch_h2_1 = require("fetch-h2");
-const api_1 = require("../api");
+const fetch_native_fetcher_1 = require("../api/fetch-native-fetcher");
 /**
@@ -48,3 +44,3 @@ * The base class for the {@link DataAPIClient} event emitter to make it properly typed.
  */
-exports.DataAPIClientEventEmitterBase = events_1.default;
+exports.DataAPIClientEventEmitterBase = events_1.EventEmitter;
 /**
@@ -123,31 +119,5 @@ * The main entrypoint into working with the Data API. It sits at the top of the
         validateRootOpts(options);
-        const baseCtxOptions = {
-            userAgent: (0, api_1.buildUserAgent)(options?.caller),
-            overwriteUserAgent: true,
-            http1: {
-                keepAlive: options?.httpOptions?.http1?.keepAlive,
-                keepAliveMsecs: options?.httpOptions?.http1?.keepAliveMS,
-                maxSockets: options?.httpOptions?.http1?.maxSockets,
-                maxFreeSockets: options?.httpOptions?.http1?.maxFreeSockets,
-            },
-        };
-        const http1Ctx = (0, fetch_h2_1.context)({
-            ...baseCtxOptions,
-            httpsProtocols: ['http1'],
-        });
-        const preferHttp2 = options?.httpOptions?.preferHttp2 ?? getDeprecatedPrefersHttp2(options) ?? true;
-        const preferredCtx = (preferHttp2)
-            ? (0, fetch_h2_1.context)(baseCtxOptions)
-            : http1Ctx;
         __classPrivateFieldSet(this, _DataAPIClient_options, {
             ...options,
-            fetchCtx: {
-                http1: http1Ctx,
-                preferred: preferredCtx,
-                preferredType: (preferHttp2)
-                    ? 'http2'
-                    : 'http1',
-                closed: { ref: false },
-                maxTimeMS: options?.httpOptions?.maxTimeMS,
-            },
+            fetchCtx: buildFetchCtx(options || undefined),
             dbOptions: {
@@ -227,3 +197,49 @@ monitorCommands: false,
 _DataAPIClient_options = new WeakMap(), _a = Symbol.asyncDispose;
-// Shuts the linter up about 'preferHttp2' not being deprecated
+function getDefaultHttpClient() {
+    const isNode = globalThis.process?.release?.name === 'node';
+    const isBun = !!globalThis['Bun'] || !!globalThis.process?.versions?.bun;
+    const isDeno = !!globalThis['Deno'];
+    return (isNode && !isBun && !isDeno)
+        ? 'default'
+        : 'fetch';
+}
+function buildFetchCtx(options) {
+    const clientType = (options?.httpOptions)
+        ? options.httpOptions.client
+        : getDefaultHttpClient();
+    const preferHttp2 = (options?.httpOptions && options.httpOptions.client !== 'fetch')
+        ? options.httpOptions.preferHttp2 ?? getDeprecatedPrefersHttp2(options) ?? true
+        : false;
+    const [http1Ctx, preferredCtx] = (() => {
+        if (clientType !== 'fetch') {
+            try {
+                // Complicated expression to stop Next.js and such from tracing require and trying to load the fetch-h2 client
+                const [indirectRequire] = [require].map(x => Math.random() > 10 ? null : x);
+                const { FetchH2Fetcher } = indirectRequire('../api/fetch-h2-fetcher');
+                const http1Ctx = new FetchH2Fetcher(options, false);
+                const preferredCtx = (preferHttp2)
+                    ? new FetchH2Fetcher(options, true)
+                    : http1Ctx;
+                return [http1Ctx, preferredCtx];
+            }
+            catch (e) {
+                throw new Error('Error loading the fetch-h2 client for the DataAPIClient... try setting httpOptions.client to \'fetch\'');
+            }
+        }
+        else {
+            const deceiver = new fetch_native_fetcher_1.FetchNativeFetcher(options);
+            return [deceiver, deceiver];
+        }
+    })();
+    return {
+        http1: http1Ctx,
+        preferred: preferredCtx,
+        preferredType: (preferHttp2)
+            ? 'http2'
+            : 'http1',
+        closed: { ref: false },
+        maxTimeMS: options?.httpOptions?.maxTimeMS,
+    };
+}
+// Shuts the linter up about 'preferHttp2' being deprecated
 function getDeprecatedPrefersHttp2(opts) {
@@ -248,10 +264,17 @@ return opts?.['preferHttp2'];
     }
-    (0, utils_1.validateOption)('preferHttp2 option', opts.preferHttp2, 'boolean');
+    (0, utils_1.validateOption)('client option', opts.client, 'string', (client) => {
+        if (client !== 'fetch' && client !== 'default') {
+            throw new Error('Invalid httpOptions.client; expected \'fetch\' or \'default\'');
+        }
+    });
     (0, utils_1.validateOption)('maxTimeMS option', opts.maxTimeMS, 'number');
-    (0, utils_1.validateOption)('http1 options', opts.http1, 'object', (http1) => {
-        (0, utils_1.validateOption)('http1.keepAlive option', http1.keepAlive, 'boolean');
-        (0, utils_1.validateOption)('http1.keepAliveMS option', http1.keepAliveMS, 'number');
-        (0, utils_1.validateOption)('http1.maxSockets option', http1.maxSockets, 'number');
-        (0, utils_1.validateOption)('http1.maxFreeSockets option', http1.maxFreeSockets, 'number');
-    });
+    if (opts.client !== 'fetch') {
+        (0, utils_1.validateOption)('preferHttp2 option', opts.preferHttp2, 'boolean');
+        (0, utils_1.validateOption)('http1 options', opts.http1, 'object', (http1) => {
+            (0, utils_1.validateOption)('http1.keepAlive option', http1.keepAlive, 'boolean');
+            (0, utils_1.validateOption)('http1.keepAliveMS option', http1.keepAliveMS, 'number');
+            (0, utils_1.validateOption)('http1.maxSockets option', http1.maxSockets, 'number');
+            (0, utils_1.validateOption)('http1.maxFreeSockets option', http1.maxFreeSockets, 'number');
+        });
+    }
 }
@@ -258,0 +281,0 @@ function validateCaller(caller) {

dist/data-api/errors.js

@@ -17,3 +17,2 @@ "use strict";
 exports.mkRespErrorFromResponses = exports.mkRespErrorFromResponse = exports.BulkWriteError = exports.UpdateManyError = exports.DeleteManyError = exports.InsertManyError = exports.CumulativeDataAPIError = exports.DataAPIResponseError = exports.CollectionAlreadyExistsError = exports.CollectionNotFoundError = exports.CursorIsStartedError = exports.TooManyDocumentsToCountError = exports.DataAPITimeoutError = exports.DataAPIHttpError = exports.DataAPIError = void 0;
-const utils_1 = require("../api/utils");
 /**
@@ -74,3 +73,3 @@ * An abstract class representing *some* exception that occurred related to the Data API. This is the base class for all
         this.body = resp.body;
-        this.raw = (0, utils_1.toCuratedApiResponse)(resp);
+        this.raw = resp;
         this.name = 'DataAPIHttpError';
@@ -77,0 +76,0 @@ }

dist/devops/astra-admin.js

@@ -202,3 +202,3 @@ "use strict";
         }, {
-            id: (resp) => resp.headers.get('location'),
+            id: (resp) => resp.headers.location,
             target: 'ACTIVE',
@@ -209,3 +209,3 @@ legalStates: ['INITIALIZING', 'PENDING'],
         });
-        const db = (0, db_1.mkDb)(__classPrivateFieldGet(this, _AstraAdmin_defaultOpts, "f"), resp.headers.get('location'), definition.region, { ...options?.dbOptions, namespace: definition.keyspace });
+        const db = (0, db_1.mkDb)(__classPrivateFieldGet(this, _AstraAdmin_defaultOpts, "f"), resp.headers.location, definition.region, { ...options?.dbOptions, namespace: definition.keyspace });
         return db.admin(__classPrivateFieldGet(this, _AstraAdmin_defaultOpts, "f").adminOptions);
@@ -212,0 +212,0 @@ }

dist/devops/errors.js

@@ -17,3 +17,2 @@ "use strict";
 exports.DevOpsUnexpectedStateError = exports.DevOpsAPIResponseError = exports.DevOpsAPITimeoutError = exports.DevOpsAPIError = void 0;
-const utils_1 = require("../api/utils");
 /**
@@ -120,3 +119,3 @@ * An abstract class representing *some* exception that occurred related to the DevOps API. This is the base class for all
         this.status = resp.status;
-        this.raw = (0, utils_1.toCuratedApiResponse)(resp);
+        this.raw = resp;
         this.name = 'DevOpsAPIResponseError';
@@ -123,0 +122,0 @@ }

dist/version.js

@@ -5,3 +5,3 @@ "use strict";
 exports.LIB_NAME = 'astra-db-ts';
-exports.LIB_VERSION = "1.1.0";
+exports.LIB_VERSION = "1.1.1-0";
 //# sourceMappingURL=version.js.map

package.json

 {
   "name": "@datastax/astra-db-ts",
-  "version": "1.1.0",
+  "version": "1.1.1-0",
   "description": "Astra DB TS Client",
@@ -5,0 +5,0 @@ "contributors": [

New alerts

Network access

Supply chain risk

This module accesses the network.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

608416

increased by1.46%

Number of package files

131

increased by1.55%

Lines of code

13129

increased by0.84%

Worsened metrics

Number of downloads

33699

decreased by-1.86%

Number of low quality alerts

1

increased byInfinity%

Number of low supply chain risk alerts

1

increased byInfinity%

Number of medium supply chain risk alerts

2

increased by100%

No dependency changes