s3db.js 7.4.2 → 8.0.0

package/mcp/server.js

@@ -747,7 +747,7 @@ class S3dbMCPServer {
         });
       } else {
         // Memory cache configuration (default)
-        cacheConfig.driverType = 'memory';
+        cacheConfig.driver = 'memory';
         cacheConfig.memoryOptions = {
           maxSize: cacheMaxSizeEnv,
           ttl: cacheTtlEnv,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "s3db.js",
-  "version": "7.4.2",
+  "version": "8.0.0",
   "description": "Use AWS S3, the world's most reliable document storage, as a database with this ORM.",
   "main": "dist/s3db.cjs.js",
   "module": "dist/s3db.es.js",
@@ -49,8 +49,31 @@
     "PLUGINS.md",
     "UNLICENSE"
   ],
+  "scripts": {
+    "build": "rollup -c",
+    "dev": "rollup -c -w",
+    "test": "npm run test:js && npm run test:ts",
+    "test:js": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testPathIgnorePatterns=\"plugin-audit.test.js|tests/typescript/\" --testTimeout=10000",
+    "test:ts": "tsc --noEmit --project tests/typescript/tsconfig.json",
+    "test:js-converage": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --detectOpenHandles --coverage --runInBand",
+    "test:js-ai": "node --max-old-space-size=4096 --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testPathIgnorePatterns=\"plugin-audit.test.js|tests/typescript/\"",
+    "test:full": "npm run test:js-ai && npm run test:ts",
+    "test:audit": "node --max-old-space-size=8192 --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-audit.test.js --runInBand --testTimeout=60000",
+    "test:cache": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-cache*.test.js --runInBand",
+    "test:quick": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testTimeout=10000",
+    "test:batch": "./test-batch.sh",
+    "test:plugins": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=60000",
+    "test:plugins:fast": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=15000 --testPathIgnorePatterns='plugin-audit.test.js|plugin-replicator-s3db.test.js|plugin-fulltext.test.js'",
+    "test:slow": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-audit.test.js tests/plugins/plugin-replicator-s3db.test.js tests/plugins/plugin-fulltext.test.js --runInBand --testTimeout=120000",
+    "test:types": "tsc --noEmit --project tests/typescript/tsconfig.json",
+    "test:types:basic": "tsc --noEmit tests/typescript/basic-usage.test.ts",
+    "test:types:direct": "tsc --noEmit tests/typescript/direct-type-test.ts",
+    "test:types:watch": "tsc --noEmit --watch --project tests/typescript/tsconfig.json",
+    "validate:types": "npm run test:types && echo 'TypeScript definitions are valid!'"
+  },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.848.0",
+    "@aws-sdk/client-s3": "^3.850.0",
+    "@smithy/node-http-handler": "^4.1.0",
     "@supercharge/promise-pool": "^3.2.0",
     "fastest-validator": "^1.19.1",
     "flat": "^6.0.1",
@@ -88,10 +111,10 @@
     "@rollup/plugin-node-resolve": "^16.0.1",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
-    "@types/node": "24.0.15",
-    "dotenv": "^17.2.0",
-    "jest": "^30.0.4",
-    "rollup": "^4.45.1",
+    "@types/node": "24.1.0",
+    "dotenv": "^17.2.1",
+    "jest": "^30.0.5",
+    "rollup": "^4.46.1",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-esbuild": "^6.2.1",
     "rollup-plugin-polyfill-node": "^0.13.0",
@@ -100,26 +123,5 @@
   },
   "funding": [
     "https://github.com/sponsors/forattini-dev"
-  ],
-  "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -c -w",
-    "test": "npm run test:js && npm run test:ts",
-    "test:js": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand",
-    "test:ts": "tsc --noEmit --project tests/typescript/tsconfig.json",
-    "test:js-converage": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --detectOpenHandles --coverage --runInBand",
-    "test:js-ai": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --detectOpenHandles --runInBand",
-    "test:full": "npm run test:js && npm run test:ts",
-    "test:cache": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-cache*.test.js --runInBand",
-    "test:quick": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand --testTimeout=10000",
-    "test:batch": "./test-batch.sh",
-    "test:plugins": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=60000",
-    "test:plugins:fast": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/ --runInBand --testTimeout=15000 --testPathIgnorePatterns='plugin-audit.test.js|plugin-replicator-s3db.test.js|plugin-fulltext.test.js'",
-    "test:slow": "node --no-warnings --experimental-vm-modules node_modules/jest/bin/jest.js tests/plugins/plugin-audit.test.js tests/plugins/plugin-replicator-s3db.test.js tests/plugins/plugin-fulltext.test.js --runInBand --testTimeout=120000",
-    "test:types": "tsc --noEmit --project tests/typescript/tsconfig.json",
-    "test:types:basic": "tsc --noEmit tests/typescript/basic-usage.test.ts",
-    "test:types:direct": "tsc --noEmit tests/typescript/direct-type-test.ts",
-    "test:types:watch": "tsc --noEmit --watch --project tests/typescript/tsconfig.json",
-    "validate:types": "npm run test:types && echo 'TypeScript definitions are valid!'"
-  }
-}
+  ]
+}

package/src/client.class.js

@@ -1,10 +1,10 @@
 import path from "path";
 import EventEmitter from "events";
 import { chunk } from "lodash-es";
+import { Agent as HttpAgent } from 'http';
+import { Agent as HttpsAgent } from 'https';
 import { PromisePool } from "@supercharge/promise-pool";
-
-import { idGenerator } from "./concerns/id.js";
-import tryFn from "./concerns/try-fn.js";
+import { NodeHttpHandler } from '@smithy/node-http-handler';
 
 import {
   S3Client,
@@ -16,10 +16,12 @@ import {
   DeleteObjectsCommand,
   ListObjectsV2Command,
 } from '@aws-sdk/client-s3';
-import { md5 } from "./concerns/crypto.js";
 
-import { mapAwsError, UnknownError, NoSuchKey, NotFound } from "./errors.js";
+import tryFn from "./concerns/try-fn.js";
+import { md5 } from "./concerns/crypto.js";
+import { idGenerator } from "./concerns/id.js";
 import { ConnectionString } from "./connection-string.class.js";
+import { mapAwsError, UnknownError, NoSuchKey, NotFound } from "./errors.js";
 
 export class Client extends EventEmitter {
   constructor({
@@ -28,19 +30,38 @@ export class Client extends EventEmitter {
     AwsS3Client,
     connectionString,
     parallelism = 10,
+    httpClientOptions = {},
   }) {
     super();
     this.verbose = verbose;
     this.id = id ?? idGenerator();
     this.parallelism = parallelism;
     this.config = new ConnectionString(connectionString);
+    this.httpClientOptions = {
+      keepAlive: false, // Disabled for maximum creation speed
+      maxSockets: 10, // Minimal sockets
+      maxFreeSockets: 2, // Minimal pool
+      timeout: 15000, // Short timeout
+      ...httpClientOptions,
+    };
     this.client = AwsS3Client || this.createClient()
   }
 
   createClient() {
+    // Create HTTP agents with keep-alive configuration
+    const httpAgent = new HttpAgent(this.httpClientOptions);
+    const httpsAgent = new HttpsAgent(this.httpClientOptions);
+
+    // Create HTTP handler with agents
+    const httpHandler = new NodeHttpHandler({
+      httpAgent,
+      httpsAgent,
+    });
+
     let options = {
       region: this.config.region,
       endpoint: this.config.endpoint,
+      requestHandler: httpHandler,
     }
 
     if (this.config.forcePathStyle) options.forcePathStyle = true

package/src/database.class.js

@@ -32,6 +32,9 @@ export class Database extends EventEmitter {
     this.passphrase = options.passphrase || "secret";
     this.versioningEnabled = options.versioningEnabled || false;
 
+    // Initialize hooks system
+    this._initHooks();
+
     // Handle both connection string and individual parameters
     let connectionString = options.connectionString;
     if (!connectionString && (options.bucket || options.accessKeyId || options.secretAccessKey)) {
@@ -617,6 +620,154 @@ export class Database extends EventEmitter {
       // Silently ignore errors on exit
     }
   }
+
+  /**
+   * Initialize hooks system for database operations
+   * @private
+   */
+  _initHooks() {
+    // Map of hook name -> array of hook functions
+    this._hooks = new Map();
+    
+    // Define available hooks
+    this._hookEvents = [
+      'beforeConnect', 'afterConnect',
+      'beforeCreateResource', 'afterCreateResource',
+      'beforeUploadMetadata', 'afterUploadMetadata',
+      'beforeDisconnect', 'afterDisconnect',
+      'resourceCreated', 'resourceUpdated'
+    ];
+
+    // Initialize hook arrays
+    for (const event of this._hookEvents) {
+      this._hooks.set(event, []);
+    }
+
+    // Wrap hookable methods
+    this._wrapHookableMethods();
+  }
+
+  /**
+   * Wrap methods that can have hooks
+   * @private
+   */
+  _wrapHookableMethods() {
+    if (this._hooksInstalled) return; // Already wrapped
+
+    // Store original methods
+    this._originalConnect = this.connect.bind(this);
+    this._originalCreateResource = this.createResource.bind(this);
+    this._originalUploadMetadataFile = this.uploadMetadataFile.bind(this);
+    this._originalDisconnect = this.disconnect.bind(this);
+
+    // Wrap connect
+    this.connect = async (...args) => {
+      await this._executeHooks('beforeConnect', { args });
+      const result = await this._originalConnect(...args);
+      await this._executeHooks('afterConnect', { result, args });
+      return result;
+    };
+
+    // Wrap createResource
+    this.createResource = async (config) => {
+      await this._executeHooks('beforeCreateResource', { config });
+      const resource = await this._originalCreateResource(config);
+      await this._executeHooks('afterCreateResource', { resource, config });
+      return resource;
+    };
+
+    // Wrap uploadMetadataFile
+    this.uploadMetadataFile = async (...args) => {
+      await this._executeHooks('beforeUploadMetadata', { args });
+      const result = await this._originalUploadMetadataFile(...args);
+      await this._executeHooks('afterUploadMetadata', { result, args });
+      return result;
+    };
+
+    // Wrap disconnect
+    this.disconnect = async (...args) => {
+      await this._executeHooks('beforeDisconnect', { args });
+      const result = await this._originalDisconnect(...args);
+      await this._executeHooks('afterDisconnect', { result, args });
+      return result;
+    };
+
+    this._hooksInstalled = true;
+  }
+
+  /**
+   * Add a hook for a specific database event
+   * @param {string} event - Hook event name
+   * @param {Function} fn - Hook function
+   * @example
+   * database.addHook('afterCreateResource', async ({ resource }) => {
+   *   console.log('Resource created:', resource.name);
+   * });
+   */
+  addHook(event, fn) {
+    if (!this._hooks) this._initHooks();
+    if (!this._hooks.has(event)) {
+      throw new Error(`Unknown hook event: ${event}. Available events: ${this._hookEvents.join(', ')}`);
+    }
+    if (typeof fn !== 'function') {
+      throw new Error('Hook function must be a function');
+    }
+    this._hooks.get(event).push(fn);
+  }
+
+  /**
+   * Execute hooks for a specific event
+   * @param {string} event - Hook event name
+   * @param {Object} context - Context data to pass to hooks
+   * @private
+   */
+  async _executeHooks(event, context = {}) {
+    if (!this._hooks || !this._hooks.has(event)) return;
+    
+    const hooks = this._hooks.get(event);
+    for (const hook of hooks) {
+      try {
+        await hook({ database: this, ...context });
+      } catch (error) {
+        // Emit error but don't stop hook execution
+        this.emit('hookError', { event, error, context });
+      }
+    }
+  }
+
+  /**
+   * Remove a hook for a specific event
+   * @param {string} event - Hook event name
+   * @param {Function} fn - Hook function to remove
+   */
+  removeHook(event, fn) {
+    if (!this._hooks || !this._hooks.has(event)) return;
+    
+    const hooks = this._hooks.get(event);
+    const index = hooks.indexOf(fn);
+    if (index > -1) {
+      hooks.splice(index, 1);
+    }
+  }
+
+  /**
+   * Get all hooks for a specific event
+   * @param {string} event - Hook event name
+   * @returns {Function[]} Array of hook functions
+   */
+  getHooks(event) {
+    if (!this._hooks || !this._hooks.has(event)) return [];
+    return [...this._hooks.get(event)];
+  }
+
+  /**
+   * Clear all hooks for a specific event
+   * @param {string} event - Hook event name
+   */
+  clearHooks(event) {
+    if (!this._hooks || !this._hooks.has(event)) return;
+    this._hooks.get(event).length = 0;
+  }
 }
 
 export class S3db extends Database {}