knex 2.4.1 → 2.5.0

package/CHANGELOG.md

@@ -1,12 +1,54 @@
 # Master (Unreleased)
 
-# 2.4.1 - 18 January, 2022
+# 2.5.0 - 08 July, 2023
+
+### New features
+
+- Add uuid helper function #5617
+- Add `nativeBindings` option to `better-sqlite3` options #5461
+- Add QueryBuilder#updateFrom #5386
+- Add readonly transaction access mode #5445
+- Add readonly option to Better-SQLite3 #5530
+- Add EXCEPT as a valid keyword #5357
+- Add ability to prepend query comments #5289
+- Add fetchAsString option #5484
+
+### Bug fixes
+
+- Avoid password leaks on query logs #5559
+- Add knex.mjs to files in package.json #5518
+- Handle numeric array elements in .orderBy() #5551
+- Attach error handler early enough #5552
+- Fix Returning * in Oracle #5598
+- Fix indexType option in `Postgres` #5601
+- Add mjs extension type #5616
+- Use implicit check on json fields for OracleDB #5478
+- Fix when manually close source stream #5466
+- Fix case sensitive issue with get table #5509
+
+### Typings
+
+- Add Object syntax overload to increment method #5512
+- Add object syntax overload to decrement method #5555
+- Fix typing for toSql #5594
+- Add ResolveTableType for `.merge()` #5605
+- Add missing types for havingNull and havingNotNull #5529
+- Add collate to the columnbuilder interface #5568
+- TableBuilder methods return the SchemaBuilder. #5486
+
+# 2.4.2 - 22 January, 2023
+
+### Bug fixes
+
+- CLI: Fix incorrent EOL causing errors on Linux #5455
+
+# 2.4.1 - 18 January, 2023
 
 ### Bug fixes
 
 - PostgreSQL: Fix Malformed array literal 2.4.0 Regression #5439
 
-# 2.4.0 - 06 January, 2022
+# 2.4.0 - 06 January, 2023
 
 ### New features:
 
@@ -1361,7 +1403,7 @@ Note: there are many breaking changes in this version, particularly in TypeScrip
 
 ### New features:
 
-- Support passing explicit connection to query builder (#2817)
+- Support passing explicit connection to query builder #2817
 - Introduced abstraction for getting migrations to make migration bundling easier #2775
 - Allow timestamp with timezone on mssql databases #2724
 - Allow specifying multiple migration directories #2735
@@ -1418,7 +1460,7 @@ Note: there are many breaking changes in this version, particularly in TypeScrip
 
 ### Changes:
 
-- THIS RELEASE WAS UNPUBLISHED FROM NPM BECAUSE IT HAD BROKEN MIGRATIONS USING `postprocessResponse` FEATURE (#2644)
+- THIS RELEASE WAS UNPUBLISHED FROM NPM BECAUSE IT HAD BROKEN MIGRATIONS USING `postprocessResponse` FEATURE #2644
 
 # 0.15.2 - 19 Jul, 2018
 
@@ -1479,7 +1521,7 @@ Note: there are many breaking changes in this version, particularly in TypeScrip
 
 ### Bug fixes:
 
-- Restored functionality of query event #2566 (#2549)
+- Restored functionality of query event #2566 #2549
 
 # 0.14.5 - 8 Apr, 2018
 
@@ -1507,23 +1549,23 @@ Note: there are many breaking changes in this version, particularly in TypeScrip
 
 ### Bug fixes:
 
-- containsUndefined only validate plain objects. Fixes #1898 (#2468)
-- Add warning when using .returning() in sqlite3. Fixes #1660 (#2471)
-- Throw an error if .update() results in an empty sql (#2472)
-- Removed unnecessary createTableIfNotExist and replaced with createTable (#2473)
+- containsUndefined only validate plain objects. Fixes #1898 #2468
+- Add warning when using .returning() in sqlite3. Fixes #1660 #2471
+- Throw an error if .update() results in an empty sql #2472
+- Removed unnecessary createTableIfNotExist and replaced with createTable #2473
 
 ### New Features:
 
-- Allow calling lock procedures (such as forUpdate) outside of transaction. Fixes #2403. (#2475)
-- Added test and documentation for Event 'start' (#2488)
+- Allow calling lock procedures (such as forUpdate) outside of transaction. Fixes #2403. #2475
+- Added test and documentation for Event 'start' #2488
 
 ### Test / internal changes:
 
 - Added stress test, which uses TCP proxy to simulate flaky connection #2460
-- Removed old docker tests, new stress test setup (#2474)
-- Removed unused property \_\_cid on the base client (#2481)
-- Changed rm to rimraf in 'npm run dev' (#2483)
-- Changed babel preset and use latest node as target when running dev (#2484)
+- Removed old docker tests, new stress test setup #2474
+- Removed unused property \_\_cid on the base client #2481
+- Changed rm to rimraf in 'npm run dev' #2483
+- Changed babel preset and use latest node as target when running dev #2484
 
 # 0.14.3 - 8 Feb, 2018
 
@@ -1674,8 +1716,8 @@ Note: there are many breaking changes in this version, particularly in TypeScrip
 
 # 0.12.6 - 19 Oct, 2016
 
-- Address warnings mentioned in #1388 (#1740)
-- Remove postinstall script (#1746)
+- Address warnings mentioned in #1388 #1740
+- Remove postinstall script #1746
 
 # 0.12.5 - 12 Oct, 2016
 

package/README.md

@@ -6,7 +6,6 @@
 [![Coverage Status](https://coveralls.io/repos/knex/knex/badge.svg?branch=master)](https://coveralls.io/r/knex/knex?branch=master)
 [![Dependencies Status](https://img.shields.io/librariesio/github/knex/knex)](https://libraries.io/npm/knex)
 [![Gitter chat](https://badges.gitter.im/tgriesser/knex.svg)](https://gitter.im/tgriesser/knex)
-[![Language Grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/knex/knex.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/knex/knex/context:javascript)
 
 > **A SQL query builder that is _flexible_, _portable_, and _fun_ to use!**
 

package/bin/cli.js

@@ -85,7 +85,7 @@ async function initKnex(env, opts, useDefaultClientIfNotSpecified) {
 }
 
 function invoke() {
-  const filetypes = ['js', 'coffee', 'ts', 'eg', 'ls'];
+  const filetypes = ['js', 'mjs', 'coffee', 'ts', 'eg', 'ls'];
 
   const cwd = argv.knexfile
     ? path.dirname(path.resolve(argv.knexfile))
@@ -218,7 +218,7 @@ function invoke() {
     .action(async (name) => {
       try {
         const opts = commander.opts();
-        const instance = await initKnex(env, opts, true);  // Skip config check, we don't really care about client when creating migrations
+        const instance = await initKnex(env, opts, true); // Skip config check, we don't really care about client when creating migrations
         const ext = getMigrationExtension(env, opts);
         const configOverrides = { extension: ext };
 
@@ -233,7 +233,7 @@ function invoke() {
             success(color.green(`Created Migration: ${name}`));
           })
           .catch(exit);
-      } catch(err) {
+      } catch (err) {
         exit(err);
       }
     });
@@ -397,7 +397,8 @@ function invoke() {
         }
 
         if (opts.timestampFilenamePrefix) {
-          configOverrides.timestampFilenamePrefix = opts.timestampFilenamePrefix;
+          configOverrides.timestampFilenamePrefix =
+            opts.timestampFilenamePrefix;
         }
 
         instance.seed
@@ -406,9 +407,9 @@ function invoke() {
             success(color.green(`Created seed file: ${name}`));
           })
           .catch(exit);
-      } catch(err) {
+      } catch (err) {
         exit(err);
-      }   
+      }
     });
 
   commander

package/knex.mjs

@@ -0,0 +1,11 @@
+// Knex.js
+// --------------
+//     (c) 2013-present Tim Griesser
+//     Knex may be freely distributed under the MIT license.
+//     For details and documentation:
+//     http://knexjs.org
+
+import knex from './lib/index.js';
+
+export { knex }
+export default knex

package/lib/client.js

@@ -31,6 +31,7 @@ const { POOL_CONFIG_OPTIONS } = require('./constants');
 const ViewBuilder = require('./schema/viewbuilder.js');
 const ViewCompiler = require('./schema/viewcompiler.js');
 const isPlainObject = require('lodash/isPlainObject');
+const { setHiddenProperty } = require('./util/security.js');
 
 const debug = require('debug')('knex:client');
 
@@ -43,6 +44,10 @@ class Client extends EventEmitter {
     this.config = config;
     this.logger = new Logger(config);
 
+    if (this.config.connection && this.config.connection.password) {
+      setHiddenProperty(this.config.connection);
+    }
+
     //Client is a required field, so throw error if it's not supplied.
     //If 'this.dialect' is set, then this is a 'super()' call, in which case
     //'client' does not have to be set as it's already assigned on the client prototype.
@@ -69,6 +74,9 @@ class Client extends EventEmitter {
       this.connectionConfigExpirationChecker = () => true; // causes the provider to be called on first use
     } else {
       this.connectionSettings = cloneDeep(config.connection || {});
+      if (config.connection && config.connection.password) {
+        setHiddenProperty(this.connectionSettings, config.connection);
+      }
       this.connectionConfigExpirationChecker = null;
     }
     if (this.driverName && config.connection) {
@@ -305,6 +313,18 @@ class Client extends EventEmitter {
     try {
       const connection = await this.pool.acquire().promise;
       debug('acquired connection from pool: %s', connection.__knexUid);
+      if (connection.config) {
+        if (connection.config.password) {
+          setHiddenProperty(connection.config);
+        }
+        if (
+          connection.config.authentication &&
+          connection.config.authentication.options &&
+          connection.config.authentication.options.password
+        ) {
+          setHiddenProperty(connection.config.authentication.options);
+        }
+      }
       return connection;
     } catch (error) {
       let convertedError = error;

package/lib/dialects/better-sqlite3/index.js

@@ -9,7 +9,12 @@ class Client_BetterSQLite3 extends Client_SQLite3 {
 
   // Get a raw connection from the database, returning a promise with the connection object.
   async acquireRawConnection() {
-    return new this.driver(this.connectionSettings.filename);
+    const options = this.connectionSettings.options || {};
+
+    return new this.driver(this.connectionSettings.filename, {
+      nativeBinding: options.nativeBinding,
+      readonly: !!options.readonly,
+    });
   }
 
   // Used to explicitly close a connection, called internally by the pool when

package/lib/dialects/index.js

@@ -1,34 +1,34 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDialectByNameOrAlias = void 0;
-const { resolveClientNameWithAliases } = require('../util/helpers');
-const dbNameToDialectLoader = Object.freeze({
-    'better-sqlite3': () => require('./better-sqlite3'),
-    cockroachdb: () => require('./cockroachdb'),
-    mssql: () => require('./mssql'),
-    mysql: () => require('./mysql'),
-    mysql2: () => require('./mysql2'),
-    oracle: () => require('./oracle'),
-    oracledb: () => require('./oracledb'),
-    pgnative: () => require('./pgnative'),
-    postgres: () => require('./postgres'),
-    redshift: () => require('./redshift'),
-    sqlite3: () => require('./sqlite3'),
-});
-/**
- * Gets the Dialect object with the given client name or throw an
- * error if not found.
- *
- * NOTE: This is a replacement for prior practice of doing dynamic
- * string construction for imports of Dialect objects.
- */
-function getDialectByNameOrAlias(clientName) {
-    const resolvedClientName = resolveClientNameWithAliases(clientName);
-    const dialectLoader = dbNameToDialectLoader[resolvedClientName];
-    if (!dialectLoader) {
-        throw new Error(`Invalid clientName given: ${clientName}`);
-    }
-    return dialectLoader();
-}
-exports.getDialectByNameOrAlias = getDialectByNameOrAlias;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDialectByNameOrAlias = void 0;
+const { resolveClientNameWithAliases } = require('../util/helpers');
+const dbNameToDialectLoader = Object.freeze({
+    'better-sqlite3': () => require('./better-sqlite3'),
+    cockroachdb: () => require('./cockroachdb'),
+    mssql: () => require('./mssql'),
+    mysql: () => require('./mysql'),
+    mysql2: () => require('./mysql2'),
+    oracle: () => require('./oracle'),
+    oracledb: () => require('./oracledb'),
+    pgnative: () => require('./pgnative'),
+    postgres: () => require('./postgres'),
+    redshift: () => require('./redshift'),
+    sqlite3: () => require('./sqlite3'),
+});
+/**
+ * Gets the Dialect object with the given client name or throw an
+ * error if not found.
+ *
+ * NOTE: This is a replacement for prior practice of doing dynamic
+ * string construction for imports of Dialect objects.
+ */
+function getDialectByNameOrAlias(clientName) {
+    const resolvedClientName = resolveClientNameWithAliases(clientName);
+    const dialectLoader = dbNameToDialectLoader[resolvedClientName];
+    if (!dialectLoader) {
+        throw new Error(`Invalid clientName given: ${clientName}`);
+    }
+    return dialectLoader();
+}
+exports.getDialectByNameOrAlias = getDialectByNameOrAlias;
 //# sourceMappingURL=index.js.map

package/lib/dialects/mssql/index.js

@@ -12,6 +12,7 @@ const TableCompiler = require('./schema/mssql-tablecompiler');
 const ViewCompiler = require('./schema/mssql-viewcompiler');
 const ColumnCompiler = require('./schema/mssql-columncompiler');
 const QueryBuilder = require('../../query/querybuilder');
+const { setHiddenProperty } = require('../../util/security');
 
 const debug = require('debug')('knex:mssql');
 
@@ -66,6 +67,10 @@ class Client_MSSQL extends Client {
       },
     };
 
+    if (cfg.authentication.options.password) {
+      setHiddenProperty(cfg.authentication.options);
+    }
+
     // tedious always connect via tcp when port is specified
     if (cfg.options.instanceName) delete cfg.options.port;
 

package/lib/dialects/mssql/query/mssql-querycompiler.js

@@ -11,6 +11,7 @@ const {
 } = require('../../../formatter/wrappingFormatter');
 
 const components = [
+  'comments',
   'columns',
   'join',
   'lock',

package/lib/dialects/mysql2/index.js

@@ -14,6 +14,26 @@ class Client_MySQL2 extends Client_MySQL {
   _driver() {
     return require('mysql2');
   }
+
+  initializeDriver() {
+    try {
+      this.driver = this._driver();
+    } catch (e) {
+      let message = `Knex: run\n$ npm install ${this.driverName}`;
+
+      const nodeMajorVersion = process.version.replace(/^v/, '').split('.')[0];
+      if (nodeMajorVersion <= 12) {
+        message += `@3.2.0`;
+        this.logger.error(
+          'Mysql2 version 3.2.0 is the latest version to support Node.js 12 or lower.'
+        );
+      }
+      message += ` --save`;
+      this.logger.error(`${message}\n${e.message}\n${e.stack}`);
+      throw new Error(`${message}\n${e.message}`);
+    }
+  }
+
   validateConnection(connection) {
     return (
       connection &&

package/lib/dialects/oracle/query/oracle-querycompiler.js

@@ -12,6 +12,7 @@ const { ReturningHelper } = require('../utils');
 const { isString } = require('../../../util/is');
 
 const components = [
+  'comments',
   'columns',
   'join',
   'where',

package/lib/dialects/oracledb/index.js

@@ -254,10 +254,6 @@ class Client_Oracledb extends Client_Oracle {
             });
           }
         }
-        if (connection.isTransaction) {
-          return obj;
-        }
-        await connection.commitAsync();
         if (obj.returningSql) {
           const response = await connection.executeAsync(
             obj.returningSql(),
@@ -266,6 +262,10 @@ class Client_Oracledb extends Client_Oracle {
           );
           obj.response = response.rows;
         }
+        if (connection.isTransaction) {
+          return obj;
+        }
+        await connection.commitAsync();
         return obj;
       });
   }
@@ -287,7 +287,7 @@ class Client_Oracledb extends Client_Oracle {
       case 'del':
       case 'update':
       case 'counter':
-        if (obj.returning && !isEmpty(obj.returning)) {
+        if ((obj.returning && !isEmpty(obj.returning)) || obj.returningSql) {
           return response;
         } else if (obj.rowsAffected !== undefined) {
           return obj.rowsAffected;

package/lib/dialects/oracledb/schema/oracledb-columncompiler.js

@@ -4,7 +4,7 @@ const { isObject } = require('../../../util/is');
 class ColumnCompiler_Oracledb extends ColumnCompiler_Oracle {
   constructor() {
     super(...arguments);
-    this.modifiers = ['defaultTo', 'nullable', 'comment'];
+    this.modifiers = ['defaultTo', 'nullable', 'comment', 'checkJson'];
     this._addCheckModifiers();
   }
 
@@ -38,14 +38,20 @@ class ColumnCompiler_Oracledb extends ColumnCompiler_Oracle {
   }
 
   json() {
-    return `varchar2(4000) check (${this.formatter.columnize(
-      this.getColumnName()
-    )} is json)`;
+    // implicitly add the check for json
+    this.columnBuilder._modifiers.checkJson = [
+      this.formatter.columnize(this.getColumnName()),
+    ];
+    return 'varchar2(4000)';
   }
 
   jsonb() {
     return this.json();
   }
+
+  checkJson(column) {
+    return `check (${column} is json)`;
+  }
 }
 
 ColumnCompiler_Oracledb.prototype.time = 'timestamp with local time zone';

package/lib/dialects/postgres/execution/pg-transaction.js

@@ -2,10 +2,17 @@ const Transaction = require('../../../execution/transaction');
 
 class Transaction_PG extends Transaction {
   begin(conn) {
-    if (this.isolationLevel) {
-      return this.query(conn, `BEGIN ISOLATION LEVEL ${this.isolationLevel};`);
+    const trxMode = [
+      this.isolationLevel ? `ISOLATION LEVEL ${this.isolationLevel}` : '',
+      this.readOnly ? 'READ ONLY' : '',
+    ]
+      .join(' ')
+      .trim();
+
+    if (trxMode.length === 0) {
+      return this.query(conn, 'BEGIN;');
     }
-    return this.query(conn, 'BEGIN;');
+    return this.query(conn, `BEGIN TRANSACTION ${trxMode};`);
   }
 }
 

package/lib/dialects/postgres/index.js

@@ -80,6 +80,14 @@ class Client_PG extends Client {
   _acquireOnlyConnection() {
     const connection = new this.driver.Client(this.connectionSettings);
 
+    connection.on('error', (err) => {
+      connection.__knex__disposed = err;
+    });
+
+    connection.on('end', (err) => {
+      connection.__knex__disposed = err || 'Connection ended unexpectedly';
+    });
+
     return connection.connect().then(() => connection);
   }
 
@@ -90,14 +98,6 @@ class Client_PG extends Client {
 
     return this._acquireOnlyConnection()
       .then(function (connection) {
-        connection.on('error', (err) => {
-          connection.__knex__disposed = err;
-        });
-
-        connection.on('end', (err) => {
-          connection.__knex__disposed = err || 'Connection ended unexpectedly';
-        });
-
         if (!client.version) {
           return client.checkVersion(connection).then(function (version) {
             client.version = version;

package/lib/dialects/postgres/query/pg-querybuilder.js

@@ -1,6 +1,11 @@
 const QueryBuilder = require('../../../query/querybuilder.js');
 
 module.exports = class QueryBuilder_PostgreSQL extends QueryBuilder {
+  updateFrom(name) {
+    this._single.updateFrom = name;
+    return this;
+  }
+
   using(tables) {
     this._single.using = tables;
     return this;

package/lib/dialects/postgres/query/pg-querycompiler.js

@@ -50,12 +50,13 @@ class QueryCompiler_PG extends QueryCompiler {
     const withSQL = this.with();
     const updateData = this._prepUpdate(this.single.update);
     const wheres = this.where();
-    const { returning } = this.single;
+    const { returning, updateFrom } = this.single;
     return {
       sql:
         withSQL +
         `update ${this.single.only ? 'only ' : ''}${this.tableName} ` +
         `set ${updateData.join(', ')}` +
+        this._updateFrom(updateFrom) +
         (wheres ? ` ${wheres}` : '') +
         this._returning(returning),
       returning,
@@ -141,6 +142,10 @@ class QueryCompiler_PG extends QueryCompiler {
     return value ? ` returning ${this.formatter.columnize(value)}` : '';
   }
 
+  _updateFrom(name) {
+    return name ? ` from ${this.formatter.wrap(name)}` : '';
+  }
+
   _ignore(columns) {
     if (columns === true) {
       return ' on conflict do nothing';

package/lib/dialects/postgres/schema/pg-compiler.js

@@ -120,7 +120,9 @@ class SchemaCompiler_PG extends SchemaCompiler {
 
   refreshMaterializedView(viewName, concurrently = false) {
     this.pushQuery({
-      sql: `refresh materialized view${concurrently ? " concurrently" : ""} ${this.formatter.wrap(viewName)}`,
+      sql: `refresh materialized view${
+        concurrently ? ' concurrently' : ''
+      } ${this.formatter.wrap(viewName)}`,
     });
   }
 

package/lib/dialects/postgres/schema/pg-tablecompiler.js

@@ -235,12 +235,13 @@ class TableCompiler_PG extends TableCompiler {
       : this._indexCommand('index', this.tableNameRaw, columns);
 
     let predicate;
+    let storageEngineIndexType;
     let indexType;
 
     if (isString(options)) {
-      indexType = options;
+      storageEngineIndexType = options;
     } else if (isObject(options)) {
-      ({ indexType, predicate } = options);
+      ({ indexType, storageEngineIndexType, predicate } = options);
     }
 
     const predicateQuery = predicate
@@ -248,8 +249,12 @@ class TableCompiler_PG extends TableCompiler {
       : '';
 
     this.pushQuery(
-      `create index ${indexName} on ${this.tableName()}${
-        (indexType && ` using ${indexType}`) || ''
+      `create${
+        typeof indexType === 'string' && indexType.toLowerCase() === 'unique'
+          ? ' unique'
+          : ''
+      } index ${indexName} on ${this.tableName()}${
+        (storageEngineIndexType && ` using ${storageEngineIndexType}`) || ''
       }` +
         ' (' +
         this.formatter.columnize(columns) +

package/lib/dialects/redshift/transaction.js

@@ -2,10 +2,17 @@ const Transaction = require('../../execution/transaction');
 
 module.exports = class Redshift_Transaction extends Transaction {
   begin(conn) {
-    if (this.isolationLevel) {
-      return this.query(conn, `BEGIN ISOLATION LEVEL ${this.isolationLevel};`);
+    const trxMode = [
+      this.isolationLevel ? `ISOLATION LEVEL ${this.isolationLevel}` : '',
+      this.readOnly ? 'READ ONLY' : '',
+    ]
+      .join(' ')
+      .trim();
+
+    if (trxMode.length === 0) {
+      return this.query(conn, 'BEGIN;');
     }
-    return this.query(conn, 'BEGIN;');
+    return this.query(conn, `BEGIN ${trxMode};`);
   }
 
   savepoint(conn) {

package/lib/dialects/sqlite3/execution/sqlite-transaction.js

@@ -11,6 +11,13 @@ class Transaction_Sqlite extends Transaction {
         'sqlite3 only supports serializable transactions, ignoring the isolation level param'
       );
     }
+    // SQLite infers read vs write transactions from the statement operation
+    // https://www.sqlite.org/lang_transaction.html#read_transactions_versus_write_transactions
+    if (this.readOnly) {
+      this.client.logger.warn(
+        'sqlite3 implicitly handles read vs write transactions'
+      );
+    }
     return this.query(conn, 'BEGIN;');
   }
 }

package/lib/dialects/sqlite3/schema/internal/sqlite-ddl-operations.js

@@ -15,7 +15,7 @@ function renameTable(tableName, alteredName) {
 }
 
 function getTableSql(tableName) {
-  return `SELECT type, sql FROM sqlite_master WHERE (type='table' OR (type='index' AND sql IS NOT NULL)) AND tbl_name='${tableName}'`;
+  return `SELECT type, sql FROM sqlite_master WHERE (type='table' OR (type='index' AND sql IS NOT NULL)) AND lower(tbl_name)='${tableName.toLowerCase()}'`;
 }
 
 function isForeignCheckEnabled() {

package/lib/execution/runner.js

@@ -72,6 +72,24 @@ class Runner {
       this.client.releaseConnection(this.connection);
     });
 
+    // If the stream is manually destroyed, the close event is not
+    // propagated to the top of the pipe chain. We need to manually verify
+    // that the source stream is closed and if not, manually destroy it.
+    stream.on('pipe', (sourceStream) => {
+      const cleanSourceStream = () => {
+        if (!sourceStream.closed) {
+          sourceStream.destroy();
+        }
+      };
+
+      // Stream already closed, cleanup immediately
+      if (stream.closed) {
+        cleanSourceStream();
+      } else {
+        stream.on('close', cleanSourceStream);
+      }
+    });
+
     const connectionAcquirePromise = this.ensureConnection(
       ensureConnectionStreamCallback,
       {