mongo-locks 3.0.1 → 3.0.2

package/README.md

@@ -15,7 +15,7 @@ const lockManager = new LockManager(client.db().collection("mongo-locks"));
 async function doStuff() {
   await using lock = lockManager.lock("unique string key");
 
-  if (!lock.locked) {
+  if (!lock) {
     console.log("Lock already taken");
     return;
   }
@@ -34,7 +34,7 @@ If you don't want to use the `using` syntax, you can do it this way:
 async function doStuff() {
   const lock = await lockManager.lock("unique string key");
 
-  if (!lock.locked) {
+  if (!lock) {
     console.log("Lock already taken");
     return;
   }

package/dist/index.js

@@ -22,11 +22,11 @@ const makeKey = (key) => {
     return Array.isArray(key) ? { _key_array: key } : key;
 };
 class Lock {
-    constructor(_id, action, collection, locked) {
+    constructor(_id, action, collection) {
         this._id = _id;
         this.action = action;
         this.collection = collection;
-        this.locked = locked;
+        this.locked = true;
         if (this.locked) {
             (() => __awaiter(this, void 0, void 0, function* () {
                 while (this.locked) {
@@ -48,6 +48,7 @@ class Lock {
             if (!this.locked) {
                 return false;
             }
+            this.locked = false;
             const result = yield this.collection.deleteOne({ _id: this._id });
             return result.deletedCount === 1;
         });
@@ -103,11 +104,11 @@ class LockManager {
                     refreshedAt: new Date(),
                     expiresAt: new Date(Date.now() + 60000),
                 });
-                return new Lock(id, lockId, this.collection, true);
+                return new Lock(id, lockId, this.collection);
             }
             catch (err) {
                 if (err instanceof Error && "code" in err && err.code === 11000) {
-                    return new Lock(id, lockId, this.collection, false);
+                    return null;
                 }
                 throw err;
             }

package/index.ts

@@ -20,12 +20,7 @@ interface LockModel {
 }
 
 class Lock {
-  constructor(
-    public _id: ObjectId,
-    public action: unknown,
-    public collection: Collection<LockModel>,
-    public locked: boolean
-  ) {
+  constructor(public _id: ObjectId, public action: unknown, public collection: Collection<LockModel>) {
     if (this.locked) {
       (async () => {
         while (this.locked) {
@@ -38,6 +33,8 @@ class Lock {
     }
   }
 
+  locked = true;
+
   /**
    * Instead of calling `this.free` directly you can use the `using` syntax
    *
@@ -47,6 +44,7 @@ class Lock {
     if (!this.locked) {
       return false;
     }
+    this.locked = false;
 
     const result = await this.collection.deleteOne({ _id: this._id });
     return result.deletedCount === 1;
@@ -100,7 +98,7 @@ export class LockManager {
    *
    * @returns a function that when called will release the lock
    */
-  async lock(key: unknown): Promise<Lock> {
+  async lock(key: unknown): Promise<Lock | null> {
     const lockId = makeKey(key);
     const id = new ObjectId();
 
@@ -113,10 +111,10 @@ export class LockManager {
         expiresAt: new Date(Date.now() + 60_000),
       });
 
-      return new Lock(id, lockId, this.collection, true);
+      return new Lock(id, lockId, this.collection);
     } catch (err) {
       if (err instanceof Error && "code" in err && err.code === 11000) {
-        return new Lock(id, lockId, this.collection, false);
+        return null;
       }
 
       throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongo-locks",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Simple and bountiful locks to avoid doing the same operation multiple times",
   "main": "dist/index.js",
   "scripts": {