falkordb 6.0.2 → 6.1.0

package/README.md

@@ -1,12 +1,13 @@
-# falkordb-ts
-
 [![Tests](https://img.shields.io/github/actions/workflow/status/falkordb/falkordb-ts/node.js.yml?branch=main)](https://github.com/falkordb/falkordb-ts/actions/workflows/node.js.yml)
 [![Coverage](https://codecov.io/gh/falkordb/falkordb-ts/branch/main/graph/badge.svg?token=nNxm2N0Xrl)](https://codecov.io/gh/falkordb/falkordb-ts)
 [![License](https://img.shields.io/github/license/falkordb/falkordb-ts.svg)](https://github.com/falkordb/falkordb-ts/blob/main/LICENSE)
-
 [![Discord](https://img.shields.io/discord/1146782921294884966.svg?style=social&logo=discord)](https://discord.com/invite/99y2Ubh6tg)
 [![Twitter](https://img.shields.io/twitter/follow/falkordb?style=social)](https://twitter.com/falkordb)
 
+# falkordb-ts
+
+[![Try Free](https://img.shields.io/badge/Try%20Free-FalkorDB%20Cloud-FF8101?labelColor=FDE900&style=for-the-badge&link=https://app.falkordb.cloud)](https://app.falkordb.cloud)
+
 `falkordb` is a [FalkorDB](https://www.falkordb.com) client for Node.js.
 
 ## Installation

package/dist/src/commands/SENTINEL_MASTER.js

@@ -6,4 +6,3 @@ function transformArguments(dbname) {
     return ['SENTINEL', 'MASTER', dbname];
 }
 exports.transformArguments = transformArguments;
-//# sourceMappingURL=SENTINEL_MASTER.js.map

package/dist/src/commands/SENTINEL_MASTERS.js

@@ -6,4 +6,3 @@ function transformArguments() {
     return ['SENTINEL', 'MASTERS'];
 }
 exports.transformArguments = transformArguments;
-//# sourceMappingURL=SENTINEL_MASTERS.js.map

package/dist/src/commands/index.d.ts

@@ -11,6 +11,8 @@ import * as SLOWLOG from './SLOWLOG';
 import * as CONSTRAINT_CREATE from './CONSTRAINT_CREATE';
 import * as CONSTRAINT_DROP from './CONSTRAINT_DROP';
 import * as COPY from './COPY';
+import * as SENTINEL_MASTER from './SENTINEL_MASTER';
+import * as SENTINEL_MASTERS from './SENTINEL_MASTERS';
 import { RedisCommandArgument, RedisCommandArguments } from '@redis/client/dist/lib/commands';
 declare const _default: {
     CONFIG_GET: typeof CONFIG_GET;
@@ -39,6 +41,10 @@ declare const _default: {
     constraintDrop: typeof CONSTRAINT_DROP;
     COPY: typeof COPY;
     copy: typeof COPY;
+    SENTINEL_MASTER: typeof SENTINEL_MASTER;
+    sentinelMaster: typeof SENTINEL_MASTER;
+    SENTINEL_MASTERS: typeof SENTINEL_MASTERS;
+    sentinelMasters: typeof SENTINEL_MASTERS;
 };
 export default _default;
 type QueryParam = null | string | number | boolean | QueryParams | Array<QueryParam>;

package/dist/src/commands/index.js

@@ -14,6 +14,8 @@ const SLOWLOG = require("./SLOWLOG");
 const CONSTRAINT_CREATE = require("./CONSTRAINT_CREATE");
 const CONSTRAINT_DROP = require("./CONSTRAINT_DROP");
 const COPY = require("./COPY");
+const SENTINEL_MASTER = require("./SENTINEL_MASTER");
+const SENTINEL_MASTERS = require("./SENTINEL_MASTERS");
 exports.default = {
     CONFIG_GET,
     configGet: CONFIG_GET,
@@ -40,7 +42,11 @@ exports.default = {
     CONSTRAINT_DROP,
     constraintDrop: CONSTRAINT_DROP,
     COPY,
-    copy: COPY
+    copy: COPY,
+    SENTINEL_MASTER,
+    sentinelMaster: SENTINEL_MASTER,
+    SENTINEL_MASTERS,
+    sentinelMasters: SENTINEL_MASTERS
 };
 function pushQueryArguments(args, graph, query, options, compact) {
     args.push(graph);

package/dist/src/falkordb.d.ts

@@ -72,6 +72,7 @@ export interface FalkorDBOptions {
 export default class FalkorDB extends EventEmitter {
     #private;
     private constructor();
+    private connectServer;
     static connect(options?: FalkorDBOptions): Promise<FalkorDB>;
     selectGraph(graphId: string): Graph;
     get connection(): GraphConnection;

package/dist/src/falkordb.js

@@ -4,12 +4,66 @@ const events_1 = require("events");
 const redis_1 = require("redis");
 const graph_1 = require("./graph");
 const commands_1 = require("./commands");
+function extractDetails(masters) {
+    const allDetails = [];
+    for (const master of masters) {
+        const details = {};
+        for (let i = 0; i < master.length; i += 2) {
+            details[master[i]] = master[i + 1];
+        }
+        allDetails.push(details);
+    }
+    return allDetails;
+}
 class FalkorDB extends events_1.EventEmitter {
     #client;
+    #sentinel;
     constructor(client) {
         super();
         this.#client = client;
     }
+    async connectServer(client, redisOption) {
+        // If not connected to sentinel, throws an error on missing command
+        const masters = await client.falkordb.sentinelMasters();
+        const details = extractDetails(masters);
+        if (details.length > 1) {
+            throw new Error('Multiple masters are not supported');
+        }
+        // Connect to the server with the details from sentinel
+        const socketOptions = {
+            ...redisOption.socket,
+            host: details[0]['ip'],
+            port: parseInt(details[0]['port'])
+        };
+        const serverOptions = {
+            ...redisOption,
+            socket: socketOptions
+        };
+        const realClient = (0, redis_1.createClient)(serverOptions);
+        // Set original client as sentinel and server client as client
+        this.#sentinel = client;
+        this.#client = realClient;
+        await realClient
+            .on('error', async (err) => {
+            console.debug('Error on server connection', err);
+            // Disconnect the client to avoid further errors and retries
+            realClient.disconnect();
+            // If error occurs on previous server connection, no need to reconnect
+            if (this.#client !== realClient) {
+                return;
+            }
+            try {
+                await this.connectServer(client, redisOption);
+                console.debug('Connected to server');
+            }
+            catch (e) {
+                console.debug('Error on server reconnect', e);
+                // Forward errors if reconnection fails
+                this.emit('error', err);
+            }
+        })
+            .connect();
+    }
     static async connect(options) {
         const redisOption = (options ?? {});
         // If the URL is provided, and the protocol is `falkor` replaces it with `redis` for the underline redis client
@@ -25,6 +79,12 @@ class FalkorDB extends events_1.EventEmitter {
         await client
             .on('error', err => falkordb.emit('error', err)) // Forward errors
             .connect();
+        try {
+            await falkordb.connectServer(client, redisOption);
+        }
+        catch (e) {
+            console.debug('Error in connecting to sentinel, connecting to server directly');
+        }
         return falkordb;
     }
     selectGraph(graphId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "falkordb",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "description": "A FalkorDB javascript library",
   "license": "MIT",
   "main": "./dist/index.js",