node-firebird 2.3.3 → 2.4.0

package/{poc/node_modules/node-firebird/lib/wire/const.js → src/wire/const.ts}

@@ -12,7 +12,7 @@ const defaultOptions = {
     DEFAULT_LOWERCASE_KEYS : false,
     DEFAULT_PAGE_SIZE : 4096,
     DEFAULT_SVC_NAME : 'service_mgr',
-    DEFAULT_ENCODING : 'UTF8',
+    DEFAULT_ENCODING : 'utf8' as BufferEncoding,
     DEFAULT_FETCHSIZE : 200,
 };
 
@@ -121,6 +121,9 @@ const op = {
     op_crypt_key_callback     : 97,
     op_cond_accept            : 98, // Server accepts connection, returns some data to client
                                     // and asks client to continue authentication before attach call
+    op_fetch_scroll           : 112,
+    op_info_cursor            : 113,
+    op_inline_blob            : 114,
 };
 
 const dsql = {
@@ -129,6 +132,15 @@ const dsql = {
     DSQL_unprepare : 4, // >: 2.5
 };
 
+const fetchOp = {
+    fetch_next                : 0,
+    fetch_prior               : 1,
+    fetch_first               : 2,
+    fetch_last                : 3,
+    fetch_absolute            : 4,
+    fetch_relative            : 5,
+};
+
 /***********************/
 /*   ISC Error Codes   */
 /***********************/
@@ -194,6 +206,18 @@ const protocol = {
 
     // Protocol 17 continues Firebird 4.0 enhancements.
     PROTOCOL_VERSION17  : (FB_PROTOCOL_FLAG | 17),
+
+    // Protocol 18 includes support for fetches from scrollable cursors.
+    // Introduced in Firebird 5.0.
+    PROTOCOL_VERSION18  : (FB_PROTOCOL_FLAG | 18),
+
+    // Protocol 19 includes support for Inline BLOBs.
+    // Introduced in Firebird 5.0.3.
+    PROTOCOL_VERSION19  : (FB_PROTOCOL_FLAG | 19),
+
+    // Protocol 20 includes support for SQL Schemas and Named Arguments.
+    // Introduced in Firebird 6.0.
+    PROTOCOL_VERSION20  : (FB_PROTOCOL_FLAG | 20),
 };
 
 // Protocols types (accept_type)
@@ -215,17 +239,32 @@ const SUPPORTED_PROTOCOL = [
     [protocol.PROTOCOL_VERSION15, connect.ARCHITECTURE_GENERIC, acceptType.ptype_lazy_send, acceptType.ptype_lazy_send, 6],
     [protocol.PROTOCOL_VERSION16, connect.ARCHITECTURE_GENERIC, acceptType.ptype_lazy_send, acceptType.ptype_lazy_send, 7],
     [protocol.PROTOCOL_VERSION17, connect.ARCHITECTURE_GENERIC, acceptType.ptype_lazy_send, acceptType.ptype_lazy_send, 8],
+    [protocol.PROTOCOL_VERSION18, connect.ARCHITECTURE_GENERIC, acceptType.ptype_lazy_send, acceptType.ptype_lazy_send, 9],
+    [protocol.PROTOCOL_VERSION19, connect.ARCHITECTURE_GENERIC, acceptType.ptype_lazy_send, acceptType.ptype_lazy_send, 10]
 ];
 
 const authPlugin = {
     AUTH_PLUGIN_LEGACY : 'Legacy_Auth',
     AUTH_PLUGIN_SRP : 'Srp',
     AUTH_PLUGIN_SRP256 : 'Srp256',
+    AUTH_PLUGIN_SRP384 : 'Srp384',
+    AUTH_PLUGIN_SRP512 : 'Srp512',
 };
 
 const authOptions = {
-    AUTH_PLUGIN_LIST : [authPlugin.AUTH_PLUGIN_SRP256, authPlugin.AUTH_PLUGIN_SRP, authPlugin.AUTH_PLUGIN_LEGACY],
-    AUTH_PLUGIN_SRP_LIST : [authPlugin.AUTH_PLUGIN_SRP256, authPlugin.AUTH_PLUGIN_SRP],
+    AUTH_PLUGIN_LIST : [
+        authPlugin.AUTH_PLUGIN_SRP512,
+        authPlugin.AUTH_PLUGIN_SRP384,
+        authPlugin.AUTH_PLUGIN_SRP256,
+        authPlugin.AUTH_PLUGIN_SRP,
+        authPlugin.AUTH_PLUGIN_LEGACY
+    ],
+    AUTH_PLUGIN_SRP_LIST : [
+        authPlugin.AUTH_PLUGIN_SRP512,
+        authPlugin.AUTH_PLUGIN_SRP384,
+        authPlugin.AUTH_PLUGIN_SRP256,
+        authPlugin.AUTH_PLUGIN_SRP
+    ],
     LEGACY_AUTH_SALT : '9z',
     WIRE_CRYPT_DISABLE : 0,
     WIRE_CRYPT_ENABLE : 1,
@@ -258,10 +297,6 @@ const sqlType = {
     SQL_DEC34 : 32762, // >= 4.0 - DECFLOAT(34) - 16 bytes, IEEE 754 Decimal128
     SQL_BOOLEAN : 32764, // >: 3.0
     SQL_NULL : 32766, // >= 2.5
-    SQL_TIMESTAMP_TZ_EX : 32748,
-    SQL_TIME_TZ_EX : 32750,
-    SQL_TIMESTAMP_TZ : 32754,
-    SQL_TIME_TZ : 32756,
 };
 
 const blobType = {
@@ -293,7 +328,6 @@ const blr = {
     blr_int128 : 26, // >: 4.0
     blr_dec64 : 24, // >= 4.0 - DECFLOAT(16), IEEE 754 Decimal64
     blr_dec128 : 25, // >= 4.0 - DECFLOAT(34), IEEE 754 Decimal128
-    blr_timestamp_tz : 28, // >= 4.0 - timestamp with time zone
     blr_time_tz : 29, // >= 4.0 - time with time zone
     blr_blob2 : 17, // >: 2.0
     blr_domain_name : 18, // >: 2.1
@@ -409,6 +443,16 @@ const dpb = {
     isc_dpb_reset_icu 				: 89,
     isc_dpb_map_attach 				: 90,
     isc_dpb_session_time_zone 		: 91,
+    isc_dpb_parallel_workers        : 92,
+    isc_dpb_max_inline_blob_size    : 93,
+    // Firebird 6.0 SQL Schema parameters
+    // isc_dpb_search_path sets the comma-separated ordered list of schema
+    // names to search for unqualified object names (similar to PostgreSQL
+    // search_path).  Available on Protocol 20+ (Firebird 6.0).
+    isc_dpb_search_path             : 94,
+    // isc_dpb_default_schema overrides the session's current schema
+    // (CURRENT_SCHEMA) at connection time.  Available on Protocol 20+.
+    isc_dpb_default_schema          : 95,
 };
 
 const cnct = {
@@ -438,6 +482,7 @@ const common = {
     isc_info_data_not_ready         : 4,
     isc_info_length                 : 126,
     isc_info_flag_end               : 127,
+    fb_info_parallel_workers        : 149,
 };
 
 /*************************************/
@@ -504,6 +549,10 @@ const sqlInfo = {
     isc_info_sql_batch_fetch : 24,
     isc_info_sql_relation_alias : 25, // >: 2.0
     isc_info_sql_explain_plan : 26, // >= 3.0
+    // Firebird 6.0 (Protocol 20): schema name of the source relation for a
+    // result-set column.  The server only sends this item when the column is
+    // drawn from a named schema (i.e. not the legacy PUBLIC or unqualified).
+    isc_info_sql_relation_schema : 33,
 };
 
 const statementInfo = {
@@ -523,6 +572,8 @@ const statementInfo = {
     isc_info_sql_stmt_savepoint : 14,
 };
 
+// Standard DESCRIBE request (Protocols 10–19).  Sent in op_prepare_statement
+// to ask the server for result-set and input column metadata.
 const DESCRIBE = [
     sqlInfo.isc_info_sql_stmt_type,
     sqlInfo.isc_info_sql_select,
@@ -547,6 +598,34 @@ const DESCRIBE = [
     sqlInfo.isc_info_sql_describe_end
 ];
 
+// Extended DESCRIBE request for Protocol 20+ (Firebird 6.0).
+// Adds isc_info_sql_relation_schema to capture the schema name alongside the
+// relation name for each output column.
+const DESCRIBE_WITH_SCHEMA = [
+    sqlInfo.isc_info_sql_stmt_type,
+    sqlInfo.isc_info_sql_select,
+    sqlInfo.isc_info_sql_describe_vars,
+    sqlInfo.isc_info_sql_sqlda_seq,
+    sqlInfo.isc_info_sql_type,
+    sqlInfo.isc_info_sql_sub_type,
+    sqlInfo.isc_info_sql_scale,
+    sqlInfo.isc_info_sql_length,
+    sqlInfo.isc_info_sql_field,
+    sqlInfo.isc_info_sql_relation,
+    sqlInfo.isc_info_sql_relation_schema, // FB 6.0: schema of source relation
+    //isc_info_sql_owner,
+    sqlInfo.isc_info_sql_alias,
+    sqlInfo.isc_info_sql_describe_end,
+    sqlInfo.isc_info_sql_bind,
+    sqlInfo.isc_info_sql_describe_vars,
+    sqlInfo.isc_info_sql_sqlda_seq,
+    sqlInfo.isc_info_sql_type,
+    sqlInfo.isc_info_sql_sub_type,
+    sqlInfo.isc_info_sql_scale,
+    sqlInfo.isc_info_sql_length,
+    sqlInfo.isc_info_sql_describe_end
+];
+
 /***********************/
 /*   ISC Services      */
 /***********************/
@@ -673,6 +752,7 @@ const serviceBackup = {
     isc_spb_bkp_convert : 0x40,
     isc_spb_bkp_expand : 0x80,
     isc_spb_bkp_no_triggers : 0x8000,
+    isc_spb_bkp_parallel_workers : 21,
     // nbackup
     isc_spb_nbk_level : 5,
     isc_spb_nbk_file : 6,
@@ -686,6 +766,7 @@ const serviceRestore = {
     isc_spb_res_page_size : 10,
     isc_spb_res_length : 11,
     isc_spb_res_access_mode : 12,
+    isc_spb_res_parallel_workers : 21,
     isc_spb_res_fix_fss_data : 13,
     isc_spb_res_fix_fss_metadata : 14,
     isc_spb_res_am_readonly : service.isc_spb_prp_am_readonly,
@@ -728,6 +809,7 @@ const serviceRepair = {
     isc_spb_rpr_kill_shadows : 0x40,
     isc_spb_rpr_full : 0x80,
     isc_spb_rpr_icu : 0x0800,
+    isc_spb_rpr_par_workers : 52,
 };
 
 /* · Security Service ·*/
@@ -760,6 +842,7 @@ const serviceStatistics = {
     isc_spb_sts_record_versions : 0x20,
     isc_spb_sts_table : 0x40,
     isc_spb_sts_nocreation : 0x80,
+    isc_spb_sts_encryption : 0x100,
 };
 
 /* Trace Service */
@@ -769,7 +852,7 @@ const serviceTrace = {
     isc_spb_trc_cfg : 3,
 };
 
-module.exports = Object.freeze({
+const Const = Object.freeze({
     ...acceptType,
     ...authPlugin,
     ...authOptions,
@@ -781,8 +864,10 @@ module.exports = Object.freeze({
     ...connect,
     ...defaultOptions,
     DESCRIBE,
+    DESCRIBE_WITH_SCHEMA,
     ...dpb,
     ...dsql,
+    ...fetchOp,
     ...int,
     ...iscAction,
     ...iscError,
@@ -805,3 +890,5 @@ module.exports = Object.freeze({
     ...tpb,
     ...transactionIsolation,
 });
+
+export = Const;

package/{poc/node_modules/node-firebird/lib/wire/database.js → src/wire/database.ts}

@@ -1,9 +1,9 @@
-const Events = require('events');
-const { doError } = require('../callback');
-const { escape } = require('../utils');
-const Const = require('./const');
-const EventConnection = require('./eventConnection');
-const FbEventManager = require('./fbEventManager');
+import Events from 'events';
+import { doError } from '../callback';
+import { escape } from '../utils';
+import Const from './const';
+import EventConnection from './eventConnection';
+import FbEventManager from './fbEventManager';
 
 /***************************************
  *
@@ -40,7 +40,7 @@ const FbEventManager = require('./fbEventManager');
  *
  ***************************************/
 
-function readblob(blob, callback) {
+function readblob(blob: any, callback: (err: any, data?: any) => void): void {
     if (blob === undefined || blob === null) {
         callback(null, blob);
         return;
@@ -51,7 +51,7 @@ function readblob(blob, callback) {
         return;
     }
 
-    blob(function(err, name, e) {
+    blob(function(err: any, name: any, e: any) {
         if (err) {
             callback(err);
             return;
@@ -62,10 +62,10 @@ function readblob(blob, callback) {
             return;
         }
 
-        const chunks = [];
+        const chunks: Buffer[] = [];
         let chunksLength = 0;
 
-        e.on('data', function(chunk) {
+        e.on('data', function(chunk: Buffer) {
             chunksLength += chunk.length;
             chunks.push(chunk);
         });
@@ -74,20 +74,20 @@ function readblob(blob, callback) {
             callback(null, Buffer.concat(chunks, chunksLength));
         });
 
-        e.on('error', function(streamErr) {
+        e.on('error', function(streamErr: any) {
             callback(streamErr);
         });
     });
 }
 
-function fetchBlobSyncRow(row, meta, callback) {
+function fetchBlobSyncRow(row: any, meta: any[], callback: (err: any, row?: any) => void): void {
     if (!row || !meta || !meta.length) {
         callback(null, row);
         return;
     }
 
     const rowKeys = Object.keys(row);
-    const blobColumns = [];
+    const blobColumns: string[] = [];
 
     for (let i = 0; i < meta.length; i++) {
         if (meta[i] && meta[i].type === Const.SQL_BLOB && rowKeys[i] !== undefined) {
@@ -101,10 +101,10 @@ function fetchBlobSyncRow(row, meta, callback) {
     }
 
     let pending = blobColumns.length;
-    let blobErr;
+    let blobErr: any;
 
     blobColumns.forEach(function(columnName) {
-        readblob(row[columnName], function(err, data) {
+        readblob(row[columnName], function(err: any, data: any) {
             if (err && !blobErr) {
                 blobErr = err;
             }
@@ -118,18 +118,21 @@ function fetchBlobSyncRow(row, meta, callback) {
 }
 
 class Database extends Events.EventEmitter {
-    constructor(connection) {
+    connection: any;
+    eventid: number;
+
+    constructor(connection: any) {
         super();
         this.connection = connection;
         connection.db = this;
         this.eventid = 1;
     }
 
-    escape(value) {
+    escape(value: any): string {
         return escape(value, this.connection.accept.protocolVersion);
     }
 
-    detach(callback, force) {
+    detach(callback?: (err?: any, obj?: any) => void, force?: boolean): this {
         var self = this;
 
         if (!force && self.connection._pending.length > 0) {
@@ -139,7 +142,7 @@ class Database extends Events.EventEmitter {
         }
 
         if (self.connection._pooled === false) {
-            self.connection.detach(function (err, obj) {
+            self.connection.detach(function (err: any, obj: any) {
 
                 self.connection.disconnect();
                 self.emit('detach', false);
@@ -157,31 +160,31 @@ class Database extends Events.EventEmitter {
         return self;
     }
 
-    transaction(options, callback) {
+    transaction(options: any, callback?: (err: any, transaction?: any) => void): this {
         return this.startTransaction(options, callback);
     }
 
-    startTransaction(options, callback) {
+    startTransaction(options: any, callback?: (err: any, transaction?: any) => void): this {
         this.connection.startTransaction(options, callback);
         return this;
     }
 
-    newStatement(query, callback) {
-        this.startTransaction(function(err, transaction) {
+    newStatement(query: string, callback: (err: any, statement?: any) => void): this {
+        this.startTransaction(function(err: any, transaction: any) {
 
             if (err) {
                 callback(err);
                 return;
             }
 
-            transaction.newStatement(query, function(err, statement) {
+            transaction.newStatement(query, function(err: any, statement: any) {
 
                 if (err) {
                     callback(err);
                     return;
                 }
 
-                transaction.commit(function(err) {
+                transaction.commit(function(err: any) {
                     callback(err, statement);
                 });
             });
@@ -190,7 +193,7 @@ class Database extends Events.EventEmitter {
         return this;
     }
 
-    execute(query, params, callback, options) {
+    execute(query: string, params?: any, callback?: any, options?: any): this {
         if (params instanceof Function) {
             options = callback;
             callback = params;
@@ -199,14 +202,14 @@ class Database extends Events.EventEmitter {
 
         var self = this;
 
-        self.connection.startTransaction(function(err, transaction) {
+        self.connection.startTransaction(function(err: any, transaction: any) {
 
             if (err) {
                 doError(err, callback);
                 return;
             }
 
-            transaction.execute(query, params, function(err, result, meta, isSelect) {
+            transaction.execute(query, params, function(err: any, result: any, meta: any, isSelect: boolean) {
 
                 if (err) {
                     transaction.rollback(function() {
@@ -215,7 +218,7 @@ class Database extends Events.EventEmitter {
                     return;
                 }
 
-                transaction.commit(function(err) {
+                transaction.commit(function(err: any) {
                     if (callback)
                         callback(err, result, meta, isSelect);
                 });
@@ -226,7 +229,7 @@ class Database extends Events.EventEmitter {
         return self;
     }
 
-    sequentially(query, params, on, callback, options = {}) {
+    sequentially(query: string, params?: any, on?: any, callback?: any, options: any = {}): this {
         if (params instanceof Function) {
             options = callback;
             callback = on;
@@ -244,9 +247,9 @@ class Database extends Events.EventEmitter {
         }
 
         var self = this;
-        var _on = function(row, i, meta, next) {
+        var _on = function(row: any, i: number, meta: any, next: (err?: any) => void) {
             var done = false;
-            var finish = function(err) {
+            var finish = function(err?: any) {
                 if (done) {
                     return;
                 }
@@ -254,7 +257,7 @@ class Database extends Events.EventEmitter {
                 next(err);
             };
 
-            fetchBlobSyncRow(row, meta, function(blobErr) {
+            fetchBlobSyncRow(row, meta, function(blobErr: any) {
                 if (blobErr) {
                     finish(blobErr);
                     return;
@@ -297,7 +300,7 @@ class Database extends Events.EventEmitter {
         return self;
     }
 
-    query(query, params, callback, options = {}) {
+    query(query: string, params?: any, callback?: any, options: any = {}): this {
         if (params instanceof Function) {
             options = callback || {};
             callback = params;
@@ -315,16 +318,17 @@ class Database extends Events.EventEmitter {
         return self;
     }
 
-    drop(callback) {
+    drop(callback?: (err?: any) => void): void {
         return this.connection.dropDatabase(callback);
     }
 
-    attachEvent(callback) {
+    attachEvent(callback: (err: any, evt?: any) => void): this {
         var self = this;
+        const eventid = self.eventid++;
         if (process.env.FIREBIRD_DEBUG) {
-            console.log('[fb-debug] Database.attachEvent: calling auxConnection, eventid=%d queue=%d', self.eventid, self.connection._queue.length);
+            console.log('[fb-debug] Database.attachEvent: calling auxConnection, eventid=%d queue=%d', eventid, self.connection._queue.length);
         }
-        this.connection.auxConnection(function (err, socket_info) {
+        this.connection.auxConnection(eventid, function (err: any, socket_info: any) {
 
             if (err) {
                 if (process.env.FIREBIRD_DEBUG) {
@@ -343,7 +347,7 @@ class Database extends Events.EventEmitter {
                 : socket_info.host;
 
             const eventConnection = new EventConnection(
-                host, socket_info.port, function(err) {
+                host, socket_info.port, function(err?: any) {
                 if (err) {
                     if (process.env.FIREBIRD_DEBUG) {
                         console.log('[fb-debug] Database.attachEvent: EventConnection error:', err.message);
@@ -353,10 +357,10 @@ class Database extends Events.EventEmitter {
                 }
 
                 if (process.env.FIREBIRD_DEBUG) {
-                    console.log('[fb-debug] Database.attachEvent: EventConnection connected, creating FbEventManager eventid=%d', self.eventid);
+                    console.log('[fb-debug] Database.attachEvent: EventConnection connected, creating FbEventManager eventid=%d', eventid);
                 }
 
-                const evt = new FbEventManager(self, eventConnection, self.eventid++, function (err) {
+                const evt = new FbEventManager(self, eventConnection, eventid, function (err: any) {
                     if (err) {
                         doError(err, callback);
                         return;
@@ -365,14 +369,76 @@ class Database extends Events.EventEmitter {
                     if (process.env.FIREBIRD_DEBUG) {
                         console.log('[fb-debug] Database.attachEvent: FbEventManager ready, eventid=%d', evt.eventid);
                     }
-
-                    callback(err, evt);
+                callback(err, evt);
                 });
             }, self);
         });
 
         return this;
     }
+
+    /**
+     * Create a physical tablespace.
+     * Supported in Firebird 6.0+ (Protocol 20+).
+     *
+     * @param {string} name - The name of the tablespace.
+     * @param {string} filePath - The physical file path for the tablespace.
+     * @param {function} [callback] - Asynchronous completion callback.
+     * @returns {Database}
+     */
+    createTablespace(name: string, filePath: string, callback?: any): this {
+        const sql = `CREATE TABLESPACE ${name} FILE '${filePath}'`;
+        return this.execute(sql, [], callback);
+    }
+
+    /**
+     * Alter an existing tablespace physical location.
+     * Supported in Firebird 6.0+ (Protocol 20+).
+     *
+     * @param {string} name - The name of the tablespace.
+     * @param {string} filePath - The new physical file path.
+     * @param {function} [callback] - Asynchronous completion callback.
+     * @returns {Database}
+     */
+    alterTablespace(name: string, filePath: string, callback?: any): this {
+        const sql = `ALTER TABLESPACE ${name} SET FILE TO '${filePath}'`;
+        return this.execute(sql, [], callback);
+    }
+
+    /**
+     * Drop a tablespace.
+     * Supported in Firebird 6.0+ (Protocol 20+).
+     *
+     * @param {string} name - The name of the tablespace.
+     * @param {function} [callback] - Asynchronous completion callback.
+     * @returns {Database}
+     */
+    dropTablespace(name: string, callback?: any): this {
+        const sql = `DROP TABLESPACE ${name}`;
+        return this.execute(sql, [], callback);
+    }
+
+    /**
+     * Create a schema/namespace. Can optionally partition/map the namespace
+     * to a physical tablespace.
+     * Supported in Firebird 6.0+ (Protocol 20+).
+     *
+     * @param {string} schemaName - The name of the schema.
+     * @param {string} [tablespaceName] - Optional tablespace name to bind this schema namespace.
+     * @param {function} [callback] - Asynchronous completion callback.
+     * @returns {Database}
+     */
+    createSchema(schemaName: string, tablespaceName?: string | ((err?: any) => void), callback?: any): this {
+        if (typeof tablespaceName === 'function') {
+            callback = tablespaceName;
+            tablespaceName = undefined;
+        }
+        let sql = `CREATE SCHEMA ${schemaName}`;
+        if (tablespaceName) {
+            sql += ` TABLESPACE ${tablespaceName}`;
+        }
+        return this.execute(sql, [], callback);
+    }
 }
 
-module.exports = Database;
+export = Database;

package/{poc/node_modules/node-firebird/lib/wire/eventConnection.js → src/wire/eventConnection.ts}

@@ -1,10 +1,20 @@
-const net = require('net');
-const { XdrReader } = require('./serialize');
+import net from 'net';
+import { XdrReader } from './serialize';
+import Const from './const';
+
 const DEFAULT_ENCODING = 'utf8';
-const Const = require('./const');
 
 class EventConnection {
-    constructor(host, port, callback, db) {
+    db: any;
+    emgr: any;
+    _isClosed: boolean;
+    _isOpened: boolean;
+    _socket: net.Socket;
+    _xdr?: XdrReader;
+    error: any;
+    eventcallback: ((err: any, ret?: any) => void) | null;
+
+    constructor(host: string, port: number, callback: (() => void) | undefined, db: any) {
         var self = this;
         this.db = db;
         this.emgr = null;
@@ -16,7 +26,7 @@ class EventConnection {
         this.eventcallback;
     }
 
-    _bind_events(host, port, callback) {
+    _bind_events(host: string, port: number, callback?: () => void): void {
         var self = this;
 
         self._socket.on('close', function () {
@@ -36,24 +46,24 @@ class EventConnection {
                 callback();
         });
 
-        self._socket.on('data', function (data) {
-            var xdr, buf;
+        self._socket.on('data', function (data: Buffer) {
+            var xdr: XdrReader, buf: Buffer | undefined;
 
             if (!self._xdr) {
                 xdr = new XdrReader(data);
             } else {
                 xdr = self._xdr;
                 delete (self._xdr);
-                buf = Buffer.from(data.length + xdr.buffer.length);
+                buf = Buffer.alloc(data.length + xdr.buffer.length);
                 xdr.buffer.copy(buf);
                 data.copy(buf, xdr.buffer.length);
                 xdr.buffer = buf;
             }
 
             try {
-                var item, op;
+
                 var op_pos = xdr.pos;
-                var tmp_event;
+                var tmp_event: Record<string, number>;
                 while (xdr.pos < xdr.buffer.length) {
                     do {
                         var r = xdr.readInt();
@@ -62,7 +72,7 @@ class EventConnection {
                     switch (r) {
                         case Const.op_event:
                             xdr.readInt(); // db handle
-                            var buf = xdr.readArray();
+                            buf = xdr.readArray();
                             // first byte is always set to 1
                             tmp_event = {};
                             var lst_event = [];
@@ -83,8 +93,13 @@ class EventConnection {
                             xdr.readInt64(); // ignore AST INFO
                             var event_id = xdr.readInt();
                             // set the new count in global event hash
+                            // Only update events that are still registered; do not
+                            // re-add events that unregisterEvent() has deleted, since
+                            // that would cause subscribe() to re-subscribe for them.
                             for (var evt in tmp_event) {
-                                self.emgr.events[evt] = tmp_event[evt];
+                                if (Object.prototype.hasOwnProperty.call(self.emgr.events, evt)) {
+                                    self.emgr.events[evt] = tmp_event[evt];
+                                }
                             }
                             if (self.eventcallback)
                                 self.eventcallback(null, { eventid: event_id, events: lst_event });
@@ -106,7 +121,7 @@ class EventConnection {
         })
     }
 
-    throwClosed(callback) {
+    throwClosed(callback?: (err: any) => void): this {
         var err = new Error('Event Connection is closed.');
         this.db.emit('error', err);
         if (callback)
@@ -115,4 +130,4 @@ class EventConnection {
     }
 }
 
-module.exports = EventConnection;
+export = EventConnection;