falkordb 6.2.4 → 6.2.5

package/dist/src/clients/client.d.ts

@@ -23,6 +23,10 @@ export interface Client {
     }[]>;
     constraintCreate(graph: string, constraintType: ConstraintType, entityType: EntityType, label: string, ...properties: string[]): Promise<void>;
     constraintDrop(graph: string, constraintType: ConstraintType, entityType: EntityType, label: string, ...properties: string[]): Promise<void>;
+    /**
+     * @deprecated Use `disconnect` instead
+     */
     quit(): Promise<void>;
+    disconnect(): Promise<void>;
     getConnection(): Promise<SingleGraphConnection>;
 }

package/dist/src/clients/cluster.d.ts

@@ -53,4 +53,5 @@ export declare class Cluster implements Client {
     constraintDrop(graph: string, constraintType: ConstraintType, entityType: EntityType, label: string, ...properties: string[]): Promise<void>;
     profile<T>(graph: string, query: string): Promise<string | number | (string | number | (string | number | (string | number | (string | number | (string | number | (string | number | (string | number | (string | number | (string | number | (string | number | (string | number | /*elided*/ any | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined)[] | null | undefined>;
     quit(): Promise<void>;
+    disconnect(): Promise<void>;
 }

package/dist/src/clients/cluster.js

@@ -11,7 +11,9 @@ class Cluster {
     constructor(client) {
         // Convert the single client options to a cluster client options
         const redisClusterOption = client.options;
-        redisClusterOption.rootNodes = [client.options];
+        redisClusterOption.rootNodes = [
+            client.options,
+        ];
         // Remove the URL from the defaults so it won't override the dynamic cluster URLs
         const defaults = lodash.cloneDeep(client.options);
         defaults?.url && delete defaults.url;
@@ -26,7 +28,7 @@ class Cluster {
     }
     async init(falkordb) {
         await this.#client
-            .on('error', err => falkordb.emit('error', err)) // Forward errors
+            .on("error", (err) => falkordb.emit("error", err)) // Forward errors
             .connect();
     }
     async query(graph, query, options, compact = true) {
@@ -73,7 +75,10 @@ class Cluster {
         return this.#client.falkordb.profile(graph, query);
     }
     async quit() {
-        const reply = this.#client.quit();
+        return this.disconnect();
+    }
+    async disconnect() {
+        const reply = this.#client.disconnect();
         return reply.then(() => { });
     }
 }

package/dist/src/clients/nullClient.d.ts

@@ -37,4 +37,5 @@ export declare class NullClient implements Client {
     constraintCreate(graph: string, constraintType: ConstraintType, entityType: EntityType, label: string, ...properties: string[]): Promise<void>;
     constraintDrop(graph: string, constraintType: ConstraintType, entityType: EntityType, label: string, ...properties: string[]): Promise<void>;
     quit(): Promise<void>;
+    disconnect(): Promise<void>;
 }

package/dist/src/clients/nullClient.js

@@ -61,5 +61,8 @@ class NullClient {
     quit() {
         throw new Error("Method not implemented.");
     }
+    disconnect() {
+        throw new Error("Method not implemented.");
+    }
 }
 exports.NullClient = NullClient;

package/dist/src/clients/sentinel.d.ts

@@ -9,4 +9,5 @@ export declare class Sentinel extends Single {
      */
     private tryConnectSentinelServer;
     quit(): Promise<void>;
+    disconnect(): Promise<void>;
 }

package/dist/src/clients/sentinel.js

@@ -29,26 +29,26 @@ class Sentinel extends single_1.Single {
         const masters = await client.falkordb.sentinelMasters();
         const details = extractDetails(masters);
         if (details.length > 1) {
-            throw new Error('Multiple masters are not supported');
+            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'])
+            host: details[0]["ip"],
+            port: parseInt(details[0]["port"]),
         };
         const serverOptions = {
             ...redisOption,
-            socket: socketOptions
+            socket: socketOptions,
         };
         const realClient = (0, client_1.createClient)(serverOptions);
-        // Save sentinel client to quite on quit()
+        // Save sentinel client to quit on quit()
         this.sentinelClient = client;
         // Set original client as sentinel and server client as client
         this.client = realClient;
         await realClient
-            .on('error', async (err) => {
-            console.debug('Error on server connection', err);
+            .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
@@ -57,22 +57,26 @@ class Sentinel extends single_1.Single {
             }
             try {
                 await this.tryConnectSentinelServer(client, redisOption, falkordb);
-                console.debug('Connected to server');
+                console.debug("Connected to server");
             }
             catch (e) {
-                console.debug('Error on server reconnect', e);
+                console.debug("Error on server reconnect", e);
                 // Forward errors if reconnection fails
-                falkordb.emit('error', err);
+                falkordb.emit("error", err);
             }
         })
             .connect();
     }
-    async quit() {
-        await super.quit();
+    quit() {
+        return this.disconnect();
+    }
+    async disconnect() {
+        const promises = [super.disconnect()];
         if (this.sentinelClient) {
-            const reply = this.sentinelClient.quit();
-            return reply.then(() => { });
+            const reply = this.sentinelClient.disconnect();
+            promises.push(reply.then(() => { }));
         }
+        return Promise.all(promises).then(() => { });
     }
 }
 exports.Sentinel = Sentinel;

package/dist/src/clients/single.d.ts

@@ -47,5 +47,6 @@ export declare class Single implements Client {
     constraintDrop(graph: string, constraintType: ConstraintType, entityType: EntityType, label: string, ...properties: string[]): Promise<void>;
     copy<T>(srcGraph: string, destGraph: string): Promise<"OK">;
     quit(): Promise<void>;
+    disconnect(): Promise<void>;
     getConnection(): Promise<SingleGraphConnection>;
 }

package/dist/src/clients/single.js

@@ -6,27 +6,25 @@ class Single {
     #usePool;
     constructor(client) {
         this.client = client;
-        this.#usePool = !!(this.client.options?.isolationPoolOptions);
+        this.#usePool = !!this.client.options?.isolationPoolOptions;
     }
     init(falkordb) {
         return Promise.resolve();
     }
     async query(graph, query, options, compact = true) {
-        const reply = this.#usePool ?
-            await this.client.executeIsolated(async (isolatedClient) => {
+        const reply = this.#usePool
+            ? await this.client.executeIsolated(async (isolatedClient) => {
                 return isolatedClient.falkordb.query(graph, query, options, compact);
             })
-            :
-                await this.client.falkordb.query(graph, query, options, compact);
+            : await this.client.falkordb.query(graph, query, options, compact);
         return reply;
     }
     async roQuery(graph, query, options, compact = true) {
-        const reply = this.#usePool ?
-            await this.client.executeIsolated(async (isolatedClient) => {
+        const reply = this.#usePool
+            ? await this.client.executeIsolated(async (isolatedClient) => {
                 return isolatedClient.falkordb.roQuery(graph, query, options, compact);
             })
-            :
-                await this.client.falkordb.roQuery(graph, query, options, compact);
+            : await this.client.falkordb.roQuery(graph, query, options, compact);
         return reply;
     }
     async delete(graph) {
@@ -87,8 +85,11 @@ class Single {
     async copy(srcGraph, destGraph) {
         return this.client.falkordb.copy(srcGraph, destGraph);
     }
-    async quit() {
-        const reply = this.client.quit();
+    quit() {
+        return this.disconnect();
+    }
+    async disconnect() {
+        const reply = this.client.disconnect();
         return reply.then(() => { });
     }
     async getConnection() {

package/dist/src/falkordb.js

@@ -70,7 +70,7 @@ class FalkorDB extends events_1.EventEmitter {
      * Closes the client.
      */
     async close() {
-        return this.#client.quit();
+        return this.#client.disconnect();
     }
 }
 exports.default = FalkorDB;

package/package.json

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