s3db.js 19.3.21 → 19.3.23

package/dist/s3db-lite.cjs

@@ -39,15 +39,14 @@ var clientS3 = require('@aws-sdk/client-s3');
 var crypto = require('crypto');
 var os$1 = require('os');
 var promises = require('timers/promises');
-var nanoid = require('nanoid');
 var fs$1 = require('fs/promises');
 var stream = require('stream');
+var pino = require('pino');
 var fs$2 = require('fs');
 var zlib = require('zlib');
 var jsonStableStringify = require('json-stable-stringify');
 var FastestValidatorModule = require('fastest-validator');
 var web = require('node:stream/web');
-var pino = require('pino');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -52383,264 +52382,6 @@ function base64ToArrayBuffer(base64) {
     }
 }
 
-const BUILT_IN_SENSITIVE_FIELDS = [
-    'password',
-    'passwd',
-    'pwd',
-    'passphrase',
-    'secret',
-    'token',
-    'auth',
-    'authorization',
-    'apikey',
-    'api_key',
-    'api-key',
-    'apitoken',
-    'api_token',
-    'api-token',
-    'apisecret',
-    'api_secret',
-    'api-secret',
-    'authtoken',
-    'auth_token',
-    'auth-token',
-    'bearertoken',
-    'bearer_token',
-    'bearer-token',
-    'accesskey',
-    'access_key',
-    'access-key',
-    'accesskeyid',
-    'access_key_id',
-    'access-key-id',
-    'secretkey',
-    'secret_key',
-    'secret-key',
-    'secretaccesskey',
-    'secret_access_key',
-    'secret-access-key',
-    'awsaccesskey',
-    'aws_access_key',
-    'aws-access-key',
-    'awsaccesskeyid',
-    'aws_access_key_id',
-    'aws-access-key-id',
-    'awssecretkey',
-    'aws_secret_key',
-    'aws-secret-key',
-    'awssecretaccesskey',
-    'aws_secret_access_key',
-    'aws-secret-access-key',
-    'awstoken',
-    'aws_token',
-    'aws-token',
-    'sessiontoken',
-    'session_token',
-    'session-token',
-    'gcpaccesskey',
-    'gcp_access_key',
-    'gcp-access-key',
-    'gcpsecretkey',
-    'gcp_secret_key',
-    'gcp-secret-key',
-    'gcpapikey',
-    'gcp_api_key',
-    'gcp-api-key',
-    'azurekey',
-    'azure_key',
-    'azure-key',
-    'azurekeysecret',
-    'azure_key_secret',
-    'azure-key-secret',
-    'azuretoken',
-    'azure_token',
-    'azure-token',
-    'azuresecretkey',
-    'azure_secret_key',
-    'azure-secret-key',
-    'connectionstring',
-    'connection_string',
-    'connection-string',
-    'dbpassword',
-    'db_password',
-    'db-password',
-    'dbtoken',
-    'db_token',
-    'db-token',
-    'dbsecret',
-    'db_secret',
-    'db-secret',
-    'mongodburi',
-    'mongodb_uri',
-    'mongodb-uri',
-    'postgresqlpassword',
-    'postgresql_password',
-    'postgresql-password',
-    'clientsecret',
-    'client_secret',
-    'client-secret',
-    'clientid',
-    'client_id',
-    'client-id',
-    'oauth2secret',
-    'oauth2_secret',
-    'oauth2-secret',
-    'oidcsecret',
-    'oidc_secret',
-    'oidc-secret',
-    'encryptionkey',
-    'encryption_key',
-    'encryption-key',
-    'cryptokey',
-    'crypto_key',
-    'crypto-key',
-    'hmackey',
-    'hmac_key',
-    'hmac-key',
-    'rsaprivatekey',
-    'rsa_private_key',
-    'rsa-private-key',
-    'privatekeyid',
-    'private_key_id',
-    'private-key-id',
-    'privatekey',
-    'private_key',
-    'private-key',
-    'certificate',
-    'cert',
-    'certificatekey',
-    'certificate_key',
-    'certificate-key',
-    'credential',
-    'credentials',
-    'hash',
-    'nonce',
-    'jti',
-    'fingerprint',
-    'sessionid',
-    'session_id',
-    'session-id',
-    'refreshtoken',
-    'refresh_token',
-    'refresh-token'
-];
-function createRedactRules(customPatterns = []) {
-    const redactPaths = [];
-    for (const field of BUILT_IN_SENSITIVE_FIELDS) {
-        redactPaths.push(field);
-        redactPaths.push(`*.${field}`);
-        redactPaths.push(`**.${field}`);
-    }
-    if (customPatterns.length > 0) ;
-    return redactPaths;
-}
-
-let sharedPrettyTransport = null;
-let sharedDestination = null;
-function serializeError(err) {
-    if (!err || typeof err !== 'object') {
-        return err;
-    }
-    const error = err;
-    if (typeof error.toJSON === 'function') {
-        return error.toJSON();
-    }
-    return {
-        ...error,
-        message: error.message,
-        stack: error.stack,
-    };
-}
-function createPrettyTransport() {
-    return {
-        target: 'pino-pretty',
-        options: {
-            colorize: true,
-            translateTime: 'HH:MM:ss.l',
-            ignore: 'pid,hostname',
-            singleLine: false
-        }
-    };
-}
-function getSharedPrettyTransport() {
-    if (!sharedPrettyTransport) {
-        sharedPrettyTransport = pino.transport(createPrettyTransport());
-    }
-    return sharedPrettyTransport;
-}
-function getSharedDestination(format) {
-    const envFormat = process.env.S3DB_LOG_FORMAT?.toLowerCase();
-    const effectiveFormat = format ?? (envFormat === 'json' ? 'json' : 'pretty');
-    if (effectiveFormat === 'json') {
-        return undefined;
-    }
-    if (!sharedDestination) {
-        sharedDestination = getSharedPrettyTransport();
-    }
-    return sharedDestination;
-}
-function createDefaultTransport() {
-    const envFormat = process.env.S3DB_LOG_FORMAT?.toLowerCase();
-    if (envFormat === 'json') {
-        return undefined;
-    }
-    return createPrettyTransport();
-}
-function createLogger(options = {}) {
-    const { level = 'info', name, format, transport, bindings = {}, redactPatterns = [] } = options;
-    const redactRules = createRedactRules(redactPatterns);
-    const normalizedBindings = bindings && typeof bindings === 'object' ? bindings : {};
-    const useSharedDestination = !transport && format !== 'json';
-    const destination = useSharedDestination ? getSharedDestination(format) : undefined;
-    const config = {
-        level,
-        redact: redactRules,
-        serializers: {
-            err: serializeError,
-            error: serializeError
-        }
-    };
-    if (transport) {
-        config.transport = transport;
-    }
-    else if (format === 'json') ;
-    else if (!destination) {
-        config.transport = createDefaultTransport();
-    }
-    let logger;
-    if (destination) {
-        logger = pino({ ...config, name }, destination);
-    }
-    else {
-        logger = pino({ ...config, name });
-    }
-    const baseBindings = name ? { ...normalizedBindings, name } : normalizedBindings;
-    if (baseBindings && Object.keys(baseBindings).length > 0) {
-        logger = logger.child(baseBindings);
-    }
-    return logger;
-}
-function getLoggerOptionsFromEnv(configOptions = {}) {
-    const options = { ...configOptions };
-    if (process.env.S3DB_LOG_LEVEL) {
-        options.level = process.env.S3DB_LOG_LEVEL;
-    }
-    if (process.env.S3DB_LOG_FORMAT) {
-        const format = process.env.S3DB_LOG_FORMAT.toLowerCase();
-        if (format === 'json' || format === 'pretty') {
-            options.format = format;
-        }
-    }
-    else if (process.env.S3DB_LOG_PRETTY === 'false') {
-        options.format = 'json';
-    }
-    else if (process.env.S3DB_LOG_PRETTY === 'true') {
-        options.format = 'pretty';
-    }
-    return options;
-}
-
-const logger = createLogger({ name: 'IdGenerator', level: 'info' });
 const FALLBACK_URL_ALPHABET = 'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
 const PASSWORD_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789';
 const POOL_SIZE_MULTIPLIER = 128;
@@ -52688,23 +52429,6 @@ let activeCustomAlphabet = customAlphabetFallback;
 let activeUrlAlphabet = FALLBACK_URL_ALPHABET;
 let idGeneratorImpl = activeCustomAlphabet(activeUrlAlphabet, 22);
 let passwordGeneratorImpl = activeCustomAlphabet(PASSWORD_ALPHABET, 16);
-const nanoidReadyPromise = import('nanoid')
-    .then((mod) => {
-    const resolvedCustomAlphabet = mod?.customAlphabet ?? activeCustomAlphabet;
-    const resolvedUrlAlphabet = mod?.urlAlphabet ?? activeUrlAlphabet;
-    activeCustomAlphabet = resolvedCustomAlphabet;
-    activeUrlAlphabet = resolvedUrlAlphabet;
-    idGeneratorImpl = activeCustomAlphabet(activeUrlAlphabet, 22);
-    passwordGeneratorImpl = activeCustomAlphabet(PASSWORD_ALPHABET, 16);
-})
-    .catch((error) => {
-    if (typeof process !== 'undefined' && process?.env?.S3DB_DEBUG) {
-        logger.warn({ error: error.message }, 'Failed to dynamically import "nanoid". Using fallback implementation.');
-    }
-});
-function initializeNanoid() {
-    return nanoidReadyPromise;
-}
 const idGenerator = (size) => idGeneratorImpl(size);
 const passwordGenerator = (size) => passwordGeneratorImpl(size);
 const getUrlAlphabet = () => activeUrlAlphabet;
@@ -52715,7 +52439,6 @@ var id = /*#__PURE__*/Object.freeze({
     createCustomGenerator: createCustomGenerator,
     getUrlAlphabet: getUrlAlphabet,
     idGenerator: idGenerator,
-    initializeNanoid: initializeNanoid,
     passwordGenerator: passwordGenerator
 });
 
@@ -54281,7 +54004,7 @@ class TasksPool extends EventEmitter.EventEmitter {
             ...(options.metadata || {})
         };
         const task = {
-            id: nanoid.nanoid(),
+            id: idGenerator(),
             fn: fn,
             priority: options.priority || 0,
             retries: options.retries ?? this.retries,
@@ -54336,7 +54059,7 @@ class TasksPool extends EventEmitter.EventEmitter {
     }
     async addBatch(fns, options = {}) {
         const errors = [];
-        const batchId = nanoid.nanoid();
+        const batchId = idGenerator();
         const promises = fns.map((fn, index) => {
             const taskOptions = {
                 priority: options.priority,
@@ -55986,7 +55709,7 @@ class TasksRunner extends EventEmitter.EventEmitter {
             ...(options.metadata || {})
         };
         const task = {
-            id: nanoid.nanoid(),
+            id: idGenerator(),
             fn,
             priority: options.priority || 0,
             retries: options.retries ?? this.retries,
@@ -56677,6 +56400,263 @@ class TasksRunner extends EventEmitter.EventEmitter {
     }
 }
 
+const BUILT_IN_SENSITIVE_FIELDS = [
+    'password',
+    'passwd',
+    'pwd',
+    'passphrase',
+    'secret',
+    'token',
+    'auth',
+    'authorization',
+    'apikey',
+    'api_key',
+    'api-key',
+    'apitoken',
+    'api_token',
+    'api-token',
+    'apisecret',
+    'api_secret',
+    'api-secret',
+    'authtoken',
+    'auth_token',
+    'auth-token',
+    'bearertoken',
+    'bearer_token',
+    'bearer-token',
+    'accesskey',
+    'access_key',
+    'access-key',
+    'accesskeyid',
+    'access_key_id',
+    'access-key-id',
+    'secretkey',
+    'secret_key',
+    'secret-key',
+    'secretaccesskey',
+    'secret_access_key',
+    'secret-access-key',
+    'awsaccesskey',
+    'aws_access_key',
+    'aws-access-key',
+    'awsaccesskeyid',
+    'aws_access_key_id',
+    'aws-access-key-id',
+    'awssecretkey',
+    'aws_secret_key',
+    'aws-secret-key',
+    'awssecretaccesskey',
+    'aws_secret_access_key',
+    'aws-secret-access-key',
+    'awstoken',
+    'aws_token',
+    'aws-token',
+    'sessiontoken',
+    'session_token',
+    'session-token',
+    'gcpaccesskey',
+    'gcp_access_key',
+    'gcp-access-key',
+    'gcpsecretkey',
+    'gcp_secret_key',
+    'gcp-secret-key',
+    'gcpapikey',
+    'gcp_api_key',
+    'gcp-api-key',
+    'azurekey',
+    'azure_key',
+    'azure-key',
+    'azurekeysecret',
+    'azure_key_secret',
+    'azure-key-secret',
+    'azuretoken',
+    'azure_token',
+    'azure-token',
+    'azuresecretkey',
+    'azure_secret_key',
+    'azure-secret-key',
+    'connectionstring',
+    'connection_string',
+    'connection-string',
+    'dbpassword',
+    'db_password',
+    'db-password',
+    'dbtoken',
+    'db_token',
+    'db-token',
+    'dbsecret',
+    'db_secret',
+    'db-secret',
+    'mongodburi',
+    'mongodb_uri',
+    'mongodb-uri',
+    'postgresqlpassword',
+    'postgresql_password',
+    'postgresql-password',
+    'clientsecret',
+    'client_secret',
+    'client-secret',
+    'clientid',
+    'client_id',
+    'client-id',
+    'oauth2secret',
+    'oauth2_secret',
+    'oauth2-secret',
+    'oidcsecret',
+    'oidc_secret',
+    'oidc-secret',
+    'encryptionkey',
+    'encryption_key',
+    'encryption-key',
+    'cryptokey',
+    'crypto_key',
+    'crypto-key',
+    'hmackey',
+    'hmac_key',
+    'hmac-key',
+    'rsaprivatekey',
+    'rsa_private_key',
+    'rsa-private-key',
+    'privatekeyid',
+    'private_key_id',
+    'private-key-id',
+    'privatekey',
+    'private_key',
+    'private-key',
+    'certificate',
+    'cert',
+    'certificatekey',
+    'certificate_key',
+    'certificate-key',
+    'credential',
+    'credentials',
+    'hash',
+    'nonce',
+    'jti',
+    'fingerprint',
+    'sessionid',
+    'session_id',
+    'session-id',
+    'refreshtoken',
+    'refresh_token',
+    'refresh-token'
+];
+function createRedactRules(customPatterns = []) {
+    const redactPaths = [];
+    for (const field of BUILT_IN_SENSITIVE_FIELDS) {
+        redactPaths.push(field);
+        redactPaths.push(`*.${field}`);
+        redactPaths.push(`**.${field}`);
+    }
+    if (customPatterns.length > 0) ;
+    return redactPaths;
+}
+
+let sharedPrettyTransport = null;
+let sharedDestination = null;
+function serializeError(err) {
+    if (!err || typeof err !== 'object') {
+        return err;
+    }
+    const error = err;
+    if (typeof error.toJSON === 'function') {
+        return error.toJSON();
+    }
+    return {
+        ...error,
+        message: error.message,
+        stack: error.stack,
+    };
+}
+function createPrettyTransport() {
+    return {
+        target: 'pino-pretty',
+        options: {
+            colorize: true,
+            translateTime: 'HH:MM:ss.l',
+            ignore: 'pid,hostname',
+            singleLine: false
+        }
+    };
+}
+function getSharedPrettyTransport() {
+    if (!sharedPrettyTransport) {
+        sharedPrettyTransport = pino.transport(createPrettyTransport());
+    }
+    return sharedPrettyTransport;
+}
+function getSharedDestination(format) {
+    const envFormat = process.env.S3DB_LOG_FORMAT?.toLowerCase();
+    const effectiveFormat = format ?? (envFormat === 'json' ? 'json' : 'pretty');
+    if (effectiveFormat === 'json') {
+        return undefined;
+    }
+    if (!sharedDestination) {
+        sharedDestination = getSharedPrettyTransport();
+    }
+    return sharedDestination;
+}
+function createDefaultTransport() {
+    const envFormat = process.env.S3DB_LOG_FORMAT?.toLowerCase();
+    if (envFormat === 'json') {
+        return undefined;
+    }
+    return createPrettyTransport();
+}
+function createLogger(options = {}) {
+    const { level = 'info', name, format, transport, bindings = {}, redactPatterns = [] } = options;
+    const redactRules = createRedactRules(redactPatterns);
+    const normalizedBindings = bindings && typeof bindings === 'object' ? bindings : {};
+    const useSharedDestination = !transport && format !== 'json';
+    const destination = useSharedDestination ? getSharedDestination(format) : undefined;
+    const config = {
+        level,
+        redact: redactRules,
+        serializers: {
+            err: serializeError,
+            error: serializeError
+        }
+    };
+    if (transport) {
+        config.transport = transport;
+    }
+    else if (format === 'json') ;
+    else if (!destination) {
+        config.transport = createDefaultTransport();
+    }
+    let logger;
+    if (destination) {
+        logger = pino({ ...config, name }, destination);
+    }
+    else {
+        logger = pino({ ...config, name });
+    }
+    const baseBindings = name ? { ...normalizedBindings, name } : normalizedBindings;
+    if (baseBindings && Object.keys(baseBindings).length > 0) {
+        logger = logger.child(baseBindings);
+    }
+    return logger;
+}
+function getLoggerOptionsFromEnv(configOptions = {}) {
+    const options = { ...configOptions };
+    if (process.env.S3DB_LOG_LEVEL) {
+        options.level = process.env.S3DB_LOG_LEVEL;
+    }
+    if (process.env.S3DB_LOG_FORMAT) {
+        const format = process.env.S3DB_LOG_FORMAT.toLowerCase();
+        if (format === 'json' || format === 'pretty') {
+            options.format = format;
+        }
+    }
+    else if (process.env.S3DB_LOG_PRETTY === 'false') {
+        options.format = 'json';
+    }
+    else if (process.env.S3DB_LOG_PRETTY === 'true') {
+        options.format = 'pretty';
+    }
+    return options;
+}
+
 class MemoryStorage {
     objects;
     bucket;
@@ -66090,7 +66070,7 @@ class ResourceIdGenerator {
         if (this._incrementalConfig) {
             return 'incremental';
         }
-        return 'nanoid';
+        return 'default';
     }
     async getSequenceValue(fieldName = 'id') {
         if (!this._generator?._sequence) {
@@ -67888,7 +67868,9 @@ class ResourcePersistence {
         Object.assign(validatedAttributes, extraData);
         let finalId = validatedId || preProcessedData.id || id$1;
         if (!finalId) {
-            finalId = await Promise.resolve(this.idGenerator(preProcessedData));
+            const shouldUseData = this.resource.idGeneratorType === 'custom';
+            const generatedId = shouldUseData ? this.idGenerator(preProcessedData) : this.idGenerator();
+            finalId = await Promise.resolve(generatedId);
             if (!finalId || String(finalId).trim() === '') {
                 const { idGenerator } = await Promise.resolve().then(function () { return id; });
                 finalId = idGenerator();
@@ -70484,8 +70466,8 @@ class Database extends SafeEventEmitter {
         })();
         this.version = '1';
         this.s3dbVersion = (() => {
-            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.21'] !== 'undefined' && globalThis['19.3.21'] !== '19.3.21'
-                ? globalThis['19.3.21']
+            const [ok, , version] = tryFnSync(() => (typeof globalThis['19.3.23'] !== 'undefined' && globalThis['19.3.23'] !== '19.3.23'
+                ? globalThis['19.3.23']
                 : 'latest'));
             return ok ? version : 'latest';
         })();
@@ -72093,7 +72075,6 @@ exports.encrypt = encrypt;
 exports.getBehavior = getBehavior;
 exports.getProcessManager = getProcessManager;
 exports.idGenerator = idGenerator;
-exports.initializeNanoid = initializeNanoid;
 exports.mapAwsError = mapAwsError;
 exports.mapWithConcurrency = mapWithConcurrency;
 exports.passwordGenerator = passwordGenerator;

package/dist/s3db-lite.d.ts

@@ -2597,7 +2597,6 @@ declare function tryFnSync<T>(fn: () => T): TryResult<T>;
 declare function encrypt(content: string, passphrase: string): Promise<string>;
 declare function decrypt(encryptedBase64: string, passphrase: string): Promise<string>;
 
-declare function initializeNanoid(): Promise<void>;
 declare const idGenerator: (size?: number) => string;
 declare const passwordGenerator: (size?: number) => string;
 declare const createCustomGenerator: (alphabet: string, size: number) => ((size?: number) => string);
@@ -3533,5 +3532,5 @@ declare class PerformanceMonitor {
     private _avg;
 }
 
-export { AVAILABLE_BEHAVIORS, AdaptiveTuning, AnalyticsNotEnabledError, AuthenticationError, BaseError, BehaviorError, Benchmark, S3Client as Client, ConnectionString, ConnectionStringError, CryptoError, DEFAULT_BEHAVIOR, Database, DatabaseError, EncryptionError, ErrorMap, FileSystemClient, InvalidResourceItem, MemoryClient, MetadataLimitError, MissingMetadata, NoSuchBucket, NoSuchKey, NotFound, PartitionDriverError, PartitionError, PerformanceMonitor, PermissionError, PluginError, PluginStorageError, ProcessManager, Resource, ResourceError, ResourceIdsPageReader, ResourceIdsReader, ResourceNotFound, ResourceReader, ResourceWriter, S3Client, Database as S3db, S3dbError, SafeEventEmitter, Schema, SchemaError, StreamError, TaskExecutor, TasksPool, TasksRunner, UnknownError, ValidationError, Validator, behaviors, benchmark, createCustomGenerator, createLogger, createSafeEventEmitter, decode, decodeBits, decodeBuffer, decodeDecimal, decrypt, S3db as default, encode, encodeBits, encodeBuffer, encodeDecimal, encrypt, getBehavior, getProcessManager, idGenerator, initializeNanoid, mapAwsError, mapWithConcurrency, passwordGenerator, resetProcessManager, streamToString, tryFn, tryFnSync };
+export { AVAILABLE_BEHAVIORS, AdaptiveTuning, AnalyticsNotEnabledError, AuthenticationError, BaseError, BehaviorError, Benchmark, S3Client as Client, ConnectionString, ConnectionStringError, CryptoError, DEFAULT_BEHAVIOR, Database, DatabaseError, EncryptionError, ErrorMap, FileSystemClient, InvalidResourceItem, MemoryClient, MetadataLimitError, MissingMetadata, NoSuchBucket, NoSuchKey, NotFound, PartitionDriverError, PartitionError, PerformanceMonitor, PermissionError, PluginError, PluginStorageError, ProcessManager, Resource, ResourceError, ResourceIdsPageReader, ResourceIdsReader, ResourceNotFound, ResourceReader, ResourceWriter, S3Client, Database as S3db, S3dbError, SafeEventEmitter, Schema, SchemaError, StreamError, TaskExecutor, TasksPool, TasksRunner, UnknownError, ValidationError, Validator, behaviors, benchmark, createCustomGenerator, createLogger, createSafeEventEmitter, decode, decodeBits, decodeBuffer, decodeDecimal, decrypt, S3db as default, encode, encodeBits, encodeBuffer, encodeDecimal, encrypt, getBehavior, getProcessManager, idGenerator, mapAwsError, mapWithConcurrency, passwordGenerator, resetProcessManager, streamToString, tryFn, tryFnSync };
 export type { AnalyticsNotEnabledErrorDetails, BaseErrorContext, BehaviorErrorDetails, InvalidResourceItemDetails, LogLevel$1 as LogLevel, MapAwsErrorContext, MetadataLimitErrorDetails, NoSuchBucketDetails, NoSuchKeyDetails, PartitionDriverErrorDetails, PartitionErrorDetails, PluginErrorDetails, PluginStorageErrorDetails, ResourceNotFoundDetails, S3dbErrorDetails, SchemaRegistry, SerializedError, StreamErrorDetails, TryResult };