dflockd-client 1.8.0 → 1.8.2

package/dist/client.d.cts

@@ -118,16 +118,24 @@ declare class DistributedLock {
     private closed;
     constructor(opts: DistributedLockOptions);
     private pickServer;
-    /** Acquire the lock. Returns `true` on success, `false` on timeout. */
-    acquire(): Promise<boolean>;
+    /**
+     * Acquire the lock. Returns `true` on success, `false` on timeout.
+     * @param opts.force - If `true`, silently close any existing connection before acquiring. Defaults to `false`, which throws if already connected.
+     */
+    acquire(opts?: {
+        force?: boolean;
+    }): Promise<boolean>;
     /** Release the lock and close the connection. */
     release(): Promise<void>;
     /**
      * Two-phase step 1: connect and join the FIFO queue.
      * Returns `"acquired"` (fast-path, lock is already held) or `"queued"`.
      * If acquired immediately, the renew loop starts automatically.
+     * @param opts.force - If `true`, silently close any existing connection before enqueuing. Defaults to `false`, which throws if already connected.
      */
-    enqueue(): Promise<"acquired" | "queued">;
+    enqueue(opts?: {
+        force?: boolean;
+    }): Promise<"acquired" | "queued">;
     /**
      * Two-phase step 2: block until the lock is granted.
      * Returns `true` if granted, `false` on timeout.
@@ -146,7 +154,7 @@ declare class DistributedLock {
      */
     withLock<T>(fn: () => T | Promise<T>): Promise<T>;
     /** Close the underlying socket (idempotent). */
-    close(): Promise<void>;
+    close(): void;
     private startRenew;
     private stopRenew;
 }
@@ -184,16 +192,24 @@ declare class DistributedSemaphore {
     private closed;
     constructor(opts: DistributedSemaphoreOptions);
     private pickServer;
-    /** Acquire a semaphore slot. Returns `true` on success, `false` on timeout. */
-    acquire(): Promise<boolean>;
+    /**
+     * Acquire a semaphore slot. Returns `true` on success, `false` on timeout.
+     * @param opts.force - If `true`, silently close any existing connection before acquiring. Defaults to `false`, which throws if already connected.
+     */
+    acquire(opts?: {
+        force?: boolean;
+    }): Promise<boolean>;
     /** Release the semaphore slot and close the connection. */
     release(): Promise<void>;
     /**
      * Two-phase step 1: connect and join the FIFO queue.
      * Returns `"acquired"` (fast-path, slot granted immediately) or `"queued"`.
      * If acquired immediately, the renew loop starts automatically.
+     * @param opts.force - If `true`, silently close any existing connection before enqueuing. Defaults to `false`, which throws if already connected.
      */
-    enqueue(): Promise<"acquired" | "queued">;
+    enqueue(opts?: {
+        force?: boolean;
+    }): Promise<"acquired" | "queued">;
     /**
      * Two-phase step 2: block until a semaphore slot is granted.
      * Returns `true` if granted, `false` on timeout.
@@ -212,7 +228,7 @@ declare class DistributedSemaphore {
      */
     withLock<T>(fn: () => T | Promise<T>): Promise<T>;
     /** Close the underlying socket (idempotent). */
-    close(): Promise<void>;
+    close(): void;
     private startRenew;
     private stopRenew;
 }

package/dist/client.d.ts

@@ -118,16 +118,24 @@ declare class DistributedLock {
     private closed;
     constructor(opts: DistributedLockOptions);
     private pickServer;
-    /** Acquire the lock. Returns `true` on success, `false` on timeout. */
-    acquire(): Promise<boolean>;
+    /**
+     * Acquire the lock. Returns `true` on success, `false` on timeout.
+     * @param opts.force - If `true`, silently close any existing connection before acquiring. Defaults to `false`, which throws if already connected.
+     */
+    acquire(opts?: {
+        force?: boolean;
+    }): Promise<boolean>;
     /** Release the lock and close the connection. */
     release(): Promise<void>;
     /**
      * Two-phase step 1: connect and join the FIFO queue.
      * Returns `"acquired"` (fast-path, lock is already held) or `"queued"`.
      * If acquired immediately, the renew loop starts automatically.
+     * @param opts.force - If `true`, silently close any existing connection before enqueuing. Defaults to `false`, which throws if already connected.
      */
-    enqueue(): Promise<"acquired" | "queued">;
+    enqueue(opts?: {
+        force?: boolean;
+    }): Promise<"acquired" | "queued">;
     /**
      * Two-phase step 2: block until the lock is granted.
      * Returns `true` if granted, `false` on timeout.
@@ -146,7 +154,7 @@ declare class DistributedLock {
      */
     withLock<T>(fn: () => T | Promise<T>): Promise<T>;
     /** Close the underlying socket (idempotent). */
-    close(): Promise<void>;
+    close(): void;
     private startRenew;
     private stopRenew;
 }
@@ -184,16 +192,24 @@ declare class DistributedSemaphore {
     private closed;
     constructor(opts: DistributedSemaphoreOptions);
     private pickServer;
-    /** Acquire a semaphore slot. Returns `true` on success, `false` on timeout. */
-    acquire(): Promise<boolean>;
+    /**
+     * Acquire a semaphore slot. Returns `true` on success, `false` on timeout.
+     * @param opts.force - If `true`, silently close any existing connection before acquiring. Defaults to `false`, which throws if already connected.
+     */
+    acquire(opts?: {
+        force?: boolean;
+    }): Promise<boolean>;
     /** Release the semaphore slot and close the connection. */
     release(): Promise<void>;
     /**
      * Two-phase step 1: connect and join the FIFO queue.
      * Returns `"acquired"` (fast-path, slot granted immediately) or `"queued"`.
      * If acquired immediately, the renew loop starts automatically.
+     * @param opts.force - If `true`, silently close any existing connection before enqueuing. Defaults to `false`, which throws if already connected.
      */
-    enqueue(): Promise<"acquired" | "queued">;
+    enqueue(opts?: {
+        force?: boolean;
+    }): Promise<"acquired" | "queued">;
     /**
      * Two-phase step 2: block until a semaphore slot is granted.
      * Returns `true` if granted, `false` on timeout.
@@ -212,7 +228,7 @@ declare class DistributedSemaphore {
      */
     withLock<T>(fn: () => T | Promise<T>): Promise<T>;
     /** Close the underlying socket (idempotent). */
-    close(): Promise<void>;
+    close(): void;
     private startRenew;
     private stopRenew;
 }

package/dist/client.js

@@ -24,6 +24,14 @@ var AuthError = class extends LockError {
 function encodeLines(...lines) {
   return Buffer.from(lines.map((l) => l + "\n").join(""), "utf-8");
 }
+function writeAll(sock, data) {
+  return new Promise((resolve, reject) => {
+    sock.write(data, (err) => {
+      if (err) reject(err);
+      else resolve();
+    });
+  });
+}
 var _readlineBuf = /* @__PURE__ */ new WeakMap();
 function readline(sock) {
   return new Promise((resolve, reject) => {
@@ -47,10 +55,12 @@ function readline(sock) {
     };
     const onError = (err) => {
       cleanup();
+      _readlineBuf.delete(sock);
       reject(err);
     };
     const onClose = () => {
       cleanup();
+      _readlineBuf.delete(sock);
       reject(new LockError("server closed connection"));
     };
     const cleanup = () => {
@@ -79,10 +89,11 @@ async function connect2(host, port, tlsOptions, auth) {
       s.on("error", reject);
     }
   });
+  sock.setNoDelay(true);
   sock.on("error", () => {
   });
   if (auth != null && auth !== "") {
-    sock.write(encodeLines("auth", "_", auth));
+    await writeAll(sock, encodeLines("auth", "_", auth));
     const resp = await readline(sock);
     if (resp === "ok") {
       return sock;
@@ -115,7 +126,7 @@ function stableHashShard(key, numServers) {
 }
 async function acquire(sock, key, acquireTimeoutS, leaseTtlS) {
   const arg = leaseTtlS == null ? String(acquireTimeoutS) : `${acquireTimeoutS} ${leaseTtlS}`;
-  sock.write(encodeLines("l", key, arg));
+  await writeAll(sock, encodeLines("l", key, arg));
   const resp = await readline(sock);
   if (resp === "timeout") {
     throw new AcquireTimeoutError(key);
@@ -124,18 +135,15 @@ async function acquire(sock, key, acquireTimeoutS, leaseTtlS) {
     throw new LockError(`acquire failed: '${resp}'`);
   }
   const parts = resp.split(" ");
-  if (parts.length < 2) {
-    throw new LockError(`bad ok response: '${resp}'`);
-  }
   const token = parts[1];
   const lease = parts.length >= 3 ? parseInt(parts[2], 10) : 30;
   return { token, lease };
 }
 async function renew(sock, key, token, leaseTtlS) {
   const arg = leaseTtlS == null ? token : `${token} ${leaseTtlS}`;
-  sock.write(encodeLines("n", key, arg));
+  await writeAll(sock, encodeLines("n", key, arg));
   const resp = await readline(sock);
-  if (!resp.startsWith("ok")) {
+  if (resp !== "ok" && !resp.startsWith("ok ")) {
     throw new LockError(`renew failed: '${resp}'`);
   }
   const parts = resp.split(" ");
@@ -146,12 +154,12 @@ async function renew(sock, key, token, leaseTtlS) {
 }
 async function enqueue(sock, key, leaseTtlS) {
   const arg = leaseTtlS == null ? "" : String(leaseTtlS);
-  sock.write(encodeLines("e", key, arg));
+  await writeAll(sock, encodeLines("e", key, arg));
   const resp = await readline(sock);
   if (resp.startsWith("acquired ")) {
     const parts = resp.split(" ");
     const token = parts[1];
-    const lease = parts.length >= 3 ? parseInt(parts[2], 10) : 33;
+    const lease = parts.length >= 3 ? parseInt(parts[2], 10) : 30;
     return { status: "acquired", token, lease };
   }
   if (resp === "queued") {
@@ -160,7 +168,7 @@ async function enqueue(sock, key, leaseTtlS) {
   throw new LockError(`enqueue failed: '${resp}'`);
 }
 async function waitForLock(sock, key, waitTimeoutS) {
-  sock.write(encodeLines("w", key, String(waitTimeoutS)));
+  await writeAll(sock, encodeLines("w", key, String(waitTimeoutS)));
   const resp = await readline(sock);
   if (resp === "timeout") {
     throw new AcquireTimeoutError(key);
@@ -170,11 +178,11 @@ async function waitForLock(sock, key, waitTimeoutS) {
   }
   const parts = resp.split(" ");
   const token = parts[1];
-  const lease = parts.length >= 3 ? parseInt(parts[2], 10) : 33;
+  const lease = parts.length >= 3 ? parseInt(parts[2], 10) : 30;
   return { token, lease };
 }
 async function release(sock, key, token) {
-  sock.write(encodeLines("r", key, token));
+  await writeAll(sock, encodeLines("r", key, token));
   const resp = await readline(sock);
   if (resp !== "ok") {
     throw new LockError(`release failed: '${resp}'`);
@@ -182,7 +190,7 @@ async function release(sock, key, token) {
 }
 async function semAcquire(sock, key, acquireTimeoutS, limit, leaseTtlS) {
   const arg = leaseTtlS == null ? `${acquireTimeoutS} ${limit}` : `${acquireTimeoutS} ${limit} ${leaseTtlS}`;
-  sock.write(encodeLines("sl", key, arg));
+  await writeAll(sock, encodeLines("sl", key, arg));
   const resp = await readline(sock);
   if (resp === "timeout") {
     throw new AcquireTimeoutError(key);
@@ -191,18 +199,15 @@ async function semAcquire(sock, key, acquireTimeoutS, limit, leaseTtlS) {
     throw new LockError(`sem_acquire failed: '${resp}'`);
   }
   const parts = resp.split(" ");
-  if (parts.length < 2) {
-    throw new LockError(`bad ok response: '${resp}'`);
-  }
   const token = parts[1];
   const lease = parts.length >= 3 ? parseInt(parts[2], 10) : 30;
   return { token, lease };
 }
 async function semRenew(sock, key, token, leaseTtlS) {
   const arg = leaseTtlS == null ? token : `${token} ${leaseTtlS}`;
-  sock.write(encodeLines("sn", key, arg));
+  await writeAll(sock, encodeLines("sn", key, arg));
   const resp = await readline(sock);
-  if (!resp.startsWith("ok")) {
+  if (resp !== "ok" && !resp.startsWith("ok ")) {
     throw new LockError(`sem_renew failed: '${resp}'`);
   }
   const parts = resp.split(" ");
@@ -213,7 +218,7 @@ async function semRenew(sock, key, token, leaseTtlS) {
 }
 async function semEnqueue(sock, key, limit, leaseTtlS) {
   const arg = leaseTtlS == null ? String(limit) : `${limit} ${leaseTtlS}`;
-  sock.write(encodeLines("se", key, arg));
+  await writeAll(sock, encodeLines("se", key, arg));
   const resp = await readline(sock);
   if (resp.startsWith("acquired ")) {
     const parts = resp.split(" ");
@@ -227,7 +232,7 @@ async function semEnqueue(sock, key, limit, leaseTtlS) {
   throw new LockError(`sem_enqueue failed: '${resp}'`);
 }
 async function semWaitForLock(sock, key, waitTimeoutS) {
-  sock.write(encodeLines("sw", key, String(waitTimeoutS)));
+  await writeAll(sock, encodeLines("sw", key, String(waitTimeoutS)));
   const resp = await readline(sock);
   if (resp === "timeout") {
     throw new AcquireTimeoutError(key);
@@ -241,20 +246,24 @@ async function semWaitForLock(sock, key, waitTimeoutS) {
   return { token, lease };
 }
 async function semRelease(sock, key, token) {
-  sock.write(encodeLines("sr", key, token));
+  await writeAll(sock, encodeLines("sr", key, token));
   const resp = await readline(sock);
   if (resp !== "ok") {
     throw new LockError(`sem_release failed: '${resp}'`);
   }
 }
 async function statsProto(sock) {
-  sock.write(encodeLines("stats", "_", ""));
+  await writeAll(sock, encodeLines("stats", "_", ""));
   const resp = await readline(sock);
   if (!resp.startsWith("ok ")) {
     throw new LockError(`stats failed: '${resp}'`);
   }
   const json = resp.slice(3);
-  return JSON.parse(json);
+  try {
+    return JSON.parse(json);
+  } catch {
+    throw new LockError(`stats: malformed JSON response: '${json}'`);
+  }
 }
 async function stats(options) {
   const host = options?.host ?? DEFAULT_HOST;
@@ -292,7 +301,7 @@ var DistributedLock = class {
       if (opts.servers.length === 0) {
         throw new LockError("servers list must not be empty");
       }
-      this.servers = opts.servers;
+      this.servers = [...opts.servers];
     } else {
       this.servers = [[opts.host ?? DEFAULT_HOST, opts.port ?? DEFAULT_PORT]];
     }
@@ -308,9 +317,17 @@ var DistributedLock = class {
     }
     return this.servers[idx];
   }
-  /** Acquire the lock. Returns `true` on success, `false` on timeout. */
-  async acquire() {
-    await this.close();
+  /**
+   * Acquire the lock. Returns `true` on success, `false` on timeout.
+   * @param opts.force - If `true`, silently close any existing connection before acquiring. Defaults to `false`, which throws if already connected.
+   */
+  async acquire(opts) {
+    if (this.sock && !this.closed) {
+      if (!opts?.force) {
+        throw new LockError("already connected; call release() or close() first, or pass { force: true }");
+      }
+      this.close();
+    }
     this.closed = false;
     const [host, port] = this.pickServer();
     this.sock = await connect2(host, port, this.tls, this.auth);
@@ -324,7 +341,7 @@ var DistributedLock = class {
       this.token = result.token;
       this.lease = result.lease;
     } catch (err) {
-      await this.close();
+      this.close();
       if (err instanceof AcquireTimeoutError) return false;
       throw err;
     }
@@ -339,16 +356,22 @@ var DistributedLock = class {
         await release(this.sock, this.key, this.token);
       }
     } finally {
-      await this.close();
+      this.close();
     }
   }
   /**
    * Two-phase step 1: connect and join the FIFO queue.
    * Returns `"acquired"` (fast-path, lock is already held) or `"queued"`.
    * If acquired immediately, the renew loop starts automatically.
+   * @param opts.force - If `true`, silently close any existing connection before enqueuing. Defaults to `false`, which throws if already connected.
    */
-  async enqueue() {
-    await this.close();
+  async enqueue(opts) {
+    if (this.sock && !this.closed) {
+      if (!opts?.force) {
+        throw new LockError("already connected; call release() or close() first, or pass { force: true }");
+      }
+      this.close();
+    }
     this.closed = false;
     const [host, port] = this.pickServer();
     this.sock = await connect2(host, port, this.tls, this.auth);
@@ -361,7 +384,7 @@ var DistributedLock = class {
       }
       return result.status;
     } catch (err) {
-      await this.close();
+      this.close();
       throw err;
     }
   }
@@ -383,7 +406,7 @@ var DistributedLock = class {
       this.token = result.token;
       this.lease = result.lease;
     } catch (err) {
-      await this.close();
+      this.close();
       if (err instanceof AcquireTimeoutError) return false;
       throw err;
     }
@@ -412,7 +435,7 @@ var DistributedLock = class {
     }
   }
   /** Close the underlying socket (idempotent). */
-  async close() {
+  close() {
     if (this.closed) return;
     this.closed = true;
     this.stopRenew();
@@ -424,21 +447,26 @@ var DistributedLock = class {
   }
   // -- internals --
   startRenew() {
-    const interval = Math.max(1, this.lease * this.renewRatio) * 1e3;
     const loop = async () => {
-      if (!this.sock || !this.token) return;
+      const savedToken = this.token;
+      if (!this.sock || !savedToken) return;
+      const start = Date.now();
       try {
-        await renew(this.sock, this.key, this.token, this.leaseTtlS);
+        this.lease = await renew(this.sock, this.key, savedToken, this.leaseTtlS);
       } catch {
-        const lostToken = this.token;
-        this.token = null;
-        if (this.onLockLost) {
-          this.onLockLost(this.key, lostToken);
+        if (this.token === savedToken) {
+          this.token = null;
+          if (this.onLockLost) {
+            this.onLockLost(this.key, savedToken);
+          }
         }
         return;
       }
-      this.renewTimer = setTimeout(loop, interval);
+      const elapsed = Date.now() - start;
+      const interval2 = Math.max(1, this.lease * this.renewRatio) * 1e3;
+      this.renewTimer = setTimeout(loop, Math.max(0, interval2 - elapsed));
     };
+    const interval = Math.max(1, this.lease * this.renewRatio) * 1e3;
     this.renewTimer = setTimeout(loop, interval);
   }
   stopRenew() {
@@ -476,7 +504,7 @@ var DistributedSemaphore = class {
       if (opts.servers.length === 0) {
         throw new LockError("servers list must not be empty");
       }
-      this.servers = opts.servers;
+      this.servers = [...opts.servers];
     } else {
       this.servers = [[opts.host ?? DEFAULT_HOST, opts.port ?? DEFAULT_PORT]];
     }
@@ -492,9 +520,17 @@ var DistributedSemaphore = class {
     }
     return this.servers[idx];
   }
-  /** Acquire a semaphore slot. Returns `true` on success, `false` on timeout. */
-  async acquire() {
-    await this.close();
+  /**
+   * Acquire a semaphore slot. Returns `true` on success, `false` on timeout.
+   * @param opts.force - If `true`, silently close any existing connection before acquiring. Defaults to `false`, which throws if already connected.
+   */
+  async acquire(opts) {
+    if (this.sock && !this.closed) {
+      if (!opts?.force) {
+        throw new LockError("already connected; call release() or close() first, or pass { force: true }");
+      }
+      this.close();
+    }
     this.closed = false;
     const [host, port] = this.pickServer();
     this.sock = await connect2(host, port, this.tls, this.auth);
@@ -509,7 +545,7 @@ var DistributedSemaphore = class {
       this.token = result.token;
       this.lease = result.lease;
     } catch (err) {
-      await this.close();
+      this.close();
       if (err instanceof AcquireTimeoutError) return false;
       throw err;
     }
@@ -524,16 +560,22 @@ var DistributedSemaphore = class {
         await semRelease(this.sock, this.key, this.token);
       }
     } finally {
-      await this.close();
+      this.close();
     }
   }
   /**
    * Two-phase step 1: connect and join the FIFO queue.
    * Returns `"acquired"` (fast-path, slot granted immediately) or `"queued"`.
    * If acquired immediately, the renew loop starts automatically.
+   * @param opts.force - If `true`, silently close any existing connection before enqueuing. Defaults to `false`, which throws if already connected.
    */
-  async enqueue() {
-    await this.close();
+  async enqueue(opts) {
+    if (this.sock && !this.closed) {
+      if (!opts?.force) {
+        throw new LockError("already connected; call release() or close() first, or pass { force: true }");
+      }
+      this.close();
+    }
     this.closed = false;
     const [host, port] = this.pickServer();
     this.sock = await connect2(host, port, this.tls, this.auth);
@@ -546,7 +588,7 @@ var DistributedSemaphore = class {
       }
       return result.status;
     } catch (err) {
-      await this.close();
+      this.close();
       throw err;
     }
   }
@@ -568,7 +610,7 @@ var DistributedSemaphore = class {
       this.token = result.token;
       this.lease = result.lease;
     } catch (err) {
-      await this.close();
+      this.close();
       if (err instanceof AcquireTimeoutError) return false;
       throw err;
     }
@@ -597,7 +639,7 @@ var DistributedSemaphore = class {
     }
   }
   /** Close the underlying socket (idempotent). */
-  async close() {
+  close() {
     if (this.closed) return;
     this.closed = true;
     this.stopRenew();
@@ -609,21 +651,26 @@ var DistributedSemaphore = class {
   }
   // -- internals --
   startRenew() {
-    const interval = Math.max(1, this.lease * this.renewRatio) * 1e3;
     const loop = async () => {
-      if (!this.sock || !this.token) return;
+      const savedToken = this.token;
+      if (!this.sock || !savedToken) return;
+      const start = Date.now();
       try {
-        await semRenew(this.sock, this.key, this.token, this.leaseTtlS);
+        this.lease = await semRenew(this.sock, this.key, savedToken, this.leaseTtlS);
       } catch {
-        const lostToken = this.token;
-        this.token = null;
-        if (this.onLockLost) {
-          this.onLockLost(this.key, lostToken);
+        if (this.token === savedToken) {
+          this.token = null;
+          if (this.onLockLost) {
+            this.onLockLost(this.key, savedToken);
+          }
         }
         return;
       }
-      this.renewTimer = setTimeout(loop, interval);
+      const elapsed = Date.now() - start;
+      const interval2 = Math.max(1, this.lease * this.renewRatio) * 1e3;
+      this.renewTimer = setTimeout(loop, Math.max(0, interval2 - elapsed));
     };
+    const interval = Math.max(1, this.lease * this.renewRatio) * 1e3;
     this.renewTimer = setTimeout(loop, interval);
   }
   stopRenew() {