s3db.js 19.1.1 → 19.1.3

package/dist/s3db.cjs

@@ -6,7 +6,6 @@ var path$2 = require('path');
 var EventEmitter = require('events');
 var lodashEs = require('lodash-es');
 var recker = require('recker');
-var node_stream = require('node:stream');
 var clientS3 = require('@aws-sdk/client-s3');
 var crypto$2 = require('crypto');
 var nanoid = require('nanoid');
@@ -310,7 +309,6 @@ function parseRetryAfter$1(headerValue) {
     return undefined;
 }
 class ReckerHttpHandler {
-    metadata = { handlerProtocol: 'h2' };
     options;
     client;
     deduplicator;
@@ -387,23 +385,16 @@ class ReckerHttpHandler {
             circuitBreakerTrips: 0,
         };
     }
+    get metadata() {
+        return this.client?.metadata ?? { handlerProtocol: 'http/1.1' };
+    }
     async handle(request, { abortSignal, requestTimeout } = {}) {
-        const protocol = request.protocol || 'https:';
-        const defaultPort = protocol === 'https:' ? 443 : 80;
-        const port = request.port || defaultPort;
         const hostname = request.hostname;
-        const url = `${protocol}//${hostname}:${port}${request.path}`;
         const method = request.method;
         if (this.circuitBreaker && !this.circuitBreaker.canRequest(hostname)) {
             this.metrics.circuitBreakerTrips++;
             throw new Error(`Circuit breaker OPEN for ${hostname}`);
         }
-        const headers = {};
-        for (const [key, value] of Object.entries(request.headers)) {
-            if (value !== undefined) {
-                headers[key] = value;
-            }
-        }
         const doRequest = async () => {
             this.metrics.requests++;
             let lastError;
@@ -412,20 +403,32 @@ class ReckerHttpHandler {
             while (attempt < maxAttempts) {
                 attempt++;
                 try {
-                    const reckerResponse = await this.client.request(url, {
-                        method,
+                    const headers = {};
+                    for (const [key, value] of Object.entries(request.headers)) {
+                        if (value !== undefined) {
+                            headers[key] = value;
+                        }
+                    }
+                    const result = await this.client.handle({
+                        protocol: request.protocol,
+                        hostname: request.hostname,
+                        port: request.port,
+                        path: request.path,
+                        query: request.query,
+                        method: request.method,
                         headers,
                         body: request.body,
-                        signal: abortSignal,
-                        timeout: requestTimeout || this.options.bodyTimeout,
-                        http2: this.options.http2,
+                    }, {
+                        abortSignal,
+                        requestTimeout: requestTimeout || this.options.bodyTimeout,
                     });
+                    const statusCode = result.response.statusCode;
                     if (this.options.enableRetry && attempt < maxAttempts &&
-                        isRetryableError(null, reckerResponse.status)) {
+                        isRetryableError(null, statusCode)) {
                         this.metrics.retries++;
                         let delay;
                         if (this.options.respectRetryAfter) {
-                            const retryAfter = parseRetryAfter$1(reckerResponse.headers.get('Retry-After'));
+                            const retryAfter = parseRetryAfter$1(result.response.headers['retry-after'] ?? null);
                             delay = retryAfter !== undefined
                                 ? Math.min(retryAfter, this.options.maxRetryDelay)
                                 : calculateRetryDelay(attempt, this.options.retryDelay, this.options.maxRetryDelay, this.options.retryJitter);
@@ -439,22 +442,7 @@ class ReckerHttpHandler {
                     if (this.circuitBreaker) {
                         this.circuitBreaker.recordSuccess(hostname);
                     }
-                    let body;
-                    if (reckerResponse.body) {
-                        body = node_stream.Readable.fromWeb(reckerResponse.body);
-                    }
-                    const responseHeaders = {};
-                    for (const [key, value] of reckerResponse.headers.entries()) {
-                        responseHeaders[key] = value;
-                    }
-                    return {
-                        response: {
-                            statusCode: reckerResponse.status,
-                            reason: reckerResponse.statusText,
-                            headers: responseHeaders,
-                            body
-                        }
-                    };
+                    return result;
                 }
                 catch (error) {
                     lastError = error;
@@ -463,7 +451,6 @@ class ReckerHttpHandler {
                     }
                     if (this.options.enableRetry && attempt < maxAttempts && isRetryableError(error)) {
                         this.metrics.retries++;
-                        // Check for HTTP/2 specific retry delay (e.g., ENHANCE_YOUR_CALM)
                         const h2Delay = getHttp2RetryDelay(error);
                         const delay = h2Delay !== undefined
                             ? Math.min(h2Delay, this.options.maxRetryDelay)
@@ -477,6 +464,8 @@ class ReckerHttpHandler {
             throw lastError;
         };
         if (this.deduplicator) {
+            const protocol = request.protocol || 'https:';
+            const url = `${protocol}//${hostname}${request.path}`;
             const originalRequests = this.metrics.requests;
             const result = await this.deduplicator.dedupe(method, url, doRequest);
             if (this.metrics.requests === originalRequests) {
@@ -1636,7 +1625,6 @@ const BUILT_IN_SENSITIVE_FIELDS = [
     'certificatekey',
     'certificate_key',
     'certificate-key',
-    'key',
     'credential',
     'credentials',
     'hash',
@@ -18272,8 +18260,8 @@ class Database extends SafeEventEmitter {
         })();
         this.version = '1';
         this.s3dbVersion = (() => {
-            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.1.1'] !== 'undefined' && globalThis['19.1.1'] !== '19.1.1'
-                ? globalThis['19.1.1']
+            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.1.3'] !== 'undefined' && globalThis['19.1.3'] !== '19.1.3'
+                ? globalThis['19.1.3']
                 : 'latest'));
             return ok ? version : 'latest';
         })();
@@ -51065,6 +51053,9 @@ function deleteChunkedCookie(context, name, options = {}, cookieJar = null) {
         });
     });
 }
+function isChunkedCookie(context, name) {
+    return !!getCookie(context, `${name}.__chunks`);
+}
 
 const logger$i = createLogger({
     name: 'OidcValidator',
@@ -64059,14 +64050,19 @@ class ApiPlugin extends Plugin {
 var index$5 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     ApiPlugin: ApiPlugin,
+    CookieChunkOverflowError: CookieChunkOverflowError,
     OIDCClient: OIDCClient,
     OpenGraphHelper: OpenGraphHelper,
     RouteContext: RouteContext$1,
     createContextInjectionMiddleware: createContextInjectionMiddleware,
+    deleteChunkedCookie: deleteChunkedCookie,
     ejsEngine: ejsEngine,
     errorResponse: errorResponse,
+    getChunkedCookie: getChunkedCookie,
+    isChunkedCookie: isChunkedCookie,
     jsxEngine: jsxEngine,
     pugEngine: pugEngine,
+    setChunkedCookie: setChunkedCookie,
     setupTemplateEngine: setupTemplateEngine,
     successResponse: successResponse,
     withContext: withContext
@@ -160512,6 +160508,7 @@ exports.decodeIPv6 = decodeIPv6;
 exports.decodeMoney = decodeMoney;
 exports.decrypt = decrypt;
 exports.default = S3db;
+exports.deleteChunkedCookie = deleteChunkedCookie;
 exports.detectIPVersion = detectIPVersion;
 exports.dictionaryDecode = dictionaryDecode;
 exports.dictionaryEncode = dictionaryEncode;
@@ -160550,6 +160547,7 @@ exports.getBitFast = getBitFast;
 exports.getCacheMemoryUsage = getCacheMemoryUsage;
 exports.getCacheStats = getCacheStats;
 exports.getCachedValidator = getCachedValidator;
+exports.getChunkedCookie = getChunkedCookie;
 exports.getCronManager = getCronManager;
 exports.getCurrencyDecimals = getCurrencyDecimals;
 exports.getDictionaryStats = getDictionaryStats;
@@ -160570,6 +160568,7 @@ exports.idGenerator = idGenerator;
 exports.initializeNanoid = initializeNanoid;
 exports.intervalToCron = intervalToCron;
 exports.isBcryptHash = isBcryptHash;
+exports.isChunkedCookie = isChunkedCookie;
 exports.isPreconditionFailure = isPreconditionFailure;
 exports.isReckerAvailable = isReckerAvailable;
 exports.isSensitiveField = isSensitiveField;
@@ -160622,8 +160621,10 @@ exports.releaseValidator = releaseValidator;
 exports.resetCronManager = resetCronManager;
 exports.resetGlobalLogger = resetGlobalLogger;
 exports.resetProcessManager = resetProcessManager;
+exports.resolveCacheMemoryLimit = resolveCacheMemoryLimit;
 exports.setBit = setBit;
 exports.setBitFast = setBitFast;
+exports.setChunkedCookie = setChunkedCookie;
 exports.setupTemplateEngine = setupTemplateEngine;
 exports.sha256 = sha256;
 exports.sleep = sleep$1;