node-firebird 2.0.1 → 2.0.2

package/lib/wire/connection.js

@@ -1208,7 +1208,10 @@ class Connection {
 
     fetchAll(statement, transaction, callback) {
         const self = this;
-        const data = [];
+        const custom = statement.custom || {};
+        const asStream = custom.asStream && custom.on;
+        const data = asStream ? null : [];
+        let streamIndex = 0;
         const loop = (err, ret) => {
             if (err) {
                 callback(err);
@@ -1224,11 +1227,8 @@ class Connection {
                         ret.data[blob.row][blob.column] = blob.value;
                     }
 
-                    const custom = statement.custom || {};
-                    const asStream = custom.asStream && custom.on;
-
-                    doSynchronousLoop(ret.data, (row, i, next) => {
-                        const pos = data.push(row) - 1;
+                    doSynchronousLoop(ret.data, (row, _i, next) => {
+                        const pos = asStream ? streamIndex++ : (data.push(row) - 1);
                         if (asStream) {
                             executeStreamRow(custom, row, pos, statement.output, next);
                         } else {
@@ -1241,7 +1241,7 @@ class Connection {
                         }
 
                         if (ret.fetched) {
-                            callback(undefined, data);
+                            callback(undefined, data || []);
                         } else {
                             self.fetch(statement, transaction, Const.DEFAULT_FETCHSIZE, loop);
                         }
@@ -1251,7 +1251,7 @@ class Connection {
             }
 
             if (ret && ret.fetched) {
-                callback(undefined, data);
+                callback(undefined, data || []);
             } else {
                 self.fetch(statement, transaction, Const.DEFAULT_FETCHSIZE, loop);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-firebird",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "description": "Pure JavaScript and Asynchronous Firebird client for Node.js.",
     "keywords": [
         "firebird",

package/0001-fix-attachEvent-host-resolution.patch

@@ -1,72 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gobbo89 <gobbo89@users.noreply.github.com>
-Date: Thu, 19 Feb 2026 00:00:00 +0000
-Subject: [PATCH] fix(events): resolve event channel host from connection options
-
-When Firebird is configured with RemoteBindAddress unset (default),
-auxConnection() returns socket_info.host = "0.0.0.0", which is a
-bind-any address and not a routable destination for remote clients.
-
-This commit changes the host selection logic in attachEvent to prefer
-connection.options.host (the address that the user explicitly provided
-and that is proven reachable, since the initial DB attach succeeded).
-
-Only if options.host is absent does it fall back to socket_info.host,
-and even then only when that host is a concrete routable address (i.e.
-not "0.0.0.0" and not "::"). As a last resort it uses the socket's
-remoteAddress, normalizing IPv6-mapped IPv4 (::ffff:x.x.x.x → x.x.x.x).
-
-Fixes #386.
-
----
- lib/wire/database.js | 25 +++++++++++++++++++++++--
- 1 file changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/lib/wire/database.js b/lib/wire/database.js
-index xxxxxxx..yyyyyyy 100644
---- a/lib/wire/database.js
-+++ b/lib/wire/database.js
-@@ -1,3 +1,18 @@
-+/**
-+ * Resolves the host to use for the auxiliary event channel.
-+ *
-+ * Priority:
-+ *   1. connection.options.host  – explicitly provided by the caller; known reachable.
-+ *   2. socket_info.host         – only when it is a concrete routable address
-+ *                                 (i.e. not "0.0.0.0" and not "::").
-+ *   3. socket.remoteAddress     – the OS-level address of the main connection socket,
-+ *                                 with IPv6-mapped IPv4 prefixes stripped.
-+ *
-+ * @param {object} connection   The active database connection object.
-+ * @param {string} auxHost      The host returned by the auxConnection() call.
-+ * @returns {string}            A connectable host string.
-+ */
-+function resolveEventHost(connection, auxHost) {
-+    // 1. Prefer the host the caller explicitly supplied.
-+    if (connection.options && connection.options.host) {
-+        return connection.options.host;
-+    }
-+
-+    // 2. Use auxConnection host only when it is a real address.
-+    var BIND_ANY = ['0.0.0.0', '::'];
-+    if (auxHost && BIND_ANY.indexOf(auxHost) === -1) {
-+        return auxHost;
-+    }
-+
-+    // 3. Fall back to the OS-reported remote address of the main socket,
-+    //    normalising IPv6-mapped IPv4 (e.g. "::ffff:10.0.0.1" → "10.0.0.1").
-+    var remoteAddress = connection._socket && connection._socket.remoteAddress;
-+    if (remoteAddress) {
-+        return remoteAddress.replace(/^::ffff:/, '');
-+    }
-+
-+    // Last resort: return whatever auxConnection gave us and let the caller fail
-+    // with a meaningful socket error rather than a silent undefined.
-+    return auxHost;
-+}
-+
- // ... (existing code) ...
- 
--        var eventConnection = new EventConnection(socket_info.host, socket_info.port, self.connection.options, eventCallback);
-+        var eventHost = resolveEventHost(self.connection, socket_info.host);
-+        var eventConnection = new EventConnection(eventHost, socket_info.port, self.connection.options, eventCallback);

package/diff

@@ -1,62 +0,0 @@
-diff --git a/lib/wire/database.js b/lib/wire/database.js
-index d91b9db..a9f3128 100644
---- a/lib/wire/database.js
-+++ b/lib/wire/database.js
-@@ -5,6 +5,46 @@ const Const = require('./const');
- const EventConnection = require('./eventConnection');
- const FbEventManager = require('./fbEventManager');
- 
-+/**
-+ * Resolves the host to use for the auxiliary event channel.
-+ *
-+ * Priority:
-+ *   1. connection.options.host  – explicitly provided by the caller; known reachable.
-+ *   2. socket_info.host         – only when it is a concrete routable address
-+ *                                 (i.e. not "0.0.0.0" and not "::").
-+ *   3. socket.remoteAddress     – the OS-level address of the main connection socket,
-+ *                                 with IPv6-mapped IPv4 prefixes stripped.
-+ *
-+ * @param {object} connection   The active database connection object.
-+ * @param {string} auxHost      The host returned by the auxConnection() call.
-+ * @returns {string}            A connectable host string.
-+ */
-+function resolveEventHost(connection, auxHost) {
-+    // 1. Prefer the host the caller explicitly supplied.
-+    if (connection.options && connection.options.host) {
-+        return connection.options.host;
-+    }
-+
-+    // 2. Use auxConnection host only when it is a real address.
-+    var BIND_ANY = ['0.0.0.0', '::'];
-+    if (auxHost && BIND_ANY.indexOf(auxHost) === -1) {
-+        return auxHost;
-+    }
-+
-+    // 3. Fall back to the OS-reported remote address of the main socket,
-+    //    normalising IPv6-mapped IPv4 (e.g. "::ffff:10.0.0.1" → "10.0.0.1").
-+    var remoteAddress = connection._socket && connection._socket.remoteAddress;
-+    if (remoteAddress) {
-+        return remoteAddress.replace(/^::ffff:/, '');
-+    }
-+
-+    // Last resort: return whatever auxConnection gave us and let the caller fail
-+    // with a meaningful socket error rather than a silent undefined.
-+    return auxHost;
-+}
-+
-+
-+
- /***************************************
-  *
-  *   Database
-@@ -279,8 +319,9 @@ class Database extends Events.EventEmitter {
-                 doError(err, callback);
-                 return;
-             }
-+            var eventHost = resolveEventHost(self.connection, socket_info.host);
- 
--            const eventConnection = new EventConnection(socket_info.host, socket_info.port, function (err) {
-+            const eventConnection = new EventConnection(eventHost, socket_info.port, function (err) {
-                 if (err) {
-                     doError(err, callback);
-                     return;