falkordb 7.0.0 → 7.0.1

package/dist/src/falkordb.js

@@ -13,6 +13,8 @@ const single_1 = require("./clients/single");
 const sentinel_1 = require("./clients/sentinel");
 const cluster_1 = require("./clients/cluster");
 const nullClient_1 = require("./clients/nullClient");
+const server_mode_1 = require("./server-mode");
+const replication_role_1 = require("./replication-role");
 /**
  * Retries the initial connection gets before `FalkorDB.connect()` rejects.
  */
@@ -39,15 +41,15 @@ function initialReconnectStrategy(retries, cause, tlsEnabled) {
     return new Error(`Failed to connect to FalkorDB: ${cause.message}.${hint}`, { cause });
 }
 async function clientFactory(client, sentinelOptions) {
-    const info = await client.info("server");
-    if (info.includes("redis_mode:sentinel")) {
+    const mode = (0, server_mode_1.serverMode)(await client.info("server"));
+    if (mode === "sentinel") {
         return new sentinel_1.Sentinel(client, sentinelOptions);
     }
-    else if (info.includes("redis_mode:cluster")) {
+    else if (mode === "cluster") {
         // Connecting through a replica (or asking for `readonly`) opts in to
         // serving read-only commands from replicas, see `Cluster`.
         const replication = await client.info("replication");
-        const useReplicas = client.options?.readonly === true || /^role:slave\r?$/m.test(replication);
+        const useReplicas = client.options?.readonly === true || (0, replication_role_1.isReplica)(replication);
         return new cluster_1.Cluster(client, { useReplicas });
     }
     return new single_1.Single(client);

package/dist/src/replication-role.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Reads the `role` field of an `INFO replication` reply and says whether the
+ * server is a replica. A reply without a role is not a replica.
+ */
+export declare function isReplica(info: string): boolean;

package/dist/src/replication-role.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isReplica = isReplica;
+// Redis and Valkey both report `role:slave` today; `replica` is the name both
+// use everywhere else (REPLICAOF, `replica-*` settings), so accept it too.
+const ROLE_FIELD = /^role:([^\r\n]*)\r?$/m;
+const REPLICA_ROLES = new Set(['slave', 'replica']);
+/**
+ * Reads the `role` field of an `INFO replication` reply and says whether the
+ * server is a replica. A reply without a role is not a replica.
+ */
+function isReplica(info) {
+    const role = ROLE_FIELD.exec(info)?.[1].trim();
+    return role !== undefined && REPLICA_ROLES.has(role);
+}

package/dist/src/server-mode.d.ts

@@ -0,0 +1,10 @@
+/**
+ * How a server says it runs in its `INFO server` reply: `standalone`,
+ * `sentinel` or `cluster`.
+ */
+export type ServerMode = 'standalone' | 'sentinel' | 'cluster';
+/**
+ * Reads the mode from an `INFO server` reply. A server that does not report a
+ * mode we know of is treated as standalone.
+ */
+export declare function serverMode(info: string): ServerMode;

package/dist/src/server-mode.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serverMode = serverMode;
+// Redis names the field `redis_mode`. Valkey names it `server_mode`, unless
+// `extended-redis-compatibility` is on, and FalkorDB images ship either one.
+const MODE_FIELD = /^(?:redis|server)_mode:([^\r\n]*)\r?$/m;
+/**
+ * Reads the mode from an `INFO server` reply. A server that does not report a
+ * mode we know of is treated as standalone.
+ */
+function serverMode(info) {
+    const mode = MODE_FIELD.exec(info)?.[1].trim();
+    return mode === 'sentinel' || mode === 'cluster' ? mode : 'standalone';
+}

package/package.json

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