@daiso-tech/core 0.38.0 → 0.40.0

package/dist/lock/implementations/adapters/memory-lock-adapter/memory-lock-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/memory-lock-adapter/memory-lock-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAQH;;;;;;GAMG;AACH,MAAM,OAAO,iBAAiB;IAsBG;IArBZ,UAAU,GAAG,IAAI,GAAG,EAGlC,CAAC;IAEJ;;;;;;;;;;;;;;;OAeG;IACH,YAA6B,MAAM,IAAI,GAAG,EAAqB;QAAlC,QAAG,GAAH,GAAG,CAA+B;IAAG,CAAC;IAEnE,4DAA4D;IAC5D,KAAK,CAAC,OAAO,CACT,GAAW,EACX,KAAa,EACb,GAAoB;QAEpB,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;gBACd,KAAK;gBACL,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI;aACvC,CAAC,CAAC;QACP,CAAC;QACD,IAAI,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CACf,GAAG,EACH,UAAU,CAAC,GAAG,EAAE;gBACZ,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACrB,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC,CAC3B,CAAC;QACN,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,4DAA4D;IAC5D,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,4DAA4D;IAC5D,KAAK,CAAC,YAAY,CAAC,GAAW;QAC1B,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,4DAA4D;IAC5D,KAAK,CAAC,OAAO,CACT,GAAW,EACX,KAAa,EACb,IAAc;QAEd,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE;YACd,GAAG,IAAI;YACP,UAAU,EAAE,IAAI,CAAC,SAAS,EAAE;SAC/B,CAAC,CAAC;QACH,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,CAAC,GAAG,CACf,GAAG,EACH,UAAU,CAAC,GAAG,EAAE;YACZ,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAC5B,CAAC;QACF,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
+{"version":3,"file":"memory-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/memory-lock-adapter/memory-lock-adapter.ts"],"names":[],"mappings":"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"}

package/dist/lock/implementations/adapters/mongodb-lock-adapter/mongodb-lock-adapter.d.ts

@@ -1,9 +1,11 @@
 /**
  * @module Lock
  */
-import { type IDeinitizable, type IInitizable, type IPrunable } from "../../../../utilities/_module-exports.js";
-import type { IDatabaseLockAdapter, ILockData } from "../../../../lock/contracts/_module-exports.js";
+import type { TimeSpan } from "../../../../utilities/_module-exports.js";
+import { type IDeinitizable, type IInitizable } from "../../../../utilities/_module-exports.js";
+import { type ILockAdapter, type LockRefreshResult } from "../../../../lock/contracts/_module-exports.js";
 import type { CollectionOptions, Db } from "mongodb";
+import type { ObjectId } from "mongodb";
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
@@ -12,20 +14,31 @@ import type { CollectionOptions, Db } from "mongodb";
 export type MongodbLockAdapterSettings = {
     database: Db;
     /**
-     * @default {"lock"}
+     * @default "lock"
      */
     collectionName?: string;
     collectionSettings?: CollectionOptions;
 };
 /**
- * To utilize the `MongodbLockAdapter`, you must install the `"mongodb"` package.
+ *
+ * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
+ * @group Adapters
+ */
+export type MongodbLockDocument = {
+    _id: ObjectId;
+    key: string;
+    owner: string;
+    expiration: Date | null;
+};
+/**
+ * To utilize the `MongodbLockAdapter`, you must install the [`"mongodb"`](https://www.npmjs.com/package/mongodb) package.
  *
  * Note in order to use `MongodbLockAdapter` correctly, ensure you use a single, consistent database across all server instances.
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
  * @group Adapters
  */
-export declare class MongodbLockAdapter implements IDatabaseLockAdapter, IDeinitizable, IInitizable, IPrunable {
+export declare class MongodbLockAdapter implements ILockAdapter, IDeinitizable, IInitizable {
     private readonly database;
     private readonly collection;
     private readonly collectionName;
@@ -44,8 +57,7 @@ export declare class MongodbLockAdapter implements IDatabaseLockAdapter, IDeinit
      * await lockAdapter.init()
      * ```
      */
-    constructor({ collectionName, collectionSettings, database, }: MongodbLockAdapterSettings);
-    removeAllExpired(): Promise<void>;
+    constructor(settings: MongodbLockAdapterSettings);
     /**
      * Creates all related indexes.
      * Note the `init` method needs to be called before using the adapter.
@@ -56,9 +68,8 @@ export declare class MongodbLockAdapter implements IDatabaseLockAdapter, IDeinit
      * Note all lock data will be removed.
      */
     deInit(): Promise<void>;
-    insert(key: string, owner: string, expiration: Date | null): Promise<void>;
-    update(key: string, owner: string, expiration: Date | null): Promise<number>;
-    remove(key: string, owner: string | null): Promise<void>;
-    refresh(key: string, owner: string, expiration: Date): Promise<number>;
-    find(key: string): Promise<ILockData | null>;
+    acquire(key: string, owner: string, ttl: TimeSpan | null): Promise<boolean>;
+    release(key: string, owner: string): Promise<boolean>;
+    forceRelease(key: string): Promise<boolean>;
+    refresh(key: string, owner: string, ttl: TimeSpan): Promise<LockRefreshResult>;
 }

package/dist/lock/implementations/adapters/mongodb-lock-adapter/mongodb-lock-adapter.js

@@ -2,10 +2,9 @@
  * @module Lock
  */
 import {} from "../../../../utilities/_module-exports.js";
-import { UnexpectedLockError } from "../../../../lock/contracts/_module-exports.js";
-import { ObjectId } from "mongodb";
+import { LOCK_REFRESH_RESULT, } from "../../../../lock/contracts/_module-exports.js";
 /**
- * To utilize the `MongodbLockAdapter`, you must install the `"mongodb"` package.
+ * To utilize the `MongodbLockAdapter`, you must install the [`"mongodb"`](https://www.npmjs.com/package/mongodb) package.
  *
  * Note in order to use `MongodbLockAdapter` correctly, ensure you use a single, consistent database across all server instances.
  *
@@ -31,126 +30,192 @@ export class MongodbLockAdapter {
      * await lockAdapter.init()
      * ```
      */
-    constructor({ collectionName = "lock", collectionSettings, database, }) {
+    constructor(settings) {
+        const { collectionName = "lock", collectionSettings, database, } = settings;
         this.collectionName = collectionName;
         this.database = database;
         this.collection = database.collection(collectionName, collectionSettings);
     }
-    async removeAllExpired() {
-        await this.collection.deleteMany({
-            expiresAt: {
-                $lte: new Date(),
-            },
-        });
-    }
     /**
      * Creates all related indexes.
      * Note the `init` method needs to be called before using the adapter.
      */
     async init() {
-        await this.collection.createIndex({
-            key: 1,
-        }, {
-            unique: true,
-        });
-        await this.collection.createIndex("expiresAt", {
-            expireAfterSeconds: 0,
-        });
+        // Should throw if the index already exists thats why the try catch is used.
+        try {
+            await this.collection.createIndex({
+                key: 1,
+            }, {
+                unique: true,
+            });
+        }
+        catch {
+            /* EMPTY */
+        }
+        // Should throw if the index already exists thats why the try catch is used.
+        try {
+            await this.collection.createIndex("expiration", {
+                expireAfterSeconds: 0,
+            });
+        }
+        catch {
+            /* EMPTY */
+        }
     }
     /**
      * Removes the collection where the lock keys are stored and all it's related indexes.
      * Note all lock data will be removed.
      */
     async deInit() {
-        await this.collection.dropIndexes();
-        await this.database.dropCollection(this.collectionName);
-    }
-    async insert(key, owner, expiration) {
-        const insertResult = await this.collection.insertOne({
-            _id: new ObjectId(),
-            key,
-            owner,
-            expiresAt: expiration,
-        });
-        if (!insertResult.acknowledged) {
-            throw new UnexpectedLockError("Mongodb insertion was not acknowledged");
+        // Should throw if the collection already does not exists thats why the try catch is used.
+        try {
+            await this.collection.dropIndexes();
+        }
+        catch {
+            /* EMPTY */
+        }
+        // Should throw if the collection already does not exists thats why the try catch is used.
+        try {
+            await this.database.dropCollection(this.collectionName);
+        }
+        catch {
+            /* EMPTY */
         }
     }
-    async update(key, owner, expiration) {
-        const updateResult = await this.collection.updateOne({
-            key,
+    async acquire(key, owner, ttl) {
+        const expiration = ttl?.toEndDate() ?? null;
+        const isExpiredQuery = {
             $and: [
                 {
-                    expiresAt: {
-                        $ne: null,
-                    },
+                    $ne: ["$expiration", null],
                 },
                 {
-                    expiresAt: {
-                        $lte: new Date(),
-                    },
+                    $lte: ["$expiration", new Date()],
                 },
             ],
-        }, {
-            $set: {
-                owner,
-                expiresAt: expiration,
+        };
+        const lockData = await this.collection.findOneAndUpdate({
+            key,
+        }, [
+            {
+                $set: {
+                    key,
+                    owner: {
+                        $ifNull: ["$owner", owner],
+                    },
+                    expiration: {
+                        $ifNull: ["$expiration", expiration],
+                    },
+                },
+            },
+            {
+                $set: {
+                    owner: {
+                        $cond: {
+                            if: isExpiredQuery,
+                            then: owner,
+                            else: "$owner",
+                        },
+                    },
+                    expiration: {
+                        $cond: {
+                            if: isExpiredQuery,
+                            then: expiration,
+                            else: "$expiration",
+                        },
+                    },
+                },
             },
+        ], {
+            upsert: true,
         });
-        if (!updateResult.acknowledged) {
-            throw new UnexpectedLockError("Mongodb update was not acknowledged");
+        if (lockData === null) {
+            return true;
         }
-        return updateResult.modifiedCount; // > 0;
-    }
-    async remove(key, owner) {
-        if (owner === null) {
-            const deleteResult = await this.collection.deleteOne({
-                key,
-            });
-            if (!deleteResult.acknowledged) {
-                throw new UnexpectedLockError("Mongodb deletion was not acknowledged");
-            }
-            return;
+        if (lockData.expiration === null) {
+            return false;
         }
-        const deleteResult = await this.collection.deleteOne({
+        return lockData.expiration <= new Date();
+    }
+    async release(key, owner) {
+        const isUnexpirableQuery = {
+            expiration: {
+                $eq: null,
+            },
+        };
+        const isUnexpiredQuery = {
+            expiration: {
+                $gt: new Date(),
+            },
+        };
+        const lockData = await this.collection.findOneAndDelete({
             key,
             owner,
+            $or: [isUnexpirableQuery, isUnexpiredQuery],
         });
-        if (!deleteResult.acknowledged) {
-            throw new UnexpectedLockError("Mongodb deletion was not acknowledged");
+        if (lockData === null) {
+            return false;
         }
+        const { expiration } = lockData;
+        const hasNoExpiration = expiration === null;
+        if (hasNoExpiration) {
+            return true;
+        }
+        const { owner: currentOwner } = lockData;
+        const isNotExpired = expiration > new Date();
+        const isCurrentOwner = owner === currentOwner;
+        return isNotExpired && isCurrentOwner;
     }
-    async refresh(key, owner, expiration) {
-        const updateResult = await this.collection.updateOne({
-            key,
-            owner,
-        }, {
-            $set: {
-                expiresAt: expiration,
-            },
-        });
-        if (!updateResult.acknowledged) {
-            throw new UnexpectedLockError("Mongodb update was not acknowledged");
+    async forceRelease(key) {
+        const lockData = await this.collection.findOneAndDelete({ key });
+        if (lockData === null) {
+            return false;
+        }
+        if (lockData.expiration === null) {
+            return true;
         }
-        return updateResult.modifiedCount; // > 0;
+        const isNotExpired = lockData.expiration >= new Date();
+        return isNotExpired;
     }
-    async find(key) {
-        const document = await this.collection.findOne({
-            key: key,
-        }, {
-            projection: {
-                _id: 0,
-                owner: 1,
-                expiresAt: 1,
+    async refresh(key, owner, ttl) {
+        const isUnexpiredQuery = {
+            $and: [
+                {
+                    $ne: ["$expiration", null],
+                },
+                {
+                    $gt: ["$expiration", new Date()],
+                },
+            ],
+        };
+        const lockData = await this.collection.findOneAndUpdate({
+            key,
+        }, [
+            {
+                $set: {
+                    expiration: {
+                        $cond: {
+                            if: isUnexpiredQuery,
+                            then: ttl.toEndDate(),
+                            else: "$expiration",
+                        },
+                    },
+                },
             },
-        });
-        if (document === null) {
-            return null;
+        ]);
+        if (lockData === null) {
+            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
         }
-        return {
-            owner: document.owner,
-            expiration: document.expiresAt,
-        };
+        if (lockData.owner !== owner) {
+            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
+        }
+        if (lockData.expiration === null) {
+            return LOCK_REFRESH_RESULT.UNEXPIRABLE_KEY;
+        }
+        if (lockData.expiration <= new Date()) {
+            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
+        }
+        return LOCK_REFRESH_RESULT.REFRESHED;
     }
 }
 //# sourceMappingURL=mongodb-lock-adapter.js.map

package/dist/lock/implementations/adapters/mongodb-lock-adapter/mongodb-lock-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"mongodb-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/mongodb-lock-adapter/mongodb-lock-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mongodb-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/mongodb-lock-adapter/mongodb-lock-adapter.ts"],"names":[],"mappings":"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"}

package/dist/lock/implementations/adapters/no-op-lock-adapter/no-op-lock-adapter.d.ts

@@ -2,7 +2,7 @@
  * @module Lock
  */
 import type { TimeSpan } from "../../../../utilities/_module-exports.js";
-import type { ILockAdapter } from "../../../../lock/contracts/_module-exports.js";
+import { type ILockAdapter, type LockRefreshResult } from "../../../../lock/contracts/_module-exports.js";
 /**
  * This `NoOpLockAdapter` will do nothing and is used for easily mocking {@link ILockProvider | `ILockProvider`} for testing.
  *
@@ -10,8 +10,8 @@ import type { ILockAdapter } from "../../../../lock/contracts/_module-exports.js
  * @group Adapters
  */
 export declare class NoOpLockAdapter implements ILockAdapter {
-    acquire(_key: string, _owner: string, _ttl: TimeSpan | null): PromiseLike<boolean>;
-    release(_key: string, _owner: string): PromiseLike<boolean>;
-    forceRelease(_key: string): PromiseLike<void>;
-    refresh(_key: string, _owner: string, _ttl: TimeSpan): PromiseLike<boolean>;
+    acquire(_key: string, _owner: string, _ttl: TimeSpan | null): Promise<boolean>;
+    release(_key: string, _owner: string): Promise<boolean>;
+    forceRelease(_key: string): Promise<boolean>;
+    refresh(_key: string, _owner: string, _ttl: TimeSpan): Promise<LockRefreshResult>;
 }

package/dist/lock/implementations/adapters/no-op-lock-adapter/no-op-lock-adapter.js

@@ -1,6 +1,7 @@
 /**
  * @module Lock
  */
+import { LOCK_REFRESH_RESULT, } from "../../../../lock/contracts/_module-exports.js";
 /**
  * This `NoOpLockAdapter` will do nothing and is used for easily mocking {@link ILockProvider | `ILockProvider`} for testing.
  *
@@ -15,10 +16,10 @@ export class NoOpLockAdapter {
         return Promise.resolve(true);
     }
     forceRelease(_key) {
-        return Promise.resolve();
+        return Promise.resolve(true);
     }
     refresh(_key, _owner, _ttl) {
-        return Promise.resolve(true);
+        return Promise.resolve(LOCK_REFRESH_RESULT.REFRESHED);
     }
 }
 //# sourceMappingURL=no-op-lock-adapter.js.map

package/dist/lock/implementations/adapters/no-op-lock-adapter/no-op-lock-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"no-op-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/no-op-lock-adapter/no-op-lock-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAOH;;;;;GAKG;AACH,MAAM,OAAO,eAAe;IACxB,OAAO,CACH,IAAY,EACZ,MAAc,EACd,IAAqB;QAErB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,MAAc;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,IAAY;QACrB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,CACH,IAAY,EACZ,MAAc,EACd,IAAc;QAEd,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;CACJ"}
+{"version":3,"file":"no-op-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/no-op-lock-adapter/no-op-lock-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACH,mBAAmB,GAGtB,MAAM,qCAAqC,CAAC;AAI7C;;;;;GAKG;AACH,MAAM,OAAO,eAAe;IACxB,OAAO,CACH,IAAY,EACZ,MAAc,EACd,IAAqB;QAErB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,MAAc;QAChC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,IAAY;QACrB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,OAAO,CACH,IAAY,EACZ,MAAc,EACd,IAAc;QAEd,OAAO,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACJ"}

package/dist/lock/implementations/adapters/redis-lock-adapter/redis-lock-adapter.d.ts

@@ -2,18 +2,18 @@
  * @module Lock
  */
 import type { TimeSpan } from "../../../../utilities/_module-exports.js";
-import type { ILockAdapter } from "../../../../lock/contracts/_module-exports.js";
+import { LOCK_REFRESH_RESULT, type ILockAdapter, type LockRefreshResult } from "../../../../lock/contracts/_module-exports.js";
 import type { Redis } from "ioredis";
 import type { Result } from "ioredis";
 declare module "ioredis" {
     interface RedisCommander<Context> {
-        daiso_lock_acquire(key: string, owner: string, ttl: string): Result<number, Context>;
+        daiso_lock_acquire(key: string, owner: string, expiration: string): Result<number, Context>;
         daiso_lock_release(key: string, owner: string): Result<number, Context>;
-        daiso_lock_refresh(key: string, owner: string, ttl: string): Result<number, Context>;
+        daiso_lock_refresh(key: string, owner: string, expiration: string, REFRESHED: typeof LOCK_REFRESH_RESULT.REFRESHED, UNOWNED_REFRESH: typeof LOCK_REFRESH_RESULT.UNOWNED_REFRESH, UNEXPIRABLE_KEY: typeof LOCK_REFRESH_RESULT.UNEXPIRABLE_KEY): Result<LockRefreshResult, Context>;
     }
 }
 /**
- * To utilize the `RedisLockAdapter`, you must install the `"ioredis"` package.
+ * To utilize the `RedisLockAdapter`, you must install the [`"ioredis"`](https://www.npmjs.com/package/ioredis) package.
  *
  * Note in order to use `RedisLockAdapter` correctly, ensure you use a single, consistent database across all server instances.
  *
@@ -38,6 +38,6 @@ export declare class RedisLockAdapter implements ILockAdapter {
     private initRefreshComand;
     acquire(key: string, owner: string, ttl: TimeSpan | null): Promise<boolean>;
     release(key: string, owner: string): Promise<boolean>;
-    forceRelease(key: string): Promise<void>;
-    refresh(key: string, owner: string, ttl: TimeSpan): Promise<boolean>;
+    forceRelease(key: string): Promise<boolean>;
+    refresh(key: string, owner: string, ttl: TimeSpan): Promise<LockRefreshResult>;
 }

package/dist/lock/implementations/adapters/redis-lock-adapter/redis-lock-adapter.js

@@ -1,8 +1,9 @@
 /**
  * @module Lock
  */
+import { LOCK_REFRESH_RESULT, } from "../../../../lock/contracts/_module-exports.js";
 /**
- * To utilize the `RedisLockAdapter`, you must install the `"ioredis"` package.
+ * To utilize the `RedisLockAdapter`, you must install the [`"ioredis"`](https://www.npmjs.com/package/ioredis) package.
  *
  * Note in order to use `RedisLockAdapter` correctly, ensure you use a single, consistent database across all server instances.
  *
@@ -36,21 +37,20 @@ export class RedisLockAdapter {
             lua: `
                 local key = KEYS[1];
                 local owner = ARGV[1];
-                local ttl = ARGV[2]
-                
-                local hasKey = redis.call("exists", key)
-                if hasKey == 1 then
+                local expiration = tonumber(ARGV[2])
+
+                if redis.call("exists", key) == 1 then
                     return 0
                 end
                 
-                if ttl == "null" then
+                if expiration == nil then
                     redis.call("set", key, owner, "nx")
                 else
-                    redis.call("set", key, owner, "px", ttl, "nx")
+                    redis.call("set", key, owner, "px", expiration, "nx")
                 end
                 
                 return 1
-                `,
+            `,
         });
     }
     initReleaseCommand() {
@@ -63,14 +63,19 @@ export class RedisLockAdapter {
                 local key = KEYS[1];
                 local owner = ARGV[1];
 
-                local owner_ = redis.call("get", key)
-                if owner_ == owner then
-                    redis.call("del", key)
-                    return 1
+                if redis.call("exists", key) == 0 then
+                    return 0
+                end
+
+                local isNotCurrentOwner = redis.call("get", key) ~= owner
+                if isNotCurrentOwner then
+                    return 0
                 end
+
+                redis.call("del", key)
                 
-                return 0
-                `,
+                return 1
+            `,
         });
     }
     initRefreshComand() {
@@ -80,33 +85,50 @@ export class RedisLockAdapter {
         this.database.defineCommand("daiso_lock_refresh", {
             numberOfKeys: 1,
             lua: `
+                -- Arguments
                 local key = KEYS[1];
                 local owner = ARGV[1];
-                local ttl = ARGV[2]
+                local expiration = ARGV[2]
 
-                local owner_ = redis.call("get", key)
-                if owner_ == owner then
-                    redis.call("pexpire", key, ttl)
-                    return 1
+                -- Constant values
+                local REFRESHED = ARGV[3]
+                local UNOWNED_REFRESH = ARGV[4]
+                local UNEXPIRABLE_KEY = ARGV[5]
+
+                if redis.call("exists", key) == 0 then
+                    return UNOWNED_REFRESH
+                end
+                
+                local isNotCurrentOwner = redis.call("get", key) ~= owner
+                if redis.call("get", key) ~= owner then
+                    return UNOWNED_REFRESH
+                end
+
+                local currentExpiration = redis.call("pttl", key)
+                local isUnexpireable = currentExpiration == -1
+                if isUnexpireable then
+                    return UNEXPIRABLE_KEY
                 end
-                return 0 
+
+                redis.call("pexpire", key, expiration)
+                return REFRESHED
             `,
         });
     }
     async acquire(key, owner, ttl) {
         const result = await this.database.daiso_lock_acquire(key, owner, String(ttl?.toMilliseconds() ?? null));
-        return result > 0;
+        return result === 1;
     }
     async release(key, owner) {
         const result = await this.database.daiso_lock_release(key, owner);
         return result === 1;
     }
     async forceRelease(key) {
-        await this.database.del(key);
+        const result = await this.database.del(key);
+        return result > 0;
     }
     async refresh(key, owner, ttl) {
-        const result = await this.database.daiso_lock_refresh(key, owner, ttl.toMilliseconds().toString());
-        return Boolean(result);
+        return await this.database.daiso_lock_refresh(key, owner, ttl.toMilliseconds().toString(), LOCK_REFRESH_RESULT.REFRESHED, LOCK_REFRESH_RESULT.UNOWNED_REFRESH, LOCK_REFRESH_RESULT.UNEXPIRABLE_KEY);
     }
 }
 //# sourceMappingURL=redis-lock-adapter.js.map

package/dist/lock/implementations/adapters/redis-lock-adapter/redis-lock-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"redis-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/redis-lock-adapter/redis-lock-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAuBH;;;;;;;GAOG;AACH,MAAM,OAAO,gBAAgB;IAWI;IAV7B;;;;;;;;;OASG;IACH,YAA6B,QAAe;QAAf,aAAQ,GAAR,QAAQ,CAAO;QACxC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEO,iBAAiB;QACrB,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO;QACX,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,oBAAoB,EAAE;YAC9C,YAAY,EAAE,CAAC;YACf,GAAG,EAAE;;;;;;;;;;;;;;;;;iBAiBA;SACR,CAAC,CAAC;IACP,CAAC;IAEO,kBAAkB;QACtB,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO;QACX,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,oBAAoB,EAAE;YAC9C,YAAY,EAAE,CAAC;YACf,GAAG,EAAE;;;;;;;;;;;iBAWA;SACR,CAAC,CAAC;IACP,CAAC;IAEO,iBAAiB;QACrB,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO;QACX,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,oBAAoB,EAAE;YAC9C,YAAY,EAAE,CAAC;YACf,GAAG,EAAE;;;;;;;;;;;aAWJ;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CACT,GAAW,EACX,KAAa,EACb,GAAoB;QAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CACjD,GAAG,EACH,KAAK,EACL,MAAM,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,IAAI,CAAC,CACxC,CAAC;QACF,OAAO,MAAM,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClE,OAAO,MAAM,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW;QAC1B,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa,EAAE,GAAa;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CACjD,GAAG,EACH,KAAK,EACL,GAAG,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,CAClC,CAAC;QACF,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC;CACJ"}
+{"version":3,"file":"redis-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/redis-lock-adapter/redis-lock-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EACH,mBAAmB,GAGtB,MAAM,qCAAqC,CAAC;AAuB7C;;;;;;;GAOG;AACH,MAAM,OAAO,gBAAgB;IAWI;IAV7B;;;;;;;;;OASG;IACH,YAA6B,QAAe;QAAf,aAAQ,GAAR,QAAQ,CAAO;QACxC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEO,iBAAiB;QACrB,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO;QACX,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,oBAAoB,EAAE;YAC9C,YAAY,EAAE,CAAC;YACf,GAAG,EAAE;;;;;;;;;;;;;;;;aAgBJ;SACJ,CAAC,CAAC;IACP,CAAC;IAEO,kBAAkB;QACtB,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO;QACX,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,oBAAoB,EAAE;YAC9C,YAAY,EAAE,CAAC;YACf,GAAG,EAAE;;;;;;;;;;;;;;;;aAgBJ;SACJ,CAAC,CAAC;IACP,CAAC;IAEO,iBAAiB;QACrB,IAAI,OAAO,IAAI,CAAC,QAAQ,CAAC,kBAAkB,KAAK,UAAU,EAAE,CAAC;YACzD,OAAO;QACX,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,oBAAoB,EAAE;YAC9C,YAAY,EAAE,CAAC;YACf,GAAG,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;aA4BJ;SACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CACT,GAAW,EACX,KAAa,EACb,GAAoB;QAEpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CACjD,GAAG,EACH,KAAK,EACL,MAAM,CAAC,GAAG,EAAE,cAAc,EAAE,IAAI,IAAI,CAAC,CACxC,CAAC;QACF,OAAO,MAAM,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClE,OAAO,MAAM,KAAK,CAAC,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5C,OAAO,MAAM,GAAG,CAAC,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,OAAO,CACT,GAAW,EACX,KAAa,EACb,GAAa;QAEb,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CACzC,GAAG,EACH,KAAK,EACL,GAAG,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,EAC/B,mBAAmB,CAAC,SAAS,EAC7B,mBAAmB,CAAC,eAAe,EACnC,mBAAmB,CAAC,eAAe,CACtC,CAAC;IACN,CAAC;CACJ"}