s3db.js 19.3.18 → 19.3.19

package/dist/clients/recker-http-handler.js

@@ -359,13 +359,22 @@ export class ReckerHttpHandler {
             circuitBreakerTrips: 0,
         };
     }
-    async destroy() {
-        if (this.client) {
-            await this.client.destroy();
-            this.client = null;
-        }
+    destroy() {
+        void this.destroyAsync();
+    }
+    async destroyAsync() {
+        const client = this.client;
+        this.client = null;
         this.deduplicator = null;
         this.circuitBreaker = null;
+        if (client) {
+            try {
+                await client.destroy();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+        }
     }
 }
 export default ReckerHttpHandler;

package/dist/clients/s3-client.class.js

@@ -20,6 +20,7 @@ export class S3Client extends EventEmitter {
     httpClientOptions;
     client;
     httpHandler = null;
+    _rawHttpClientOptions;
     _inflightCoalescing;
     taskExecutorConfig;
     taskExecutor;
@@ -37,6 +38,7 @@ export class S3Client extends EventEmitter {
         this.id = id ?? idGenerator(77);
         this.config = new ConnectionString(connectionString);
         this.connectionString = connectionString;
+        this._rawHttpClientOptions = httpClientOptions || {};
         this.httpClientOptions = {
             keepAlive: true,
             keepAliveMsecs: 1000,
@@ -102,17 +104,23 @@ export class S3Client extends EventEmitter {
     }
     _normalizeHttpHandlerOptions() {
         const options = this.httpClientOptions;
-        const connections = typeof options.connections === 'number'
-            ? options.connections
-            : options.maxSockets;
-        const keepAliveTimeout = options.keepAliveTimeout ?? options.keepAliveMsecs;
-        const bodyTimeout = options.bodyTimeout ?? options.timeout;
-        return {
-            ...options,
-            connections,
-            keepAliveTimeout,
-            bodyTimeout
-        };
+        const raw = this._rawHttpClientOptions;
+        const connections = typeof raw.connections === 'number'
+            ? raw.connections
+            : raw.maxSockets;
+        const keepAliveTimeout = raw.keepAliveTimeout ?? raw.keepAliveMsecs;
+        const bodyTimeout = raw.bodyTimeout ?? raw.timeout;
+        const normalized = { ...options };
+        if (connections !== undefined) {
+            normalized.connections = connections;
+        }
+        if (keepAliveTimeout !== undefined) {
+            normalized.keepAliveTimeout = keepAliveTimeout;
+        }
+        if (bodyTimeout !== undefined) {
+            normalized.bodyTimeout = bodyTimeout;
+        }
+        return normalized;
     }
     _createTasksPool() {
         const poolConfig = {
@@ -217,7 +225,7 @@ export class S3Client extends EventEmitter {
     }
     async destroy() {
         if (this.httpHandler) {
-            await this.httpHandler.destroy();
+            await this.httpHandler.destroyAsync();
             this.httpHandler = null;
         }
         if (this.client && typeof this.client.destroy === 'function') {

package/dist/s3db-lite.cjs

@@ -40162,7 +40162,7 @@ function getDefaultUserAgent() {
     return `recker/${VERSION$1}`;
 }
 
-const VERSION = '1.0.66';
+const VERSION = '1.0.68';
 let _version = null;
 async function getVersion() {
     if (_version)
@@ -51397,13 +51397,22 @@ class ReckerHttpHandler {
             circuitBreakerTrips: 0,
         };
     }
-    async destroy() {
-        if (this.client) {
-            await this.client.destroy();
-            this.client = null;
-        }
+    destroy() {
+        void this.destroyAsync();
+    }
+    async destroyAsync() {
+        const client = this.client;
+        this.client = null;
         this.deduplicator = null;
         this.circuitBreaker = null;
+        if (client) {
+            try {
+                await client.destroy();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+        }
     }
 }
 
@@ -55061,6 +55070,7 @@ class S3Client extends EventEmitter {
     httpClientOptions;
     client;
     httpHandler = null;
+    _rawHttpClientOptions;
     _inflightCoalescing;
     taskExecutorConfig;
     taskExecutor;
@@ -55078,6 +55088,7 @@ class S3Client extends EventEmitter {
         this.id = id ?? idGenerator(77);
         this.config = new ConnectionString(connectionString);
         this.connectionString = connectionString;
+        this._rawHttpClientOptions = httpClientOptions || {};
         this.httpClientOptions = {
             keepAlive: true,
             keepAliveMsecs: 1000,
@@ -55143,17 +55154,23 @@ class S3Client extends EventEmitter {
     }
     _normalizeHttpHandlerOptions() {
         const options = this.httpClientOptions;
-        const connections = typeof options.connections === 'number'
-            ? options.connections
-            : options.maxSockets;
-        const keepAliveTimeout = options.keepAliveTimeout ?? options.keepAliveMsecs;
-        const bodyTimeout = options.bodyTimeout ?? options.timeout;
-        return {
-            ...options,
-            connections,
-            keepAliveTimeout,
-            bodyTimeout
-        };
+        const raw = this._rawHttpClientOptions;
+        const connections = typeof raw.connections === 'number'
+            ? raw.connections
+            : raw.maxSockets;
+        const keepAliveTimeout = raw.keepAliveTimeout ?? raw.keepAliveMsecs;
+        const bodyTimeout = raw.bodyTimeout ?? raw.timeout;
+        const normalized = { ...options };
+        if (connections !== undefined) {
+            normalized.connections = connections;
+        }
+        if (keepAliveTimeout !== undefined) {
+            normalized.keepAliveTimeout = keepAliveTimeout;
+        }
+        if (bodyTimeout !== undefined) {
+            normalized.bodyTimeout = bodyTimeout;
+        }
+        return normalized;
     }
     _createTasksPool() {
         const poolConfig = {
@@ -55258,7 +55275,7 @@ class S3Client extends EventEmitter {
     }
     async destroy() {
         if (this.httpHandler) {
-            await this.httpHandler.destroy();
+            await this.httpHandler.destroyAsync();
             this.httpHandler = null;
         }
         if (this.client && typeof this.client.destroy === 'function') {
@@ -70418,8 +70435,8 @@ class Database extends SafeEventEmitter {
         })();
         this.version = '1';
         this.s3dbVersion = (() => {
-            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.18'] !== 'undefined' && globalThis['19.3.18'] !== '19.3.18'
-                ? globalThis['19.3.18']
+            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.19'] !== 'undefined' && globalThis['19.3.19'] !== '19.3.19'
+                ? globalThis['19.3.19']
                 : 'latest'));
             return ok ? version : 'latest';
         })();

package/dist/s3db-lite.es.js

@@ -40139,7 +40139,7 @@ function getDefaultUserAgent() {
     return `recker/${VERSION$1}`;
 }
 
-const VERSION = '1.0.66';
+const VERSION = '1.0.68';
 let _version = null;
 async function getVersion() {
     if (_version)
@@ -51374,13 +51374,22 @@ class ReckerHttpHandler {
             circuitBreakerTrips: 0,
         };
     }
-    async destroy() {
-        if (this.client) {
-            await this.client.destroy();
-            this.client = null;
-        }
+    destroy() {
+        void this.destroyAsync();
+    }
+    async destroyAsync() {
+        const client = this.client;
+        this.client = null;
         this.deduplicator = null;
         this.circuitBreaker = null;
+        if (client) {
+            try {
+                await client.destroy();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+        }
     }
 }
 
@@ -55038,6 +55047,7 @@ class S3Client extends EventEmitter$1 {
     httpClientOptions;
     client;
     httpHandler = null;
+    _rawHttpClientOptions;
     _inflightCoalescing;
     taskExecutorConfig;
     taskExecutor;
@@ -55055,6 +55065,7 @@ class S3Client extends EventEmitter$1 {
         this.id = id ?? idGenerator(77);
         this.config = new ConnectionString(connectionString);
         this.connectionString = connectionString;
+        this._rawHttpClientOptions = httpClientOptions || {};
         this.httpClientOptions = {
             keepAlive: true,
             keepAliveMsecs: 1000,
@@ -55120,17 +55131,23 @@ class S3Client extends EventEmitter$1 {
     }
     _normalizeHttpHandlerOptions() {
         const options = this.httpClientOptions;
-        const connections = typeof options.connections === 'number'
-            ? options.connections
-            : options.maxSockets;
-        const keepAliveTimeout = options.keepAliveTimeout ?? options.keepAliveMsecs;
-        const bodyTimeout = options.bodyTimeout ?? options.timeout;
-        return {
-            ...options,
-            connections,
-            keepAliveTimeout,
-            bodyTimeout
-        };
+        const raw = this._rawHttpClientOptions;
+        const connections = typeof raw.connections === 'number'
+            ? raw.connections
+            : raw.maxSockets;
+        const keepAliveTimeout = raw.keepAliveTimeout ?? raw.keepAliveMsecs;
+        const bodyTimeout = raw.bodyTimeout ?? raw.timeout;
+        const normalized = { ...options };
+        if (connections !== undefined) {
+            normalized.connections = connections;
+        }
+        if (keepAliveTimeout !== undefined) {
+            normalized.keepAliveTimeout = keepAliveTimeout;
+        }
+        if (bodyTimeout !== undefined) {
+            normalized.bodyTimeout = bodyTimeout;
+        }
+        return normalized;
     }
     _createTasksPool() {
         const poolConfig = {
@@ -55235,7 +55252,7 @@ class S3Client extends EventEmitter$1 {
     }
     async destroy() {
         if (this.httpHandler) {
-            await this.httpHandler.destroy();
+            await this.httpHandler.destroyAsync();
             this.httpHandler = null;
         }
         if (this.client && typeof this.client.destroy === 'function') {
@@ -70395,8 +70412,8 @@ class Database extends SafeEventEmitter {
         })();
         this.version = '1';
         this.s3dbVersion = (() => {
-            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.18'] !== 'undefined' && globalThis['19.3.18'] !== '19.3.18'
-                ? globalThis['19.3.18']
+            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.19'] !== 'undefined' && globalThis['19.3.19'] !== '19.3.19'
+                ? globalThis['19.3.19']
                 : 'latest'));
             return ok ? version : 'latest';
         })();

package/dist/s3db.cjs

@@ -519,13 +519,22 @@ class ReckerHttpHandler {
             circuitBreakerTrips: 0,
         };
     }
-    async destroy() {
-        if (this.client) {
-            await this.client.destroy();
-            this.client = null;
-        }
+    destroy() {
+        void this.destroyAsync();
+    }
+    async destroyAsync() {
+        const client = this.client;
+        this.client = null;
         this.deduplicator = null;
         this.circuitBreaker = null;
+        if (client) {
+            try {
+                await client.destroy();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+        }
     }
 }
 
@@ -4334,6 +4343,7 @@ class S3Client extends EventEmitter {
     httpClientOptions;
     client;
     httpHandler = null;
+    _rawHttpClientOptions;
     _inflightCoalescing;
     taskExecutorConfig;
     taskExecutor;
@@ -4351,6 +4361,7 @@ class S3Client extends EventEmitter {
         this.id = id ?? idGenerator(77);
         this.config = new ConnectionString(connectionString);
         this.connectionString = connectionString;
+        this._rawHttpClientOptions = httpClientOptions || {};
         this.httpClientOptions = {
             keepAlive: true,
             keepAliveMsecs: 1000,
@@ -4416,17 +4427,23 @@ class S3Client extends EventEmitter {
     }
     _normalizeHttpHandlerOptions() {
         const options = this.httpClientOptions;
-        const connections = typeof options.connections === 'number'
-            ? options.connections
-            : options.maxSockets;
-        const keepAliveTimeout = options.keepAliveTimeout ?? options.keepAliveMsecs;
-        const bodyTimeout = options.bodyTimeout ?? options.timeout;
-        return {
-            ...options,
-            connections,
-            keepAliveTimeout,
-            bodyTimeout
-        };
+        const raw = this._rawHttpClientOptions;
+        const connections = typeof raw.connections === 'number'
+            ? raw.connections
+            : raw.maxSockets;
+        const keepAliveTimeout = raw.keepAliveTimeout ?? raw.keepAliveMsecs;
+        const bodyTimeout = raw.bodyTimeout ?? raw.timeout;
+        const normalized = { ...options };
+        if (connections !== undefined) {
+            normalized.connections = connections;
+        }
+        if (keepAliveTimeout !== undefined) {
+            normalized.keepAliveTimeout = keepAliveTimeout;
+        }
+        if (bodyTimeout !== undefined) {
+            normalized.bodyTimeout = bodyTimeout;
+        }
+        return normalized;
     }
     _createTasksPool() {
         const poolConfig = {
@@ -4531,7 +4548,7 @@ class S3Client extends EventEmitter {
     }
     async destroy() {
         if (this.httpHandler) {
-            await this.httpHandler.destroy();
+            await this.httpHandler.destroyAsync();
             this.httpHandler = null;
         }
         if (this.client && typeof this.client.destroy === 'function') {
@@ -20115,8 +20132,8 @@ class Database extends SafeEventEmitter {
         })();
         this.version = '1';
         this.s3dbVersion = (() => {
-            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.18'] !== 'undefined' && globalThis['19.3.18'] !== '19.3.18'
-                ? globalThis['19.3.18']
+            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.19'] !== 'undefined' && globalThis['19.3.19'] !== '19.3.19'
+                ? globalThis['19.3.19']
                 : 'latest'));
             return ok ? version : 'latest';
         })();

package/dist/s3db.es.js

@@ -495,13 +495,22 @@ class ReckerHttpHandler {
             circuitBreakerTrips: 0,
         };
     }
-    async destroy() {
-        if (this.client) {
-            await this.client.destroy();
-            this.client = null;
-        }
+    destroy() {
+        void this.destroyAsync();
+    }
+    async destroyAsync() {
+        const client = this.client;
+        this.client = null;
         this.deduplicator = null;
         this.circuitBreaker = null;
+        if (client) {
+            try {
+                await client.destroy();
+            }
+            catch {
+                // Ignore cleanup errors
+            }
+        }
     }
 }
 
@@ -4310,6 +4319,7 @@ class S3Client extends EventEmitter$1 {
     httpClientOptions;
     client;
     httpHandler = null;
+    _rawHttpClientOptions;
     _inflightCoalescing;
     taskExecutorConfig;
     taskExecutor;
@@ -4327,6 +4337,7 @@ class S3Client extends EventEmitter$1 {
         this.id = id ?? idGenerator(77);
         this.config = new ConnectionString(connectionString);
         this.connectionString = connectionString;
+        this._rawHttpClientOptions = httpClientOptions || {};
         this.httpClientOptions = {
             keepAlive: true,
             keepAliveMsecs: 1000,
@@ -4392,17 +4403,23 @@ class S3Client extends EventEmitter$1 {
     }
     _normalizeHttpHandlerOptions() {
         const options = this.httpClientOptions;
-        const connections = typeof options.connections === 'number'
-            ? options.connections
-            : options.maxSockets;
-        const keepAliveTimeout = options.keepAliveTimeout ?? options.keepAliveMsecs;
-        const bodyTimeout = options.bodyTimeout ?? options.timeout;
-        return {
-            ...options,
-            connections,
-            keepAliveTimeout,
-            bodyTimeout
-        };
+        const raw = this._rawHttpClientOptions;
+        const connections = typeof raw.connections === 'number'
+            ? raw.connections
+            : raw.maxSockets;
+        const keepAliveTimeout = raw.keepAliveTimeout ?? raw.keepAliveMsecs;
+        const bodyTimeout = raw.bodyTimeout ?? raw.timeout;
+        const normalized = { ...options };
+        if (connections !== undefined) {
+            normalized.connections = connections;
+        }
+        if (keepAliveTimeout !== undefined) {
+            normalized.keepAliveTimeout = keepAliveTimeout;
+        }
+        if (bodyTimeout !== undefined) {
+            normalized.bodyTimeout = bodyTimeout;
+        }
+        return normalized;
     }
     _createTasksPool() {
         const poolConfig = {
@@ -4507,7 +4524,7 @@ class S3Client extends EventEmitter$1 {
     }
     async destroy() {
         if (this.httpHandler) {
-            await this.httpHandler.destroy();
+            await this.httpHandler.destroyAsync();
             this.httpHandler = null;
         }
         if (this.client && typeof this.client.destroy === 'function') {
@@ -20091,8 +20108,8 @@ class Database extends SafeEventEmitter {
         })();
         this.version = '1';
         this.s3dbVersion = (() => {
-            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.18'] !== 'undefined' && globalThis['19.3.18'] !== '19.3.18'
-                ? globalThis['19.3.18']
+            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.19'] !== 'undefined' && globalThis['19.3.19'] !== '19.3.19'
+                ? globalThis['19.3.19']
                 : 'latest'));
             return ok ? version : 'latest';
         })();

package/dist/types/clients/recker-http-handler.d.ts

@@ -17,7 +17,8 @@ export declare class ReckerHttpHandler {
     httpHandlerConfigs(): ReckerHttpHandlerOptions;
     getMetrics(): HandlerMetrics;
     resetMetrics(): void;
-    destroy(): Promise<void>;
+    destroy(): void;
+    destroyAsync(): Promise<void>;
 }
 export default ReckerHttpHandler;
 //# sourceMappingURL=recker-http-handler.d.ts.map

package/dist/types/clients/s3-client.class.d.ts

@@ -17,6 +17,7 @@ export declare class S3Client extends EventEmitter {
     httpClientOptions: HttpClientOptions;
     client: AwsS3Client;
     private httpHandler;
+    private _rawHttpClientOptions;
     private _inflightCoalescing;
     private taskExecutorConfig;
     private taskExecutor;

package/dist/types/clients/types.d.ts

@@ -486,6 +486,6 @@ export interface Client extends EventEmitter {
     }>>;
     getQueueStats(): QueueStats | null;
     getAggregateMetrics(since?: number): unknown | null;
-    destroy(): void;
+    destroy(): void | Promise<void>;
 }
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "19.3.18",
+  "version": "19.3.19",
   "description": "Use AWS S3, the world's most reliable document storage, as a database with this ORM.",
   "main": "dist/s3db.cjs",
   "module": "dist/s3db.es.js",
@@ -95,7 +95,7 @@
     "nanoid": "5.1.6",
     "pino": "^10.2.0",
     "pino-pretty": "^13.1.3",
-    "recker": "1.0.66"
+    "recker": "1.0.68"
   },
   "optionalDependencies": {
     "@modelcontextprotocol/sdk": "^1.25.2",

package/src/clients/recker-http-handler.ts

@@ -462,13 +462,22 @@ export class ReckerHttpHandler {
     };
   }
 
-  async destroy(): Promise<void> {
-    if (this.client) {
-      await this.client.destroy();
-      this.client = null;
-    }
+  destroy(): void {
+    void this.destroyAsync();
+  }
+
+  async destroyAsync(): Promise<void> {
+    const client = this.client;
+    this.client = null;
     this.deduplicator = null;
     this.circuitBreaker = null;
+    if (client) {
+      try {
+        await client.destroy();
+      } catch {
+        // Ignore cleanup errors
+      }
+    }
   }
 }
 

package/src/clients/s3-client.class.ts

@@ -88,6 +88,7 @@ export class S3Client extends EventEmitter {
   httpClientOptions: HttpClientOptions;
   client: AwsS3Client;
   private httpHandler: ReckerHttpHandler | null = null;
+  private _rawHttpClientOptions: HttpClientOptions;
   private _inflightCoalescing: Map<string, Promise<unknown>>;
   private taskExecutorConfig: NormalizedTaskExecutorConfig;
   private taskExecutor: TasksPoolType | null;
@@ -117,6 +118,7 @@ export class S3Client extends EventEmitter {
     this.id = id ?? idGenerator(77);
     this.config = new ConnectionString(connectionString);
     this.connectionString = connectionString;
+    this._rawHttpClientOptions = httpClientOptions || {};
     this.httpClientOptions = {
       keepAlive: true,
       keepAliveMsecs: 1000,
@@ -194,18 +196,26 @@ export class S3Client extends EventEmitter {
 
   private _normalizeHttpHandlerOptions(): ReckerHttpHandlerOptions {
     const options = this.httpClientOptions;
-    const connections = typeof options.connections === 'number'
-      ? options.connections
-      : options.maxSockets;
-    const keepAliveTimeout = options.keepAliveTimeout ?? options.keepAliveMsecs;
-    const bodyTimeout = options.bodyTimeout ?? options.timeout;
-
-    return {
-      ...options,
-      connections,
-      keepAliveTimeout,
-      bodyTimeout
-    } as ReckerHttpHandlerOptions;
+    const raw = this._rawHttpClientOptions;
+    const connections = typeof raw.connections === 'number'
+      ? raw.connections
+      : raw.maxSockets;
+    const keepAliveTimeout = raw.keepAliveTimeout ?? raw.keepAliveMsecs;
+    const bodyTimeout = raw.bodyTimeout ?? raw.timeout;
+
+    const normalized: ReckerHttpHandlerOptions = { ...options };
+
+    if (connections !== undefined) {
+      normalized.connections = connections;
+    }
+    if (keepAliveTimeout !== undefined) {
+      normalized.keepAliveTimeout = keepAliveTimeout;
+    }
+    if (bodyTimeout !== undefined) {
+      normalized.bodyTimeout = bodyTimeout;
+    }
+
+    return normalized;
   }
 
   private _createTasksPool(): TasksPoolType {
@@ -334,7 +344,7 @@ export class S3Client extends EventEmitter {
 
   async destroy(): Promise<void> {
     if (this.httpHandler) {
-      await this.httpHandler.destroy();
+      await this.httpHandler.destroyAsync();
       this.httpHandler = null;
     }
     if (this.client && typeof this.client.destroy === 'function') {

package/src/clients/types.ts

@@ -502,5 +502,5 @@ export interface Client extends EventEmitter {
   moveAllObjects(params: { prefixFrom: string; prefixTo: string }): Promise<Array<{ from: string; to: string }>>;
   getQueueStats(): QueueStats | null;
   getAggregateMetrics(since?: number): unknown | null;
-  destroy(): void;
+  destroy(): void | Promise<void>;
 }