node-firebird 2.0.0 → 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/lib/wire/database.js

@@ -280,7 +280,12 @@ class Database extends Events.EventEmitter {
                 return;
             }
 
-            const eventConnection = new EventConnection(socket_info.host, socket_info.port, function (err) {
+            const host = (socket_info.host === '0.0.0.0' || socket_info.host === '::')
+                ? self.connection.options.host
+                : socket_info.host;
+
+            const eventConnection = new EventConnection(
+                host, socket_info.port, function(err) {
                 if (err) {
                     doError(err, callback);
                     return;

package/package.json

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

package/srp.js

@@ -1,94 +0,0 @@
-const BigInteger = require('big-integer');
-const crypto = require('crypto');
-
-console.log('Preparing benchmark...');
-
-// Constants from lib/srp.js
-const HEX_N = 'E67D2E994B2F900C3F41F08F5BB2627ED0D49EE1FE767A52EFCD565CD6E768812C3E1E9CE8F0A8BEA6CB13CD29DDEBF7A96D4A93B55D488DF099A15C89DCB0640738EB2CBDD9A8F7BAB561AB1B0DC1C6CDABF303264A08D1BCA932D1F1EE428B619D970F342ABA9A65793B8B2F041AE5364350C16F735F56ECBCA87BD57B29E7';
-const DEC_K = '1277432915985975349439481660349303019122249719989';
-
-// --- Library Setup ---
-const lib_N = BigInteger(HEX_N, 16);
-const lib_g = BigInteger(2);
-const lib_k = BigInteger(DEC_K);
-
-// --- Native Setup ---
-const native_N = BigInt('0x' + HEX_N);
-const native_g = 2n;
-const native_k = BigInt(DEC_K);
-
-/**
- * Native BigInt Modular Exponentiation
- * Calculates (base ^ exp) % mod
- */
-function nativeModPow(base, exp, mod) {
-    let result = 1n;
-    base = base % mod;
-    while (exp > 0n) {
-        if (exp & 1n) result = (result * base) % mod;
-        base = (base * base) % mod;
-        exp >>= 1n;
-    }
-    return result;
-}
-
-// --- Test Data Generation ---
-const ITERATIONS = 2000;
-const inputs = [];
-
-for (let i = 0; i < ITERATIONS; i++) {
-    // Generate random 32-byte private key (similar to SRP_KEY_SIZE)
-    const hex = crypto.randomBytes(32).toString('hex');
-    inputs.push({
-        lib: BigInteger(hex, 16),
-        native: BigInt('0x' + hex)
-    });
-}
-
-// --- Verification ---
-console.log('Verifying implementations match...');
-const vLib = lib_g.modPow(inputs[0].lib, lib_N);
-const vNative = nativeModPow(native_g, inputs[0].native, native_N);
-
-if (vLib.toString(16) !== vNative.toString(16)) {
-    console.error('MISMATCH!');
-    console.error('Lib:', vLib.toString(16));
-    console.error('Nat:', vNative.toString(16));
-    process.exit(1);
-}
-console.log('Verification passed.');
-
-// --- Benchmark ---
-console.log(`\nStarting benchmark (${ITERATIONS} iterations)...`);
-
-// 1. Library Benchmark
-const startLib = process.hrtime.bigint();
-for (let i = 0; i < ITERATIONS; i++) {
-    // Simulate: A = g^a % N
-    const A = lib_g.modPow(inputs[i].lib, lib_N);
-    
-    // Simulate part of server calc: B = (k*v + g^b) % N
-    // We'll just do (k * A) % N + A to simulate the mix of mult/add/mod
-    const term = lib_k.multiply(A).mod(lib_N).add(A).mod(lib_N);
-}
-const endLib = process.hrtime.bigint();
-
-// 2. Native Benchmark
-const startNative = process.hrtime.bigint();
-for (let i = 0; i < ITERATIONS; i++) {
-    // Simulate: A = g^a % N
-    const A = nativeModPow(native_g, inputs[i].native, native_N);
-    
-    // Simulate part of server calc: B = (k*v + g^b) % N
-    const term = ((native_k * A) % native_N + A) % native_N;
-}
-const endNative = process.hrtime.bigint();
-
-// --- Results ---
-const timeLib = Number(endLib - startLib) / 1e6; // ms
-const timeNative = Number(endNative - startNative) / 1e6; // ms
-
-console.log('\nResults:');
-console.log(`big-integer (Lib): ${timeLib.toFixed(2)} ms`);
-console.log(`Native BigInt:     ${timeNative.toFixed(2)} ms`);
-console.log(`\nSpeedup: ${(timeLib / timeNative).toFixed(2)}x faster`);