@daiso-tech/core 0.39.0 → 0.41.0

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

@@ -1,26 +1,27 @@
 /**
  * @module Lock
  */
-import type { IDatabaseLockAdapter, ILockData } from "../../../../lock/contracts/_module-exports.js";
-import type { Kysely } from "kysely";
-import { type IDeinitizable, type IInitizable, type IPrunable, TimeSpan } from "../../../../utilities/_module-exports.js";
+import type { IDatabaseLockAdapter, IDatabaseLockTransaction, ILockData, ILockExpirationData } from "../../../../lock/contracts/_module-exports.js";
+import { type Kysely } from "kysely";
+import { type IDeinitizable, type IInitizable, type InvokableFn, type IPrunable } from "../../../../utilities/_module-exports.js";
+import { TimeSpan } from "../../../../time-span/implementations/_module-exports.js";
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
  * @group Adapters
  */
-export type KyselyLockAdapterTable = {
+export type KyselyLockTable = {
     key: string;
     owner: string;
-    expiresAt: number | string | null;
+    expiration: number | bigint | string | null;
 };
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
  * @group Adapters
  */
-export type KyselyLockAdapterTables = {
-    lock: KyselyLockAdapterTable;
+export type KyselyLockTables = {
+    lock: KyselyLockTable;
 };
 /**
  *
@@ -28,7 +29,7 @@ export type KyselyLockAdapterTables = {
  * @group Adapters
  */
 export type KyselyLockAdapterSettings = {
-    kysely: Kysely<KyselyLockAdapterTables>;
+    kysely: Kysely<KyselyLockTables>;
     /**
      * @default
      * ```ts
@@ -40,6 +41,13 @@ export type KyselyLockAdapterSettings = {
      * @default true
      */
     shouldRemoveExpiredKeys?: boolean;
+    /**
+     *  @default
+     * ```ts
+     * () => new Date()
+     * ```
+     */
+    currentDate?: () => Date;
 };
 /**
  * To utilize the `KyselyLockAdapter`, you must install the [`"kysely"`](https://www.npmjs.com/package/kysely) package and configure a `Kysely` class instance.
@@ -54,7 +62,9 @@ export declare class KyselyLockAdapter implements IDatabaseLockAdapter, IDeiniti
     private readonly kysely;
     private readonly expiredKeysRemovalInterval;
     private readonly shouldRemoveExpiredKeys;
-    private timeoutId;
+    private intervalId;
+    private readonly currentDate;
+    private readonly isMysql;
     /**
      * @example
      * ```ts
@@ -73,12 +83,22 @@ export declare class KyselyLockAdapter implements IDatabaseLockAdapter, IDeiniti
      * ```
      */
     constructor(settings: KyselyLockAdapterSettings);
+    /**
+     * Removes all related lock tables and their rows.
+     * Note all lock data will be removed.
+     */
     deInit(): Promise<void>;
+    /**
+     * Creates all related tables and indexes.
+     * Note the `init` method needs to be called once before using the adapter.
+     */
     init(): Promise<void>;
     removeAllExpired(): 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>;
+    transaction<TReturn>(fn: InvokableFn<[
+        transaction: IDatabaseLockTransaction
+    ], Promise<TReturn>>): Promise<TReturn>;
+    remove(key: string): Promise<ILockExpirationData | null>;
+    removeIfOwner(key: string, lockId: string): Promise<ILockData | null>;
+    updateExpiration(key: string, lockId: string, expiration: Date): Promise<number>;
     find(key: string): Promise<ILockData | null>;
 }

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

@@ -1,7 +1,65 @@
 /**
  * @module Lock
  */
-import { TimeSpan, } from "../../../../utilities/_module-exports.js";
+import { MysqlAdapter } from "kysely";
+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.
  *
@@ -15,7 +73,9 @@ export class KyselyLockAdapter {
     kysely;
     expiredKeysRemovalInterval;
     shouldRemoveExpiredKeys;
-    timeoutId = null;
+    intervalId = null;
+    currentDate;
+    isMysql;
     /**
      * @example
      * ```ts
@@ -34,19 +94,26 @@ export class KyselyLockAdapter {
      * ```
      */
     constructor(settings) {
-        const { kysely, expiredKeysRemovalInterval = TimeSpan.fromMinutes(1), shouldRemoveExpiredKeys = true, } = 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;
     }
+    /**
+     * 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 {
             await this.kysely.schema
-                .dropIndex("lock_expiresAt")
+                .dropIndex("lock_expiration")
                 .on("lock")
                 .execute();
         }
@@ -61,14 +128,18 @@ 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.primaryKey())
+                .addColumn("key", "varchar(255)", (col) => col.primaryKey().notNull())
                 .addColumn("owner", "varchar(255)", (col) => col.notNull())
-                .addColumn("expiresAt", "bigint")
+                .addColumn("expiration", "bigint")
                 .execute();
         }
         catch {
@@ -77,16 +148,16 @@ export class KyselyLockAdapter {
         // Should throw if the index already exists thats why the try catch is used.
         try {
             await this.kysely.schema
-                .createIndex("lock_expiresAt")
+                .createIndex("lock_expiration")
                 .on("lock")
-                .columns(["expiresAt"])
+                .column("expiration")
                 .execute();
         }
         catch {
             /* EMPTY */
         }
         if (this.shouldRemoveExpiredKeys) {
-            this.timeoutId = setInterval(() => {
+            this.intervalId = setInterval(() => {
                 void this.removeAllExpired();
             }, this.expiredKeysRemovalInterval.toMilliseconds());
         }
@@ -94,61 +165,116 @@ export class KyselyLockAdapter {
     async removeAllExpired() {
         await this.kysely
             .deleteFrom("lock")
-            .where("lock.expiresAt", "<=", new Date().getTime())
+            .where("lock.expiration", "<=", this.currentDate().getTime())
             .execute();
     }
-    async insert(key, owner, expiration) {
-        await this.kysely
-            .insertInto("lock")
-            .values({
-            key,
-            owner,
-            expiresAt: expiration?.getTime() ?? null,
-        })
-            .execute();
+    async transaction(fn) {
+        return await this.kysely
+            .transaction()
+            .setIsolationLevel("serializable")
+            .execute(async (trx) => {
+            return await fn(new DatabaseLockTransaction(trx));
+        });
     }
-    async update(key, owner, expiration) {
-        const updateResult = await this.kysely
-            .updateTable("lock")
-            .where("lock.key", "=", key)
-            // Has expired
-            .where((eb) => eb.and([
-            eb("lock.expiresAt", "is not", null),
-            eb("lock.expiresAt", "<=", Date.now()),
-        ]))
-            .set({ owner, expiresAt: expiration?.getTime() ?? null })
-            .executeTakeFirst();
-        return Number(updateResult.numUpdatedRows); // > 0;
-    }
-    async remove(key, owner) {
-        await this.kysely
-            .deleteFrom("lock")
-            .where("lock.key", "=", key)
-            .$if(owner !== null, (query) => query.where("lock.owner", "=", owner))
-            .execute();
-    }
-    async refresh(key, owner, expiration) {
-        const updateResult = await this.kysely
-            .updateTable("lock")
-            .where("lock.key", "=", key)
-            .where("lock.owner", "=", owner)
-            .set({ expiresAt: expiration.getTime() })
-            .executeTakeFirst();
-        return Number(updateResult.numUpdatedRows); // > 0;
+    async remove(key) {
+        let result;
+        if (this.isMysql) {
+            result = await this.kysely
+                .transaction()
+                .setIsolationLevel("serializable")
+                .execute(async (trx) => {
+                const row = await trx
+                    .selectFrom("lock")
+                    .where("lock.key", "=", key)
+                    .select("lock.expiration")
+                    .executeTakeFirst();
+                await trx
+                    .deleteFrom("lock")
+                    .where("lock.key", "=", key)
+                    .executeTakeFirst();
+                return row;
+            });
+        }
+        else {
+            result = await this.kysely
+                .deleteFrom("lock")
+                .where("lock.key", "=", key)
+                .returning(["lock.expiration"])
+                .executeTakeFirst();
+        }
+        if (result === undefined) {
+            return null;
+        }
+        if (result.expiration === null) {
+            return {
+                expiration: null,
+            };
+        }
+        return {
+            expiration: new Date(Number(result.expiration)),
+        };
     }
-    async find(key) {
-        const row = await this.kysely
-            .selectFrom("lock")
-            .where("lock.key", "=", key)
-            .select(["lock.owner", "lock.expiresAt"])
-            .executeTakeFirst();
+    async removeIfOwner(key, lockId) {
+        let row;
+        if (this.isMysql) {
+            row = await this.kysely
+                .transaction()
+                .setIsolationLevel("serializable")
+                .execute(async (trx) => {
+                const row = await trx
+                    .selectFrom("lock")
+                    .where("lock.key", "=", key)
+                    .where("lock.owner", "=", lockId)
+                    .select(["lock.expiration", "lock.owner"])
+                    .executeTakeFirst();
+                await trx
+                    .deleteFrom("lock")
+                    .where("lock.key", "=", key)
+                    .where("lock.owner", "=", lockId)
+                    .execute();
+                return row;
+            });
+        }
+        else {
+            row = await this.kysely
+                .deleteFrom("lock")
+                .where("lock.key", "=", key)
+                .where("lock.owner", "=", lockId)
+                .returning(["lock.expiration", "lock.owner"])
+                .executeTakeFirst();
+        }
         if (row === undefined) {
             return null;
         }
+        const { expiration } = row;
+        if (expiration === null) {
+            return {
+                owner: row.owner,
+                expiration: null,
+            };
+        }
         return {
-            expiration: row.expiresAt !== null ? new Date(Number(row.expiresAt)) : null,
             owner: row.owner,
+            expiration: new Date(Number(expiration)),
         };
     }
+    async updateExpiration(key, lockId, expiration) {
+        const result = await this.kysely
+            .updateTable("lock")
+            .where("lock.key", "=", key)
+            .where("lock.owner", "=", lockId)
+            .where((eb) => eb.and([
+            eb("lock.expiration", "is not", null),
+            eb("lock.expiration", ">", Date.now()),
+        ]))
+            .set({
+            expiration: expiration.getTime(),
+        })
+            .executeTakeFirst();
+        return Number(result.numUpdatedRows);
+    }
+    async find(key) {
+        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,23 @@
 /**
  * @module Lock
  */
-import type { TimeSpan } from "../../../../utilities/_module-exports.js";
-import type { ILockAdapter, ILockData } 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"`
+ * @group Adapters
+ */
+export type MemoryLockData = {
+    owner: string;
+    hasExpiration: true;
+    timeoutId: string | number | NodeJS.Timeout;
+    expiration: Date;
+} | {
+    owner: string;
+    hasExpiration: false;
+};
 /**
  * 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.
@@ -10,9 +25,8 @@ import type { ILockAdapter, ILockData } from "../../../../lock/contracts/_module
  * IMPORT_PATH: `"@daiso-tech/core/lock/adapters"`
  * @group Adapters
  */
-export declare class MemoryLockAdapter implements ILockAdapter {
+export declare class MemoryLockAdapter implements ILockAdapter, IDeinitizable {
     private readonly map;
-    private readonly timeoutMap;
     /**
      *  @example
      * ```ts
@@ -29,9 +43,11 @@ export declare class MemoryLockAdapter implements ILockAdapter {
      * const lockAdapter = new MemoryLockAdapter(map);
      * ```
      */
-    constructor(map?: Map<string, ILockData>);
-    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, time: TimeSpan): Promise<boolean>;
+    constructor(map?: Map<string, MemoryLockData>);
+    deInit(): Promise<void>;
+    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, lockId: string, ttl: TimeSpan): Promise<boolean>;
+    getState(key: string): Promise<ILockAdapterState | null>;
 }

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

@@ -10,7 +10,6 @@
  */
 export class MemoryLockAdapter {
     map;
-    timeoutMap = new Map();
     /**
      *  @example
      * ```ts
@@ -31,64 +30,109 @@ export class MemoryLockAdapter {
         this.map = map;
     }
     // eslint-disable-next-line @typescript-eslint/require-await
-    async acquire(key, owner, ttl) {
-        const hasNotKey = !this.map.has(key);
-        if (hasNotKey) {
-            this.map.set(key, {
-                owner,
-                expiration: ttl?.toEndDate() ?? null,
-            });
+    async deInit() {
+        for (const [key, lockData] of this.map) {
+            if (lockData.hasExpiration) {
+                clearTimeout(lockData.timeoutId);
+            }
+            this.map.delete(key);
+        }
+    }
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async acquire(key, lockId, ttl) {
+        let lock = this.map.get(key);
+        if (lock !== undefined) {
+            return lock.owner === lockId;
+        }
+        if (ttl === null) {
+            lock = {
+                owner: lockId,
+                hasExpiration: false,
+            };
+            this.map.set(key, lock);
         }
-        if (hasNotKey && ttl !== null) {
-            this.timeoutMap.set(key, setTimeout(() => {
+        else {
+            const timeoutId = setTimeout(() => {
                 this.map.delete(key);
-                this.timeoutMap.delete(key);
-            }, ttl.toMilliseconds()));
+            }, ttl.toMilliseconds());
+            lock = {
+                owner: lockId,
+                hasExpiration: true,
+                timeoutId,
+                expiration: ttl.toEndDate(),
+            };
+            this.map.set(key, lock);
         }
-        return hasNotKey;
+        return true;
     }
     // eslint-disable-next-line @typescript-eslint/require-await
-    async release(key, owner) {
-        const data = this.map.get(key);
-        if (data === undefined) {
-            return true;
+    async release(key, lockId) {
+        const lock = this.map.get(key);
+        if (lock === undefined) {
+            return false;
         }
-        if (data.owner !== owner) {
+        if (lock.owner !== lockId) {
             return false;
         }
-        clearTimeout(this.timeoutMap.get(key));
-        this.timeoutMap.delete(key);
+        if (lock.hasExpiration) {
+            clearTimeout(lock.timeoutId);
+        }
         this.map.delete(key);
         return true;
     }
     // eslint-disable-next-line @typescript-eslint/require-await
     async forceRelease(key) {
-        clearTimeout(this.timeoutMap.get(key));
-        this.timeoutMap.delete(key);
+        const lock = this.map.get(key);
+        if (lock === undefined) {
+            return false;
+        }
+        if (lock.hasExpiration) {
+            clearTimeout(lock.timeoutId);
+        }
         this.map.delete(key);
+        return true;
     }
     // eslint-disable-next-line @typescript-eslint/require-await
-    async refresh(key, owner, time) {
-        const data = this.map.get(key);
-        if (data === undefined) {
-            return true;
+    async refresh(key, lockId, ttl) {
+        const lock = this.map.get(key);
+        if (lock === undefined) {
+            return false;
         }
-        if (data.owner !== owner) {
+        if (lock.owner !== lockId) {
             return false;
         }
-        if (data.expiration === null) {
-            return true;
+        if (!lock.hasExpiration) {
+            return false;
         }
+        clearTimeout(lock.timeoutId);
+        const timeoutId = setTimeout(() => {
+            this.map.delete(key);
+        }, ttl.toMilliseconds());
         this.map.set(key, {
-            ...data,
-            expiration: time.toEndDate(),
+            ...lock,
+            timeoutId,
         });
-        clearTimeout(this.timeoutMap.get(key));
-        this.timeoutMap.set(key, setTimeout(() => {
-            this.timeoutMap.delete(key);
-            this.map.delete(key);
-        }, time.toMilliseconds()));
         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