n8n-nodes-base 1.96.0 → 1.97.0

package/dist/utils/connection-pool-manager.js

@@ -22,6 +22,7 @@ __export(connection_pool_manager_exports, {
 });
 module.exports = __toCommonJS(connection_pool_manager_exports);
 var import_crypto = require("crypto");
+var import_n8n_workflow = require("n8n-workflow");
 let instance;
 const ttl = 5 * 60 * 1e3;
 const cleanUpInterval = 60 * 1e3;
@@ -30,18 +31,22 @@ class ConnectionPoolManager {
    * Private constructor that initializes the connection pool manager.
    * Sets up cleanup handlers for process exit and stale connections.
    */
-  constructor() {
+  constructor(logger) {
+    this.logger = logger;
     this.map = /* @__PURE__ */ new Map();
-    process.on("exit", () => this.onShutdown());
+    process.on("exit", () => {
+      this.logger.debug("ConnectionPoolManager: Shutting down. Cleaning up all pools");
+      this.purgeConnections();
+    });
     setInterval(() => this.cleanupStaleConnections(), cleanUpInterval);
   }
   /**
    * Gets the singleton instance of the ConnectionPoolManager.
    * Creates a new instance if one doesn't exist.
    */
-  static getInstance() {
+  static getInstance(logger) {
     if (!instance) {
-      instance = new ConnectionPoolManager();
+      instance = new ConnectionPoolManager(logger);
     }
     return instance;
   }
@@ -65,49 +70,56 @@ class ConnectionPoolManager {
   async getConnection(options) {
     const key = this.makeKey(options);
     let value = this.map.get(key);
-    if (!value) {
-      value = {
-        pool: await options.fallBackHandler(),
-        cleanUpHandler: options.cleanUpHandler
-      };
+    if (value) {
+      value.lastUsed = Date.now();
+      value.wasUsed(value.pool);
+      return value.pool;
+    }
+    const abortController = new AbortController();
+    value = {
+      pool: await options.fallBackHandler(abortController),
+      abortController,
+      wasUsed: options.wasUsed
+    };
+    if (abortController.signal.aborted) {
+      throw new import_n8n_workflow.OperationalError("Could not create pool. Connection attempt was aborted.", {
+        cause: abortController.signal.reason
+      });
     }
     this.map.set(key, { ...value, lastUsed: Date.now() });
+    abortController.signal.addEventListener("abort", async () => {
+      this.logger.debug("ConnectionPoolManager: Got abort signal, cleaning up pool.");
+      this.cleanupConnection(key);
+    });
     return value.pool;
   }
+  cleanupConnection(key) {
+    const registration = this.map.get(key);
+    if (registration) {
+      this.map.delete(key);
+      registration.abortController.abort();
+    }
+  }
   /**
    * Removes and cleans up connection pools that haven't been used within the
    * TTL.
    */
   cleanupStaleConnections() {
     const now = Date.now();
-    for (const [key, { cleanUpHandler, lastUsed, pool }] of this.map.entries()) {
+    for (const [key, { lastUsed }] of this.map.entries()) {
       if (now - lastUsed > ttl) {
-        void cleanUpHandler(pool);
-        this.map.delete(key);
+        this.logger.debug("ConnectionPoolManager: Found stale pool. Cleaning it up.");
+        void this.cleanupConnection(key);
       }
     }
   }
   /**
    * Removes and cleans up all existing connection pools.
+   * Connections are closed in the background.
    */
-  async purgeConnections() {
-    await Promise.all(
-      [...this.map.entries()].map(async ([key, value]) => {
-        this.map.delete(key);
-        return await value.cleanUpHandler(value.pool);
-      })
-    );
-  }
-  /**
-   * Cleans up all connection pools when the process is shutting down.
-   * Does not wait for cleanup promises to resolve also does not remove the
-   * references from the pool.
-   *
-   * Only call this on process shutdown.
-   */
-  onShutdown() {
-    for (const { cleanUpHandler, pool } of this.map.values()) {
-      void cleanUpHandler(pool);
+  purgeConnections() {
+    for (const key of this.map.keys()) {
+      this.cleanupConnection(key);
     }
   }
 }

package/dist/utils/connection-pool-manager.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../utils/connection-pool-manager.ts"],"sourcesContent":["import { createHash } from 'crypto';\n\nlet instance: ConnectionPoolManager;\n\n// 5 minutes\nconst ttl = 5 * 60 * 1000;\n\n// 1 minute\nconst cleanUpInterval = 60 * 1000;\n\ntype RegistrationOptions = {\n\tcredentials: unknown;\n\tnodeType: string;\n\tnodeVersion?: string;\n};\n\ntype GetConnectionOption<Pool> = RegistrationOptions & {\n\t/** When a node requests for a connection pool, but none is available, this handler is called to create new instance of the pool, which then cached and re-used until it goes stale.  */\n\tfallBackHandler: () => Promise<Pool>;\n\n\t/** When a pool hasn't been used in a while, or when the server is shutting down, this handler is invoked to close the pool */\n\tcleanUpHandler: (pool: Pool) => Promise<void>;\n};\n\ntype Registration<Pool> = {\n\t/** This is an instance of a Connection Pool class, that gets reused across multiple executions */\n\tpool: Pool;\n\n\t/** @see GetConnectionOption['closeHandler'] */\n\tcleanUpHandler: (pool: Pool) => Promise<void>;\n\n\t/** We keep this timestamp to check if a pool hasn't been used in a while, and if it needs to be closed */\n\tlastUsed: number;\n};\n\nexport class ConnectionPoolManager {\n\t/**\n\t * Gets the singleton instance of the ConnectionPoolManager.\n\t * Creates a new instance if one doesn't exist.\n\t */\n\tstatic getInstance(): ConnectionPoolManager {\n\t\tif (!instance) {\n\t\t\tinstance = new ConnectionPoolManager();\n\t\t}\n\t\treturn instance;\n\t}\n\n\tprivate map = new Map<string, Registration<unknown>>();\n\n\t/**\n\t * Private constructor that initializes the connection pool manager.\n\t * Sets up cleanup handlers for process exit and stale connections.\n\t */\n\tprivate constructor() {\n\t\t// Close all open pools when the process exits\n\t\tprocess.on('exit', () => this.onShutdown());\n\n\t\t// Regularly close stale pools\n\t\tsetInterval(() => this.cleanupStaleConnections(), cleanUpInterval);\n\t}\n\n\t/**\n\t * Generates a unique key for connection pool identification.\n\t * Hashes the credentials and node information for security.\n\t */\n\tprivate makeKey({ credentials, nodeType, nodeVersion }: RegistrationOptions): string {\n\t\t// The credential contains decrypted secrets, that's why we hash it.\n\t\treturn createHash('sha1')\n\t\t\t.update(\n\t\t\t\tJSON.stringify({\n\t\t\t\t\tcredentials,\n\t\t\t\t\tnodeType,\n\t\t\t\t\tnodeVersion,\n\t\t\t\t}),\n\t\t\t)\n\t\t\t.digest('base64');\n\t}\n\n\t/**\n\t * Gets or creates a connection pool for the given options.\n\t * Updates the last used timestamp for existing connections.\n\t */\n\tasync getConnection<T>(options: GetConnectionOption<T>): Promise<T> {\n\t\tconst key = this.makeKey(options);\n\n\t\tlet value = this.map.get(key);\n\t\tif (!value) {\n\t\t\tvalue = {\n\t\t\t\tpool: await options.fallBackHandler(),\n\t\t\t\tcleanUpHandler: options.cleanUpHandler,\n\t\t\t} as Registration<unknown>;\n\t\t}\n\n\t\tthis.map.set(key, { ...value, lastUsed: Date.now() });\n\t\treturn value.pool as T;\n\t}\n\n\t/**\n\t * Removes and cleans up connection pools that haven't been used within the\n\t * TTL.\n\t */\n\tprivate cleanupStaleConnections() {\n\t\tconst now = Date.now();\n\t\tfor (const [key, { cleanUpHandler, lastUsed, pool }] of this.map.entries()) {\n\t\t\tif (now - lastUsed > ttl) {\n\t\t\t\tvoid cleanUpHandler(pool);\n\t\t\t\tthis.map.delete(key);\n\t\t\t}\n\t\t}\n\t}\n\n\t/**\n\t * Removes and cleans up all existing connection pools.\n\t */\n\tasync purgeConnections(): Promise<void> {\n\t\tawait Promise.all(\n\t\t\t[...this.map.entries()].map(async ([key, value]) => {\n\t\t\t\tthis.map.delete(key);\n\n\t\t\t\treturn await value.cleanUpHandler(value.pool);\n\t\t\t}),\n\t\t);\n\t}\n\n\t/**\n\t * Cleans up all connection pools when the process is shutting down.\n\t * Does not wait for cleanup promises to resolve also does not remove the\n\t * references from the pool.\n\t *\n\t * Only call this on process shutdown.\n\t */\n\tonShutdown() {\n\t\tfor (const { cleanUpHandler, pool } of this.map.values()) {\n\t\t\tvoid cleanUpHandler(pool);\n\t\t}\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA2B;AAE3B,IAAI;AAGJ,MAAM,MAAM,IAAI,KAAK;AAGrB,MAAM,kBAAkB,KAAK;AA2BtB,MAAM,sBAAsB;AAAA;AAAA;AAAA;AAAA;AAAA,EAkB1B,cAAc;AANtB,SAAQ,MAAM,oBAAI,IAAmC;AAQpD,YAAQ,GAAG,QAAQ,MAAM,KAAK,WAAW,CAAC;AAG1C,gBAAY,MAAM,KAAK,wBAAwB,GAAG,eAAe;AAAA,EAClE;AAAA;AAAA;AAAA;AAAA;AAAA,EAnBA,OAAO,cAAqC;AAC3C,QAAI,CAAC,UAAU;AACd,iBAAW,IAAI,sBAAsB;AAAA,IACtC;AACA,WAAO;AAAA,EACR;AAAA;AAAA;AAAA;AAAA;AAAA,EAoBQ,QAAQ,EAAE,aAAa,UAAU,YAAY,GAAgC;AAEpF,eAAO,0BAAW,MAAM,EACtB;AAAA,MACA,KAAK,UAAU;AAAA,QACd;AAAA,QACA;AAAA,QACA;AAAA,MACD,CAAC;AAAA,IACF,EACC,OAAO,QAAQ;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,cAAiB,SAA6C;AACnE,UAAM,MAAM,KAAK,QAAQ,OAAO;AAEhC,QAAI,QAAQ,KAAK,IAAI,IAAI,GAAG;AAC5B,QAAI,CAAC,OAAO;AACX,cAAQ;AAAA,QACP,MAAM,MAAM,QAAQ,gBAAgB;AAAA,QACpC,gBAAgB,QAAQ;AAAA,MACzB;AAAA,IACD;AAEA,SAAK,IAAI,IAAI,KAAK,EAAE,GAAG,OAAO,UAAU,KAAK,IAAI,EAAE,CAAC;AACpD,WAAO,MAAM;AAAA,EACd;AAAA;AAAA;AAAA;AAAA;AAAA,EAMQ,0BAA0B;AACjC,UAAM,MAAM,KAAK,IAAI;AACrB,eAAW,CAAC,KAAK,EAAE,gBAAgB,UAAU,KAAK,CAAC,KAAK,KAAK,IAAI,QAAQ,GAAG;AAC3E,UAAI,MAAM,WAAW,KAAK;AACzB,aAAK,eAAe,IAAI;AACxB,aAAK,IAAI,OAAO,GAAG;AAAA,MACpB;AAAA,IACD;AAAA,EACD;AAAA;AAAA;AAAA;AAAA,EAKA,MAAM,mBAAkC;AACvC,UAAM,QAAQ;AAAA,MACb,CAAC,GAAG,KAAK,IAAI,QAAQ,CAAC,EAAE,IAAI,OAAO,CAAC,KAAK,KAAK,MAAM;AACnD,aAAK,IAAI,OAAO,GAAG;AAEnB,eAAO,MAAM,MAAM,eAAe,MAAM,IAAI;AAAA,MAC7C,CAAC;AAAA,IACF;AAAA,EACD;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EASA,aAAa;AACZ,eAAW,EAAE,gBAAgB,KAAK,KAAK,KAAK,IAAI,OAAO,GAAG;AACzD,WAAK,eAAe,IAAI;AAAA,IACzB;AAAA,EACD;AACD;","names":[]}
+{"version":3,"sources":["../../utils/connection-pool-manager.ts"],"sourcesContent":["import { createHash } from 'crypto';\nimport { OperationalError, type Logger } from 'n8n-workflow';\n\nlet instance: ConnectionPoolManager;\n\n// 5 minutes\nconst ttl = 5 * 60 * 1000;\n\n// 1 minute\nconst cleanUpInterval = 60 * 1000;\n\ntype RegistrationOptions = {\n\tcredentials: unknown;\n\tnodeType: string;\n\tnodeVersion?: string;\n};\n\ntype GetConnectionOption<Pool> = RegistrationOptions & {\n\t/**\n\t * When a node requests for a connection pool, but none is available, this\n\t * handler is called to create new instance of the pool, which is then cached\n\t * and re-used until it goes stale.\n\t */\n\tfallBackHandler: (abortController: AbortController) => Promise<Pool>;\n\n\twasUsed: (pool: Pool) => void;\n};\n\ntype Registration<Pool> = {\n\t/** This is an instance of a Connection Pool class, that gets reused across multiple executions */\n\tpool: Pool;\n\n\tabortController: AbortController;\n\n\twasUsed: (pool: Pool) => void;\n\n\t/** We keep this timestamp to check if a pool hasn't been used in a while, and if it needs to be closed */\n\tlastUsed: number;\n};\n\nexport class ConnectionPoolManager {\n\t/**\n\t * Gets the singleton instance of the ConnectionPoolManager.\n\t * Creates a new instance if one doesn't exist.\n\t */\n\tstatic getInstance(logger: Logger): ConnectionPoolManager {\n\t\tif (!instance) {\n\t\t\tinstance = new ConnectionPoolManager(logger);\n\t\t}\n\t\treturn instance;\n\t}\n\n\tprivate map = new Map<string, Registration<unknown>>();\n\n\t/**\n\t * Private constructor that initializes the connection pool manager.\n\t * Sets up cleanup handlers for process exit and stale connections.\n\t */\n\tprivate constructor(private readonly logger: Logger) {\n\t\t// Close all open pools when the process exits\n\t\tprocess.on('exit', () => {\n\t\t\tthis.logger.debug('ConnectionPoolManager: Shutting down. Cleaning up all pools');\n\t\t\tthis.purgeConnections();\n\t\t});\n\n\t\t// Regularly close stale pools\n\t\tsetInterval(() => this.cleanupStaleConnections(), cleanUpInterval);\n\t}\n\n\t/**\n\t * Generates a unique key for connection pool identification.\n\t * Hashes the credentials and node information for security.\n\t */\n\tprivate makeKey({ credentials, nodeType, nodeVersion }: RegistrationOptions): string {\n\t\t// The credential contains decrypted secrets, that's why we hash it.\n\t\treturn createHash('sha1')\n\t\t\t.update(\n\t\t\t\tJSON.stringify({\n\t\t\t\t\tcredentials,\n\t\t\t\t\tnodeType,\n\t\t\t\t\tnodeVersion,\n\t\t\t\t}),\n\t\t\t)\n\t\t\t.digest('base64');\n\t}\n\n\t/**\n\t * Gets or creates a connection pool for the given options.\n\t * Updates the last used timestamp for existing connections.\n\t */\n\tasync getConnection<T>(options: GetConnectionOption<T>): Promise<T> {\n\t\tconst key = this.makeKey(options);\n\n\t\tlet value = this.map.get(key);\n\n\t\tif (value) {\n\t\t\tvalue.lastUsed = Date.now();\n\t\t\tvalue.wasUsed(value.pool);\n\t\t\treturn value.pool as T;\n\t\t}\n\n\t\tconst abortController = new AbortController();\n\t\tvalue = {\n\t\t\tpool: await options.fallBackHandler(abortController),\n\t\t\tabortController,\n\t\t\twasUsed: options.wasUsed,\n\t\t} as Registration<unknown>;\n\n\t\t// It's possible that `options.fallBackHandler` already called the abort\n\t\t// function. If that's the case let's not continue.\n\t\tif (abortController.signal.aborted) {\n\t\t\tthrow new OperationalError('Could not create pool. Connection attempt was aborted.', {\n\t\t\t\tcause: abortController.signal.reason,\n\t\t\t});\n\t\t}\n\n\t\tthis.map.set(key, { ...value, lastUsed: Date.now() });\n\t\tabortController.signal.addEventListener('abort', async () => {\n\t\t\tthis.logger.debug('ConnectionPoolManager: Got abort signal, cleaning up pool.');\n\t\t\tthis.cleanupConnection(key);\n\t\t});\n\n\t\treturn value.pool as T;\n\t}\n\n\tprivate cleanupConnection(key: string) {\n\t\tconst registration = this.map.get(key);\n\n\t\tif (registration) {\n\t\t\tthis.map.delete(key);\n\t\t\tregistration.abortController.abort();\n\t\t}\n\t}\n\n\t/**\n\t * Removes and cleans up connection pools that haven't been used within the\n\t * TTL.\n\t */\n\tprivate cleanupStaleConnections() {\n\t\tconst now = Date.now();\n\t\tfor (const [key, { lastUsed }] of this.map.entries()) {\n\t\t\tif (now - lastUsed > ttl) {\n\t\t\t\tthis.logger.debug('ConnectionPoolManager: Found stale pool. Cleaning it up.');\n\t\t\t\tvoid this.cleanupConnection(key);\n\t\t\t}\n\t\t}\n\t}\n\n\t/**\n\t * Removes and cleans up all existing connection pools.\n\t * Connections are closed in the background.\n\t */\n\tpurgeConnections(): void {\n\t\tfor (const key of this.map.keys()) {\n\t\t\tthis.cleanupConnection(key);\n\t\t}\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA2B;AAC3B,0BAA8C;AAE9C,IAAI;AAGJ,MAAM,MAAM,IAAI,KAAK;AAGrB,MAAM,kBAAkB,KAAK;AA+BtB,MAAM,sBAAsB;AAAA;AAAA;AAAA;AAAA;AAAA,EAkB1B,YAA6B,QAAgB;AAAhB;AANrC,SAAQ,MAAM,oBAAI,IAAmC;AAQpD,YAAQ,GAAG,QAAQ,MAAM;AACxB,WAAK,OAAO,MAAM,6DAA6D;AAC/E,WAAK,iBAAiB;AAAA,IACvB,CAAC;AAGD,gBAAY,MAAM,KAAK,wBAAwB,GAAG,eAAe;AAAA,EAClE;AAAA;AAAA;AAAA;AAAA;AAAA,EAtBA,OAAO,YAAY,QAAuC;AACzD,QAAI,CAAC,UAAU;AACd,iBAAW,IAAI,sBAAsB,MAAM;AAAA,IAC5C;AACA,WAAO;AAAA,EACR;AAAA;AAAA;AAAA;AAAA;AAAA,EAuBQ,QAAQ,EAAE,aAAa,UAAU,YAAY,GAAgC;AAEpF,eAAO,0BAAW,MAAM,EACtB;AAAA,MACA,KAAK,UAAU;AAAA,QACd;AAAA,QACA;AAAA,QACA;AAAA,MACD,CAAC;AAAA,IACF,EACC,OAAO,QAAQ;AAAA,EAClB;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,cAAiB,SAA6C;AACnE,UAAM,MAAM,KAAK,QAAQ,OAAO;AAEhC,QAAI,QAAQ,KAAK,IAAI,IAAI,GAAG;AAE5B,QAAI,OAAO;AACV,YAAM,WAAW,KAAK,IAAI;AAC1B,YAAM,QAAQ,MAAM,IAAI;AACxB,aAAO,MAAM;AAAA,IACd;AAEA,UAAM,kBAAkB,IAAI,gBAAgB;AAC5C,YAAQ;AAAA,MACP,MAAM,MAAM,QAAQ,gBAAgB,eAAe;AAAA,MACnD;AAAA,MACA,SAAS,QAAQ;AAAA,IAClB;AAIA,QAAI,gBAAgB,OAAO,SAAS;AACnC,YAAM,IAAI,qCAAiB,0DAA0D;AAAA,QACpF,OAAO,gBAAgB,OAAO;AAAA,MAC/B,CAAC;AAAA,IACF;AAEA,SAAK,IAAI,IAAI,KAAK,EAAE,GAAG,OAAO,UAAU,KAAK,IAAI,EAAE,CAAC;AACpD,oBAAgB,OAAO,iBAAiB,SAAS,YAAY;AAC5D,WAAK,OAAO,MAAM,4DAA4D;AAC9E,WAAK,kBAAkB,GAAG;AAAA,IAC3B,CAAC;AAED,WAAO,MAAM;AAAA,EACd;AAAA,EAEQ,kBAAkB,KAAa;AACtC,UAAM,eAAe,KAAK,IAAI,IAAI,GAAG;AAErC,QAAI,cAAc;AACjB,WAAK,IAAI,OAAO,GAAG;AACnB,mBAAa,gBAAgB,MAAM;AAAA,IACpC;AAAA,EACD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMQ,0BAA0B;AACjC,UAAM,MAAM,KAAK,IAAI;AACrB,eAAW,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,KAAK,IAAI,QAAQ,GAAG;AACrD,UAAI,MAAM,WAAW,KAAK;AACzB,aAAK,OAAO,MAAM,0DAA0D;AAC5E,aAAK,KAAK,kBAAkB,GAAG;AAAA,MAChC;AAAA,IACD;AAAA,EACD;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,mBAAyB;AACxB,eAAW,OAAO,KAAK,IAAI,KAAK,GAAG;AAClC,WAAK,kBAAkB,GAAG;AAAA,IAC3B;AAAA,EACD;AACD;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.96.0",
+  "version": "1.97.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "files": [
@@ -861,7 +861,7 @@
     "@types/xml2js": "^0.4.14",
     "eslint-plugin-n8n-nodes-base": "^1.16.3",
     "@n8n/typescript-config": "1.2.0",
-    "n8n-core": "1.97.0"
+    "n8n-core": "1.98.0"
   },
   "dependencies": {
     "@aws-sdk/client-sso-oidc": "3.808.0",
@@ -930,10 +930,10 @@
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
     "xml2js": "0.6.2",
     "xmlhttprequest-ssl": "3.1.0",
+    "@n8n/config": "1.43.0",
     "@n8n/di": "0.6.0",
-    "@n8n/config": "1.42.0",
-    "n8n-workflow": "1.95.0",
-    "@n8n/imap": "0.10.0"
+    "@n8n/imap": "0.10.0",
+    "n8n-workflow": "1.96.0"
   },
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",