@daiso-tech/core 0.40.0 → 0.41.0

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

@@ -2,7 +2,64 @@
  * @module Lock
  */
 import { MysqlAdapter } from "kysely";
-import { TimeSpan, } from "../../../../utilities/_module-exports.js";
+import {} from "../../../../utilities/_module-exports.js";
+import { TimeSpan } from "../../../../time-span/implementations/_module-exports.js";
+async function find(kysely, key) {
+    const row = await kysely
+        .selectFrom("lock")
+        .where("lock.key", "=", key)
+        .select(["lock.owner", "lock.expiration"])
+        .executeTakeFirst();
+    if (row === undefined) {
+        return null;
+    }
+    if (row.expiration === null) {
+        return {
+            owner: row.owner,
+            expiration: null,
+        };
+    }
+    return {
+        owner: row.owner,
+        expiration: new Date(Number(row.expiration)),
+    };
+}
+/**
+ * @internal
+ */
+class DatabaseLockTransaction {
+    kysely;
+    isMysql;
+    constructor(kysely) {
+        this.kysely = kysely;
+        this.isMysql =
+            this.kysely.getExecutor().adapter instanceof MysqlAdapter;
+    }
+    async find(key) {
+        return await find(this.kysely, key);
+    }
+    async upsert(key, lockId, expiration) {
+        const expirationAsMs = expiration?.getTime() ?? null;
+        await this.kysely
+            .insertInto("lock")
+            .values({
+            key,
+            owner: lockId,
+            expiration: expirationAsMs,
+        })
+            .$if(!this.isMysql, (eb) => eb.onConflict((eb) => eb.column("key").doUpdateSet({
+            key,
+            owner: lockId,
+            expiration: expirationAsMs,
+        })))
+            .$if(this.isMysql, (eb) => eb.onDuplicateKeyUpdate({
+            key,
+            owner: lockId,
+            expiration: expirationAsMs,
+        }))
+            .execute();
+    }
+}
 /**
  * To utilize the `KyselyLockAdapter`, you must install the [`"kysely"`](https://www.npmjs.com/package/kysely) package and configure a `Kysely` class instance.
  *
@@ -16,9 +73,8 @@ export class KyselyLockAdapter {
     kysely;
     expiredKeysRemovalInterval;
     shouldRemoveExpiredKeys;
-    timeoutId = null;
+    intervalId = null;
     currentDate;
-    setInterval;
     isMysql;
     /**
      * @example
@@ -38,18 +94,21 @@ export class KyselyLockAdapter {
      * ```
      */
     constructor(settings) {
-        const { kysely, expiredKeysRemovalInterval = TimeSpan.fromMinutes(1), shouldRemoveExpiredKeys = true, currentDate = () => new Date(), setInterval = globalThis.setInterval, } = settings;
+        const { kysely, expiredKeysRemovalInterval = TimeSpan.fromMinutes(1), shouldRemoveExpiredKeys = true, currentDate = () => new Date(), } = settings;
         this.expiredKeysRemovalInterval = expiredKeysRemovalInterval;
         this.shouldRemoveExpiredKeys = shouldRemoveExpiredKeys;
         this.kysely = kysely;
         this.isMysql =
             this.kysely.getExecutor().adapter instanceof MysqlAdapter;
         this.currentDate = currentDate;
-        this.setInterval = setInterval;
     }
+    /**
+     * Removes all related lock tables and their rows.
+     * Note all lock data will be removed.
+     */
     async deInit() {
-        if (this.shouldRemoveExpiredKeys && this.timeoutId !== null) {
-            clearTimeout(this.timeoutId);
+        if (this.shouldRemoveExpiredKeys && this.intervalId !== null) {
+            clearInterval(this.intervalId);
         }
         // Should throw if the index does not exists thats why the try catch is used.
         try {
@@ -69,12 +128,16 @@ export class KyselyLockAdapter {
             /* EMPTY */
         }
     }
+    /**
+     * Creates all related tables and indexes.
+     * Note the `init` method needs to be called once before using the adapter.
+     */
     async init() {
         // Should throw if the table already exists thats why the try catch is used.
         try {
             await this.kysely.schema
                 .createTable("lock")
-                .addColumn("key", "varchar(255)", (col) => col.notNull().primaryKey())
+                .addColumn("key", "varchar(255)", (col) => col.primaryKey().notNull())
                 .addColumn("owner", "varchar(255)", (col) => col.notNull())
                 .addColumn("expiration", "bigint")
                 .execute();
@@ -87,14 +150,14 @@ export class KyselyLockAdapter {
             await this.kysely.schema
                 .createIndex("lock_expiration")
                 .on("lock")
-                .columns(["expiration"])
+                .column("expiration")
                 .execute();
         }
         catch {
             /* EMPTY */
         }
         if (this.shouldRemoveExpiredKeys) {
-            this.timeoutId = this.setInterval(() => {
+            this.intervalId = setInterval(() => {
                 void this.removeAllExpired();
             }, this.expiredKeysRemovalInterval.toMilliseconds());
         }
@@ -105,31 +168,13 @@ export class KyselyLockAdapter {
             .where("lock.expiration", "<=", this.currentDate().getTime())
             .execute();
     }
-    async insert(key, owner, expiration) {
-        await this.kysely
-            .insertInto("lock")
-            .values({
-            key,
-            owner,
-            expiration: expiration?.getTime() ?? null,
-        })
-            .execute();
-    }
-    async updateIfExpired(key, owner, expiration) {
-        const result = await this.kysely
-            .updateTable("lock")
-            .where("lock.key", "=", key)
-            .where((eb) => {
-            const hasExpiration = eb("lock.expiration", "is not", null);
-            const hasExpired = eb("lock.expiration", "<=", Date.now());
-            return eb.and([hasExpiration, hasExpired]);
-        })
-            .set({
-            owner,
-            expiration: expiration?.getTime() ?? null,
-        })
-            .executeTakeFirst();
-        return Number(result.numUpdatedRows);
+    async transaction(fn) {
+        return await this.kysely
+            .transaction()
+            .setIsolationLevel("serializable")
+            .execute(async (trx) => {
+            return await fn(new DatabaseLockTransaction(trx));
+        });
     }
     async remove(key) {
         let result;
@@ -140,8 +185,8 @@ export class KyselyLockAdapter {
                 .execute(async (trx) => {
                 const row = await trx
                     .selectFrom("lock")
-                    .select("lock.expiration")
                     .where("lock.key", "=", key)
+                    .select("lock.expiration")
                     .executeTakeFirst();
                 await trx
                     .deleteFrom("lock")
@@ -169,7 +214,7 @@ export class KyselyLockAdapter {
             expiration: new Date(Number(result.expiration)),
         };
     }
-    async removeIfOwner(key, owner) {
+    async removeIfOwner(key, lockId) {
         let row;
         if (this.isMysql) {
             row = await this.kysely
@@ -179,13 +224,13 @@ export class KyselyLockAdapter {
                 const row = await trx
                     .selectFrom("lock")
                     .where("lock.key", "=", key)
-                    .where("lock.owner", "=", owner)
+                    .where("lock.owner", "=", lockId)
                     .select(["lock.expiration", "lock.owner"])
                     .executeTakeFirst();
                 await trx
                     .deleteFrom("lock")
                     .where("lock.key", "=", key)
-                    .where("lock.owner", "=", owner)
+                    .where("lock.owner", "=", lockId)
                     .execute();
                 return row;
             });
@@ -194,7 +239,7 @@ export class KyselyLockAdapter {
             row = await this.kysely
                 .deleteFrom("lock")
                 .where("lock.key", "=", key)
-                .where("lock.owner", "=", owner)
+                .where("lock.owner", "=", lockId)
                 .returning(["lock.expiration", "lock.owner"])
                 .executeTakeFirst();
         }
@@ -213,11 +258,15 @@ export class KyselyLockAdapter {
             expiration: new Date(Number(expiration)),
         };
     }
-    async updateExpirationIfOwner(key, owner, expiration) {
+    async updateExpiration(key, lockId, expiration) {
         const result = await this.kysely
             .updateTable("lock")
             .where("lock.key", "=", key)
-            .where("lock.owner", "=", owner)
+            .where("lock.owner", "=", lockId)
+            .where((eb) => eb.and([
+            eb("lock.expiration", "is not", null),
+            eb("lock.expiration", ">", Date.now()),
+        ]))
             .set({
             expiration: expiration.getTime(),
         })
@@ -225,25 +274,7 @@ export class KyselyLockAdapter {
         return Number(result.numUpdatedRows);
     }
     async find(key) {
-        const row = await this.kysely
-            .selectFrom("lock")
-            .select(["lock.owner", "lock.expiration"])
-            .where("lock.key", "=", key)
-            .executeTakeFirst();
-        if (row === undefined) {
-            return null;
-        }
-        const { owner, expiration } = row;
-        if (expiration === null) {
-            return {
-                owner,
-                expiration: null,
-            };
-        }
-        return {
-            owner,
-            expiration: new Date(Number(expiration)),
-        };
+        return await find(this.kysely, key);
     }
 }
 //# sourceMappingURL=kysely-lock-adapter.js.map

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

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

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

@@ -1,8 +1,9 @@
 /**
  * @module Lock
  */
-import type { IDeinitizable, TimeSpan } from "../../../../utilities/_module-exports.js";
-import { type ILockAdapter, type LockRefreshResult } from "../../../../lock/contracts/_module-exports.js";
+import type { IDeinitizable } from "../../../../utilities/_module-exports.js";
+import type { ILockAdapter, ILockAdapterState } from "../../../../lock/contracts/_module-exports.js";
+import type { TimeSpan } from "../../../../time-span/implementations/_module-exports.js";
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
@@ -12,6 +13,7 @@ export type MemoryLockData = {
     owner: string;
     hasExpiration: true;
     timeoutId: string | number | NodeJS.Timeout;
+    expiration: Date;
 } | {
     owner: string;
     hasExpiration: false;
@@ -43,8 +45,9 @@ export declare class MemoryLockAdapter implements ILockAdapter, IDeinitizable {
      */
     constructor(map?: Map<string, MemoryLockData>);
     deInit(): Promise<void>;
-    acquire(key: string, owner: string, ttl: TimeSpan | null): Promise<boolean>;
-    release(key: string, owner: string): Promise<boolean>;
+    acquire(key: string, lockId: string, ttl: TimeSpan | null): Promise<boolean>;
+    release(key: string, lockId: string): Promise<boolean>;
     forceRelease(key: string): Promise<boolean>;
-    refresh(key: string, owner: string, ttl: TimeSpan): Promise<LockRefreshResult>;
+    refresh(key: string, lockId: string, ttl: TimeSpan): Promise<boolean>;
+    getState(key: string): Promise<ILockAdapterState | null>;
 }

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

@@ -1,7 +1,6 @@
 /**
  * @module Lock
  */
-import { LOCK_REFRESH_RESULT, } from "../../../../lock/contracts/_module-exports.js";
 /**
  * Note the `MemoryLockAdapter` is limited to single process usage and cannot be shared across multiple servers or different processes.
  * This adapter is meant to be used for testing.
@@ -40,14 +39,14 @@ export class MemoryLockAdapter {
         }
     }
     // eslint-disable-next-line @typescript-eslint/require-await
-    async acquire(key, owner, ttl) {
+    async acquire(key, lockId, ttl) {
         let lock = this.map.get(key);
         if (lock !== undefined) {
-            return false;
+            return lock.owner === lockId;
         }
         if (ttl === null) {
             lock = {
-                owner,
+                owner: lockId,
                 hasExpiration: false,
             };
             this.map.set(key, lock);
@@ -57,21 +56,22 @@ export class MemoryLockAdapter {
                 this.map.delete(key);
             }, ttl.toMilliseconds());
             lock = {
-                owner,
+                owner: lockId,
                 hasExpiration: true,
                 timeoutId,
+                expiration: ttl.toEndDate(),
             };
             this.map.set(key, lock);
         }
         return true;
     }
     // eslint-disable-next-line @typescript-eslint/require-await
-    async release(key, owner) {
+    async release(key, lockId) {
         const lock = this.map.get(key);
         if (lock === undefined) {
             return false;
         }
-        if (lock.owner !== owner) {
+        if (lock.owner !== lockId) {
             return false;
         }
         if (lock.hasExpiration) {
@@ -93,16 +93,16 @@ export class MemoryLockAdapter {
         return true;
     }
     // eslint-disable-next-line @typescript-eslint/require-await
-    async refresh(key, owner, ttl) {
+    async refresh(key, lockId, ttl) {
         const lock = this.map.get(key);
         if (lock === undefined) {
-            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
+            return false;
         }
-        if (lock.owner !== owner) {
-            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
+        if (lock.owner !== lockId) {
+            return false;
         }
         if (!lock.hasExpiration) {
-            return LOCK_REFRESH_RESULT.UNEXPIRABLE_KEY;
+            return false;
         }
         clearTimeout(lock.timeoutId);
         const timeoutId = setTimeout(() => {
@@ -112,7 +112,27 @@ export class MemoryLockAdapter {
             ...lock,
             timeoutId,
         });
-        return LOCK_REFRESH_RESULT.REFRESHED;
+        return true;
+    }
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async getState(key) {
+        const lockData = this.map.get(key);
+        if (lockData === undefined) {
+            return null;
+        }
+        if (!lockData.hasExpiration) {
+            return {
+                owner: lockData.owner,
+                expiration: null,
+            };
+        }
+        if (lockData.expiration <= new Date()) {
+            return null;
+        }
+        return {
+            owner: lockData.owner,
+            expiration: lockData.expiration,
+        };
     }
 }
 //# sourceMappingURL=memory-lock-adapter.js.map

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":"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"}
+{"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,11 +1,11 @@
 /**
  * @module Lock
  */
-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 { ILockAdapter, ILockAdapterState } from "../../../../lock/contracts/_module-exports.js";
 import type { CollectionOptions, Db } from "mongodb";
 import type { ObjectId } from "mongodb";
+import type { TimeSpan } from "../../../../time-span/implementations/_module-exports.js";
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
@@ -39,9 +39,7 @@ export type MongodbLockDocument = {
  * @group Adapters
  */
 export declare class MongodbLockAdapter implements ILockAdapter, IDeinitizable, IInitizable {
-    private readonly database;
     private readonly collection;
-    private readonly collectionName;
     /**
      * @example
      * ```ts
@@ -60,7 +58,7 @@ export declare class MongodbLockAdapter implements ILockAdapter, IDeinitizable,
     constructor(settings: MongodbLockAdapterSettings);
     /**
      * Creates all related indexes.
-     * Note the `init` method needs to be called before using the adapter.
+     * Note the `init` method needs to be called once before using the adapter.
      */
     init(): Promise<void>;
     /**
@@ -68,8 +66,9 @@ export declare class MongodbLockAdapter implements ILockAdapter, IDeinitizable,
      * Note all lock data will be removed.
      */
     deInit(): Promise<void>;
-    acquire(key: string, owner: string, ttl: TimeSpan | null): Promise<boolean>;
-    release(key: string, owner: string): Promise<boolean>;
+    acquire(key: string, lockId: string, ttl: TimeSpan | null): Promise<boolean>;
+    release(key: string, lockId: string): Promise<boolean>;
     forceRelease(key: string): Promise<boolean>;
-    refresh(key: string, owner: string, ttl: TimeSpan): Promise<LockRefreshResult>;
+    refresh(key: string, lockId: string, ttl: TimeSpan): Promise<boolean>;
+    getState(key: string): Promise<ILockAdapterState | null>;
 }

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

@@ -2,7 +2,6 @@
  * @module Lock
  */
 import {} from "../../../../utilities/_module-exports.js";
-import { LOCK_REFRESH_RESULT, } from "../../../../lock/contracts/_module-exports.js";
 /**
  * To utilize the `MongodbLockAdapter`, you must install the [`"mongodb"`](https://www.npmjs.com/package/mongodb) package.
  *
@@ -12,9 +11,7 @@ import { LOCK_REFRESH_RESULT, } from "../../../../lock/contracts/_module-exports
  * @group Adapters
  */
 export class MongodbLockAdapter {
-    database;
     collection;
-    collectionName;
     /**
      * @example
      * ```ts
@@ -32,13 +29,11 @@ export class MongodbLockAdapter {
      */
     constructor(settings) {
         const { collectionName = "lock", collectionSettings, database, } = settings;
-        this.collectionName = collectionName;
-        this.database = database;
         this.collection = database.collection(collectionName, collectionSettings);
     }
     /**
      * Creates all related indexes.
-     * Note the `init` method needs to be called before using the adapter.
+     * Note the `init` method needs to be called once before using the adapter.
      */
     async init() {
         // Should throw if the index already exists thats why the try catch is used.
@@ -76,13 +71,13 @@ export class MongodbLockAdapter {
         }
         // Should throw if the collection already does not exists thats why the try catch is used.
         try {
-            await this.database.dropCollection(this.collectionName);
+            await this.collection.drop();
         }
         catch {
             /* EMPTY */
         }
     }
-    async acquire(key, owner, ttl) {
+    async acquire(key, lockId, ttl) {
         const expiration = ttl?.toEndDate() ?? null;
         const isExpiredQuery = {
             $and: [
@@ -101,7 +96,7 @@ export class MongodbLockAdapter {
                 $set: {
                     key,
                     owner: {
-                        $ifNull: ["$owner", owner],
+                        $ifNull: ["$owner", lockId],
                     },
                     expiration: {
                         $ifNull: ["$expiration", expiration],
@@ -113,7 +108,7 @@ export class MongodbLockAdapter {
                     owner: {
                         $cond: {
                             if: isExpiredQuery,
-                            then: owner,
+                            then: lockId,
                             else: "$owner",
                         },
                     },
@@ -132,12 +127,15 @@ export class MongodbLockAdapter {
         if (lockData === null) {
             return true;
         }
+        if (lockData.owner === lockId) {
+            return true;
+        }
         if (lockData.expiration === null) {
             return false;
         }
         return lockData.expiration <= new Date();
     }
-    async release(key, owner) {
+    async release(key, lockId) {
         const isUnexpirableQuery = {
             expiration: {
                 $eq: null,
@@ -150,7 +148,7 @@ export class MongodbLockAdapter {
         };
         const lockData = await this.collection.findOneAndDelete({
             key,
-            owner,
+            owner: lockId,
             $or: [isUnexpirableQuery, isUnexpiredQuery],
         });
         if (lockData === null) {
@@ -163,7 +161,7 @@ export class MongodbLockAdapter {
         }
         const { owner: currentOwner } = lockData;
         const isNotExpired = expiration > new Date();
-        const isCurrentOwner = owner === currentOwner;
+        const isCurrentOwner = lockId === currentOwner;
         return isNotExpired && isCurrentOwner;
     }
     async forceRelease(key) {
@@ -177,7 +175,7 @@ export class MongodbLockAdapter {
         const isNotExpired = lockData.expiration >= new Date();
         return isNotExpired;
     }
-    async refresh(key, owner, ttl) {
+    async refresh(key, lockId, ttl) {
         const isUnexpiredQuery = {
             $and: [
                 {
@@ -204,18 +202,33 @@ export class MongodbLockAdapter {
             },
         ]);
         if (lockData === null) {
-            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
+            return false;
         }
-        if (lockData.owner !== owner) {
-            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
+        if (lockData.owner !== lockId) {
+            return false;
         }
         if (lockData.expiration === null) {
-            return LOCK_REFRESH_RESULT.UNEXPIRABLE_KEY;
+            return false;
         }
         if (lockData.expiration <= new Date()) {
-            return LOCK_REFRESH_RESULT.UNOWNED_REFRESH;
+            return false;
         }
-        return LOCK_REFRESH_RESULT.REFRESHED;
+        return true;
+    }
+    async getState(key) {
+        const lockData = await this.collection.findOne({
+            key,
+        });
+        if (lockData === null) {
+            return null;
+        }
+        if (lockData.expiration !== null && lockData.expiration <= new Date()) {
+            return null;
+        }
+        return {
+            owner: lockData.owner,
+            expiration: lockData.expiration,
+        };
     }
 }
 //# sourceMappingURL=mongodb-lock-adapter.js.map