faye-redis-ng 1.0.2 → 1.1.1

package/README.md

@@ -2,7 +2,8 @@
 
 ![NPM Version](https://img.shields.io/npm/v/faye-redis-ng)
 [![Node.js Version](https://img.shields.io/node/v/faye-redis-ng.svg)](https://nodejs.org)
-[![CI](https://github.com/7a6163/faye-redis-node/workflows/CI/badge.svg)](https://github.com/7a6163/faye-redis-node/actions)
+[![CI](https://github.com/7a6163/faye-redis-node-ng/workflows/CI/badge.svg)](https://github.com/7a6163/faye-redis-node-ng/actions)
+[![codecov](https://codecov.io/gh/7a6163/faye-redis-node-ng/branch/main/graph/badge.svg)](https://codecov.io/gh/7a6163/faye-redis-node-ng)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 
 **Next Generation** Redis backend engine for [Faye](http://faye.jcoglan.com) - A modern, maintained fork with Redis v4 support, ES6+ syntax, and automatic reconnection.
@@ -13,11 +14,13 @@ This is a modernized fork of the original [faye-redis](https://github.com/7a6163
 
 ### ✨ Key Improvements
 
+- ✅ **TypeScript Support** - Full TypeScript rewrite with type definitions
 - ✅ **Redis v4 Support** - Uses modern Promise-based Redis client API
 - ✅ **ES6+ Syntax** - Modern JavaScript with classes, async/await, const/let
 - ✅ **Auto-Reconnection** - Automatic Redis reconnection with exponential backoff
 - ✅ **Better Error Handling** - Comprehensive error logging and event triggers
 - ✅ **Node.js 22 LTS** - Updated for latest LTS Node.js version
+- ✅ **Modern Testing** - Vitest with 77%+ code coverage
 - ✅ **Zero Breaking Changes** - Drop-in replacement for original faye-redis
 
 ### 🔄 Why This Fork?

package/dist/faye-redis.d.ts

@@ -0,0 +1,38 @@
+import type { EngineOptions, FayeMessage, FayeServer, CallbackContext, ClientCallback, ExistsCallback, EmptyCallback } from './types';
+declare class Engine {
+    private readonly DEFAULT_HOST;
+    private readonly DEFAULT_PORT;
+    private readonly DEFAULT_DATABASE;
+    private readonly DEFAULT_GC;
+    private readonly LOCK_TIMEOUT;
+    private _server;
+    private _options;
+    private _ns;
+    private _messageChannel;
+    private _closeChannel;
+    private _redis;
+    private _subscriber;
+    private _initialized;
+    private _subscriptionsSetUp;
+    private _gc;
+    constructor(server: FayeServer, options?: EngineOptions);
+    private _initializeClients;
+    private _reconnectStrategy;
+    private _waitForInit;
+    static create(server: FayeServer, options?: EngineOptions): Engine;
+    disconnect(): Promise<void>;
+    createClient(callback: ClientCallback, context: CallbackContext): void;
+    clientExists(clientId: string, callback: ExistsCallback, context: CallbackContext): void;
+    destroyClient(clientId: string, callback?: EmptyCallback, context?: CallbackContext): void;
+    ping(clientId: string): void;
+    subscribe(clientId: string, channel: string, callback?: EmptyCallback, context?: CallbackContext): void;
+    unsubscribe(clientId: string, channel: string, callback?: EmptyCallback, context?: CallbackContext): void;
+    publish(message: FayeMessage, channels: string[]): void;
+    emptyQueue(clientId: string): void;
+    gc(): void;
+    private _withLock;
+}
+export default Engine;
+export { Engine };
+export type { EngineOptions, FayeMessage, FayeServer };
+//# sourceMappingURL=faye-redis.d.ts.map

package/dist/faye-redis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"faye-redis.d.ts","sourceRoot":"","sources":["../src/faye-redis.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,aAAa,EACb,WAAW,EACX,UAAU,EAEV,eAAe,EACf,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,SAAS,CAAC;AAEjB,cAAM,MAAM;IACV,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAC5C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAK;IACtC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAM;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAO;IAEpC,OAAO,CAAC,OAAO,CAAa;IAC5B,OAAO,CAAC,QAAQ,CAAgB;IAChC,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAA4B;IAC1C,OAAO,CAAC,WAAW,CAA4B;IAC/C,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,GAAG,CAAiB;gBAEhB,MAAM,EAAE,UAAU,EAAE,OAAO,GAAE,aAAkB;YAiB7C,kBAAkB;IA0FhC,OAAO,CAAC,kBAAkB;YAYZ,YAAY;IAM1B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,MAAM;IAI5D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,YAAY,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI;IAqBtE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,GAAG,IAAI;IAWxF,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAkC1F,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAc5B,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAgBvG,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAgBzG,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IA+BvD,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsBlC,EAAE,IAAI,IAAI;IA0BV,OAAO,CAAC,SAAS;CA+BlB;AAED,eAAe,MAAM,CAAC;AACtB,OAAO,EAAE,MAAM,EAAE,CAAC;AAClB,YAAY,EAAE,aAAa,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC"}

package/dist/faye-redis.js

@@ -0,0 +1,336 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Engine = void 0;
+const redis_1 = require("redis");
+class Engine {
+    DEFAULT_HOST = 'localhost';
+    DEFAULT_PORT = 6379;
+    DEFAULT_DATABASE = 0;
+    DEFAULT_GC = 60;
+    LOCK_TIMEOUT = 120;
+    _server;
+    _options;
+    _ns;
+    _messageChannel;
+    _closeChannel;
+    _redis = null;
+    _subscriber = null;
+    _initialized = false;
+    _subscriptionsSetUp = false;
+    _gc;
+    constructor(server, options = {}) {
+        this._server = server;
+        this._options = options;
+        this._ns = options.namespace || '';
+        this._messageChannel = this._ns + '/notifications/messages';
+        this._closeChannel = this._ns + '/notifications/close';
+        // Start initialization
+        this._initializeClients().catch(err => {
+            console.error('Failed to initialize Redis clients:', err);
+        });
+        const gc = options.gc || this.DEFAULT_GC;
+        this._gc = setInterval(() => this.gc(), gc * 1000);
+    }
+    async _initializeClients() {
+        const host = this._options.host || this.DEFAULT_HOST;
+        const port = this._options.port || this.DEFAULT_PORT;
+        const db = this._options.database || this.DEFAULT_DATABASE;
+        const auth = this._options.password;
+        const socket = this._options.socket;
+        const clientConfig = {
+            database: db,
+            ...(auth && { password: auth }),
+            ...(socket && {
+                socket: {
+                    path: socket,
+                    reconnectStrategy: this._reconnectStrategy.bind(this)
+                }
+            }),
+            ...(!socket && {
+                socket: {
+                    host,
+                    port,
+                    reconnectStrategy: this._reconnectStrategy.bind(this)
+                }
+            })
+        };
+        this._redis = (0, redis_1.createClient)(clientConfig);
+        this._subscriber = (0, redis_1.createClient)(clientConfig);
+        // Set up error handlers
+        this._redis.on('error', (err) => {
+            console.error('Redis client error:', err);
+            this._server.trigger('error', err);
+        });
+        this._subscriber.on('error', (err) => {
+            console.error('Redis subscriber error:', err);
+            this._server.trigger('error', err);
+        });
+        // Handle reconnection events
+        this._redis.on('reconnecting', () => {
+            console.log('Redis client reconnecting...');
+            this._initialized = false;
+        });
+        this._subscriber.on('reconnecting', () => {
+            console.log('Redis subscriber reconnecting...');
+            this._initialized = false;
+        });
+        this._redis.on('ready', () => {
+            console.log('Redis client ready');
+            this._initialized = true;
+        });
+        this._subscriber.on('ready', async () => {
+            console.log('Redis subscriber ready');
+            // Only re-subscribe after reconnection (not on initial connection)
+            if (this._subscriptionsSetUp) {
+                console.log('Redis subscriber reconnected, re-subscribing...');
+                try {
+                    await this._subscriber.subscribe(this._messageChannel, (message) => {
+                        this.emptyQueue(message);
+                    });
+                    await this._subscriber.subscribe(this._closeChannel, (message) => {
+                        this._server.trigger('close', message);
+                    });
+                    this._initialized = true;
+                }
+                catch (err) {
+                    console.error('Error re-subscribing after reconnection:', err);
+                }
+            }
+        });
+        await this._redis.connect();
+        await this._subscriber.connect();
+        // Initial subscription (only once)
+        await this._subscriber.subscribe(this._messageChannel, (message) => {
+            this.emptyQueue(message);
+        });
+        await this._subscriber.subscribe(this._closeChannel, (message) => {
+            this._server.trigger('close', message);
+        });
+        this._subscriptionsSetUp = true;
+        this._initialized = true;
+    }
+    _reconnectStrategy(retries) {
+        // Exponential backoff with max delay of 10 seconds
+        if (retries > 20) {
+            // After 20 retries, give up (roughly 2 minutes)
+            console.error('Redis reconnection failed after 20 retries');
+            return new Error('Max reconnection attempts reached');
+        }
+        const delay = Math.min(retries * 100, 10000);
+        console.log(`Redis reconnecting in ${delay}ms (attempt ${retries})`);
+        return delay;
+    }
+    async _waitForInit() {
+        while (!this._initialized) {
+            await new Promise(resolve => setTimeout(resolve, 10));
+        }
+    }
+    static create(server, options) {
+        return new this(server, options);
+    }
+    async disconnect() {
+        if (this._subscriber) {
+            await this._subscriber.unsubscribe();
+            await this._subscriber.quit();
+        }
+        if (this._redis) {
+            await this._redis.quit();
+        }
+        clearInterval(this._gc);
+    }
+    createClient(callback, context) {
+        this._waitForInit().then(async () => {
+            const clientId = this._server.generateId();
+            const added = await this._redis.zAdd(this._ns + '/clients', {
+                score: 0,
+                value: clientId
+            }, { NX: true });
+            if (added === 0) {
+                return this.createClient(callback, context);
+            }
+            this._server.debug('Created new client ?', clientId);
+            this.ping(clientId);
+            this._server.trigger('handshake', clientId);
+            callback.call(context, clientId);
+        }).catch(err => {
+            console.error('Error creating client:', err);
+        });
+    }
+    clientExists(clientId, callback, context) {
+        this._waitForInit().then(async () => {
+            const cutoff = new Date().getTime() - (1000 * 1.6 * this._server.timeout);
+            const score = await this._redis.zScore(this._ns + '/clients', clientId);
+            callback.call(context, score ? parseInt(score.toString(), 10) > cutoff : false);
+        }).catch(err => {
+            console.error('Error checking client existence:', err);
+            callback.call(context, false);
+        });
+    }
+    destroyClient(clientId, callback, context) {
+        this._waitForInit().then(async () => {
+            const channels = await this._redis.sMembers(this._ns + '/clients/' + clientId + '/channels');
+            const multi = this._redis.multi();
+            multi.zAdd(this._ns + '/clients', { score: 0, value: clientId });
+            for (const channel of channels) {
+                multi.sRem(this._ns + '/clients/' + clientId + '/channels', channel);
+                multi.sRem(this._ns + '/channels' + channel, clientId);
+            }
+            multi.del(this._ns + '/clients/' + clientId + '/messages');
+            multi.zRem(this._ns + '/clients', clientId);
+            multi.publish(this._closeChannel, clientId);
+            const results = await multi.exec();
+            channels.forEach((channel, i) => {
+                if (results[2 * i + 1] !== 1)
+                    return;
+                this._server.trigger('unsubscribe', clientId, channel);
+                this._server.debug('Unsubscribed client ? from channel ?', clientId, channel);
+            });
+            this._server.debug('Destroyed client ?', clientId);
+            this._server.trigger('disconnect', clientId);
+            if (callback)
+                callback.call(context);
+        }).catch(err => {
+            console.error('Error destroying client:', err);
+            if (callback)
+                callback.call(context);
+        });
+    }
+    ping(clientId) {
+        const timeout = this._server.timeout;
+        if (typeof timeout !== 'number')
+            return;
+        const time = new Date().getTime();
+        this._server.debug('Ping ?, ?', clientId, time);
+        this._waitForInit().then(async () => {
+            await this._redis.zAdd(this._ns + '/clients', { score: time, value: clientId });
+        }).catch(err => {
+            console.error('Error pinging client:', err);
+        });
+    }
+    subscribe(clientId, channel, callback, context) {
+        this._waitForInit().then(async () => {
+            const added = await this._redis.sAdd(this._ns + '/clients/' + clientId + '/channels', channel);
+            if (added === 1) {
+                this._server.trigger('subscribe', clientId, channel);
+            }
+            await this._redis.sAdd(this._ns + '/channels' + channel, clientId);
+            this._server.debug('Subscribed client ? to channel ?', clientId, channel);
+            if (callback)
+                callback.call(context);
+        }).catch(err => {
+            console.error('Error subscribing:', err);
+            if (callback)
+                callback.call(context);
+        });
+    }
+    unsubscribe(clientId, channel, callback, context) {
+        this._waitForInit().then(async () => {
+            const removed = await this._redis.sRem(this._ns + '/clients/' + clientId + '/channels', channel);
+            if (removed === 1) {
+                this._server.trigger('unsubscribe', clientId, channel);
+            }
+            await this._redis.sRem(this._ns + '/channels' + channel, clientId);
+            this._server.debug('Unsubscribed client ? from channel ?', clientId, channel);
+            if (callback)
+                callback.call(context);
+        }).catch(err => {
+            console.error('Error unsubscribing:', err);
+            if (callback)
+                callback.call(context);
+        });
+    }
+    publish(message, channels) {
+        this._server.debug('Publishing message ?', message);
+        this._waitForInit().then(async () => {
+            const jsonMessage = JSON.stringify(message);
+            const keys = channels.map(c => this._ns + '/channels' + c);
+            const clients = await this._redis.sUnion(keys);
+            for (const clientId of clients) {
+                const queue = this._ns + '/clients/' + clientId + '/messages';
+                this._server.debug('Queueing for client ?: ?', clientId, message);
+                await this._redis.rPush(queue, jsonMessage);
+                await this._redis.publish(this._messageChannel, clientId);
+                const exists = await new Promise((resolve) => {
+                    this.clientExists(clientId, resolve, null);
+                });
+                if (!exists) {
+                    await this._redis.del(queue);
+                }
+            }
+            this._server.trigger('publish', message.clientId, message.channel, message.data);
+        }).catch(err => {
+            console.error('Error publishing:', err);
+        });
+    }
+    emptyQueue(clientId) {
+        if (!this._server.hasConnection(clientId))
+            return;
+        this._waitForInit().then(async () => {
+            const key = this._ns + '/clients/' + clientId + '/messages';
+            const multi = this._redis.multi();
+            multi.lRange(key, 0, -1);
+            multi.del(key);
+            const results = await multi.exec();
+            const jsonMessages = results[0];
+            if (jsonMessages && jsonMessages.length > 0) {
+                const messages = jsonMessages.map(json => JSON.parse(json));
+                this._server.deliver(clientId, messages);
+            }
+        }).catch(err => {
+            console.error('Error emptying queue:', err);
+        });
+    }
+    gc() {
+        const timeout = this._server.timeout;
+        if (typeof timeout !== 'number')
+            return;
+        this._withLock('gc', async (releaseLock) => {
+            const cutoff = new Date().getTime() - 1000 * 2 * timeout;
+            const clients = await this._redis.zRangeByScore(this._ns + '/clients', 0, cutoff);
+            if (clients.length === 0) {
+                releaseLock();
+                return;
+            }
+            let completed = 0;
+            for (const clientId of clients) {
+                this.destroyClient(clientId, () => {
+                    completed++;
+                    if (completed === clients.length) {
+                        releaseLock();
+                    }
+                }, this);
+            }
+        });
+    }
+    _withLock(lockName, callback) {
+        this._waitForInit().then(async () => {
+            const lockKey = this._ns + '/locks/' + lockName;
+            const currentTime = new Date().getTime();
+            const expiry = currentTime + this.LOCK_TIMEOUT * 1000 + 1;
+            const releaseLock = async () => {
+                if (new Date().getTime() < expiry) {
+                    await this._redis.del(lockKey);
+                }
+            };
+            const set = await this._redis.setNX(lockKey, expiry.toString());
+            if (set) {
+                return callback.call(this, releaseLock);
+            }
+            const timeout = await this._redis.get(lockKey);
+            if (!timeout)
+                return;
+            const lockTimeout = parseInt(timeout, 10);
+            if (currentTime < lockTimeout)
+                return;
+            const oldValue = await this._redis.set(lockKey, expiry.toString(), { GET: true });
+            if (oldValue === timeout) {
+                callback.call(this, releaseLock);
+            }
+        }).catch(err => {
+            console.error('Error with lock:', err);
+        });
+    }
+}
+exports.Engine = Engine;
+exports.default = Engine;
+//# sourceMappingURL=faye-redis.js.map

package/dist/faye-redis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"faye-redis.js","sourceRoot":"","sources":["../src/faye-redis.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+import Engine from './faye-redis';
+export = Engine;
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AASA,OAAO,MAAM,MAAM,cAAc,CAAC;AAGlC,SAAS,MAAM,CAAC"}

package/dist/index.js

@@ -0,0 +1,15 @@
+"use strict";
+// Backward compatibility entry point
+// This file provides CommonJS compatibility while maintaining TypeScript benefits
+//
+// Usage patterns supported:
+// - const Engine = require('faye-redis-ng');           (CommonJS direct)
+// - const { Engine } = require('faye-redis-ng');       (CommonJS destructured)
+// - import Engine from 'faye-redis-ng';                (ES6 default)
+// - import { Engine } from 'faye-redis-ng';            (ES6 named)
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+const faye_redis_1 = __importDefault(require("./faye-redis"));
+module.exports = faye_redis_1.default;
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,qCAAqC;AACrC,kFAAkF;AAClF,EAAE;AACF,4BAA4B;AAC5B,yEAAyE;AACzE,+EAA+E;AAC/E,qEAAqE;AACrE,mEAAmE;;;;AAEnE,8DAAkC;AAGlC,iBAAS,oBAAM,CAAC"}

package/dist/types.d.ts

@@ -0,0 +1,30 @@
+import { RedisClientType } from 'redis';
+export interface EngineOptions {
+    host?: string;
+    port?: number;
+    password?: string;
+    database?: number;
+    namespace?: string;
+    socket?: string;
+    gc?: number;
+}
+export interface FayeMessage {
+    clientId?: string;
+    channel: string;
+    data: any;
+    id?: string;
+}
+export interface FayeServer {
+    timeout: number;
+    generateId(): string;
+    debug(...args: any[]): void;
+    trigger(event: string, ...args: any[]): void;
+    hasConnection(clientId: string): boolean;
+    deliver(clientId: string, messages: FayeMessage[]): void;
+}
+export type RedisClient = RedisClientType;
+export type CallbackContext = any;
+export type EmptyCallback = () => void;
+export type ClientCallback = (clientId: string) => void;
+export type ExistsCallback = (exists: boolean) => void;
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,GAAG,CAAC;IACV,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,IAAI,MAAM,CAAC;IACrB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAC7C,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IACzC,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;CAC1D;AAED,MAAM,MAAM,WAAW,GAAG,eAAe,CAAC;AAE1C,MAAM,MAAM,eAAe,GAAG,GAAG,CAAC;AAElC,MAAM,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC;AACvC,MAAM,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;AACxD,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC"}

package/dist/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "faye-redis-ng",
   "description": "Modern Redis backend engine for Faye (Next Generation fork with Redis v4, ES6+, auto-reconnection)",
-  "homepage": "http://github.com/7a6163/faye-redis-node",
+  "homepage": "https://github.com/7a6163/faye-redis-node-ng",
   "contributors": [
     "Modernized and maintained by the community"
   ],
@@ -15,23 +15,40 @@
     "realtime"
   ],
   "license": "MIT",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "engines": {
     "node": ">=22.0.0"
   },
-  "main": "./faye-redis",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist",
+    "src",
+    "LICENSE",
+    "README.md"
+  ],
   "dependencies": {
     "redis": "^4.7.0"
   },
   "devDependencies": {
-    "jstest": "^1.0.5"
+    "@types/node": "^22.10.5",
+    "@vitest/coverage-v8": "^4.0.16",
+    "@vitest/ui": "^4.0.16",
+    "typescript": "^5.7.2",
+    "vitest": "^4.0.16"
   },
   "scripts": {
-    "test": "node spec/runner.js"
+    "build": "tsc",
+    "build:watch": "tsc --watch",
+    "prepublishOnly": "npm run build",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:ui": "vitest --ui",
+    "test:coverage": "vitest run --coverage"
   },
-  "bugs": "http://github.com/7a6163/faye-redis-node/issues",
+  "bugs": "https://github.com/7a6163/faye-redis-node-ng/issues",
   "repository": {
     "type": "git",
-    "url": "git://github.com/7a6163/faye-redis-node.git"
+    "url": "git+https://github.com/7a6163/faye-redis-node-ng.git"
   }
 }