@daiso-tech/core 0.39.0 → 0.41.0

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

@@ -26,6 +26,7 @@ export class RedisLockAdapter {
         this.initAquireCommand();
         this.initReleaseCommand();
         this.initRefreshComand();
+        this.initGetStateComand();
     }
     initAquireCommand() {
         if (typeof this.database.daiso_lock_acquire === "function") {
@@ -35,22 +36,23 @@ export class RedisLockAdapter {
             numberOfKeys: 1,
             lua: `
                 local key = KEYS[1];
-                local owner = ARGV[1];
-                local ttl = ARGV[2]
-                
-                local hasKey = redis.call("exists", key)
-                if hasKey == 1 then
-                    return 0
+                local lockId = ARGV[1];
+
+                -- Expiration time as unix timestamp in ms
+                local expiration = tonumber(ARGV[2]);
+
+                if redis.call("exists", key) == 1 then
+                    return redis.call("get", key) == lockId;
                 end
                 
-                if ttl == "null" then
-                    redis.call("set", key, owner, "nx")
+                if expiration == nil then
+                    redis.call("set", key, lockId, "nx");
                 else
-                    redis.call("set", key, owner, "px", ttl, "nx")
+                    redis.call("set", key, lockId, "pxat", expiration, "nx");
                 end
                 
-                return 1
-                `,
+                return 1;
+            `,
         });
     }
     initReleaseCommand() {
@@ -61,16 +63,21 @@ export class RedisLockAdapter {
             numberOfKeys: 1,
             lua: `
                 local key = KEYS[1];
-                local owner = ARGV[1];
+                local lockId = 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) ~= lockId
+                if isNotCurrentOwner then
+                    return 0
                 end
+
+                redis.call("del", key)
                 
-                return 0
-                `,
+                return 1
+            `,
         });
     }
     initRefreshComand() {
@@ -80,33 +87,81 @@ 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 lockId = ARGV[1];
 
-                local owner_ = redis.call("get", key)
-                if owner_ == owner then
-                    redis.call("pexpire", key, ttl)
-                    return 1
+                -- Expiration time as unix timestamp in ms
+                local expiration = tonumber(ARGV[2]);
+
+                if redis.call("exists", key) == 0 then
+                    return 0
                 end
-                return 0 
+                
+                local isNotCurrentOwner = redis.call("get", key) ~= lockId
+                if redis.call("get", key) ~= lockId then
+                    return 0
+                end
+
+                local currentExpiration = redis.call("pttl", key)
+                local isUnexpireable = currentExpiration == -1
+                if isUnexpireable then
+                    return 0
+                end
+
+                redis.call("pexpireat", key, expiration)
+                return 1
+            `,
+        });
+    }
+    initGetStateComand() {
+        if (typeof this.database.daiso_lock_get_state === "function") {
+            return;
+        }
+        this.database.defineCommand("daiso_lock_get_state", {
+            numberOfKeys: 1,
+            lua: `
+                -- Arguments
+                local key = KEYS[1];
+
+                if tonumber(redis.call("exists", key)) == 0 then
+                    return cjson.encode(nil);
+                end
+
+                local state = {
+                    owner = redis.call("get", key),
+                    expiration = tonumber(redis.call("pexpiretime", key))
+                };
+
+                return cjson.encode(state); 
             `,
         });
     }
-    async acquire(key, owner, ttl) {
-        const result = await this.database.daiso_lock_acquire(key, owner, String(ttl?.toMilliseconds() ?? null));
+    async acquire(key, lockId, ttl) {
+        const result = await this.database.daiso_lock_acquire(key, lockId, ttl?.toEndDate().getTime() ?? null);
         return result === 1;
     }
-    async release(key, owner) {
-        const result = await this.database.daiso_lock_release(key, owner);
+    async release(key, lockId) {
+        const result = await this.database.daiso_lock_release(key, lockId);
         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());
+    async refresh(key, lockId, ttl) {
+        const result = await this.database.daiso_lock_refresh(key, lockId, ttl.toEndDate().getTime());
         return result === 1;
     }
+    async getState(key) {
+        const json = JSON.parse(await this.database.daiso_lock_get_state(key));
+        if (json === null) {
+            return null;
+        }
+        return {
+            owner: json.owner,
+            expiration: json.expiration === -1 ? null : new Date(json.expiration),
+        };
+    }
 }
 //# 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,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,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,MAAM,KAAK,CAAC,CAAC;IACxB,CAAC;CACJ"}
+{"version":3,"file":"redis-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/adapters/redis-lock-adapter/redis-lock-adapter.ts"],"names":[],"mappings":"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"}

package/dist/lock/implementations/derivables/lock-provider/database-lock-adapter.d.ts

@@ -1,16 +1,17 @@
 /**
  * @module Lock
  */
-import { type TimeSpan } from "../../../../utilities/_module-exports.js";
-import type { IDatabaseLockAdapter, ILockAdapter } from "../../../../lock/contracts/_module-exports.js";
+import { type IDatabaseLockAdapter, type ILockAdapter, type ILockAdapterState } from "../../../../lock/contracts/_module-exports.js";
+import type { TimeSpan } from "../../../../time-span/implementations/_module-exports.js";
 /**
  * @internal
  */
 export declare class DatabaseLockAdapter implements ILockAdapter {
     private readonly adapter;
     constructor(adapter: IDatabaseLockAdapter);
-    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>;
+    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/derivables/lock-provider/database-lock-adapter.js

@@ -1,7 +1,8 @@
+/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
 /**
  * @module Lock
  */
-import { UnexpectedError } from "../../../../utilities/_module-exports.js";
+import {} from "../../../../lock/contracts/_module-exports.js";
 /**
  * @internal
  */
@@ -10,36 +11,67 @@ export class DatabaseLockAdapter {
     constructor(adapter) {
         this.adapter = adapter;
     }
-    async acquire(key, owner, ttl) {
-        const expiration = ttl?.toEndDate() ?? null;
-        try {
-            // An error will be thrown if the lock already exists
-            await this.adapter.insert(key, owner, expiration);
-            return true;
-        }
-        catch (error) {
-            if (error instanceof UnexpectedError) {
-                throw error;
+    async acquire(key, lockId, ttl) {
+        return await this.adapter.transaction(async (trx) => {
+            const lockData = await trx.find(key);
+            if (lockData === null) {
+                await trx.upsert(key, lockId, ttl?.toEndDate() ?? null);
+                return true;
             }
-            const result = await this.adapter.update(key, owner, expiration);
-            return result > 0;
-        }
+            if (lockData.owner === lockId) {
+                return true;
+            }
+            if (lockData.expiration === null) {
+                return false;
+            }
+            if (lockData.expiration <= new Date()) {
+                await trx.upsert(key, lockId, ttl?.toEndDate() ?? null);
+                return true;
+            }
+            return lockData.expiration <= new Date();
+        });
     }
-    async release(key, owner) {
-        const lock = await this.adapter.find(key);
-        if (lock === null) {
+    async release(key, lockId) {
+        const lockData = await this.adapter.removeIfOwner(key, lockId);
+        if (lockData === null) {
+            return false;
+        }
+        const { expiration } = lockData;
+        const hasNoExpiration = expiration === null;
+        if (hasNoExpiration) {
             return true;
         }
-        await this.adapter.remove(key, owner);
-        const isOwner = lock.owner === owner;
-        return isOwner;
+        const { owner } = lockData;
+        const isNotExpired = expiration > new Date();
+        const isCurrentOwner = lockId === owner;
+        return isNotExpired && isCurrentOwner;
     }
     async forceRelease(key) {
-        await this.adapter.remove(key, null);
+        const lockData = await this.adapter.remove(key);
+        if (lockData === null) {
+            return false;
+        }
+        if (lockData.expiration === null) {
+            return true;
+        }
+        return lockData.expiration > new Date();
+    }
+    async refresh(key, lockId, ttl) {
+        const updateCount = await this.adapter.updateExpiration(key, lockId, ttl.toEndDate());
+        return Number(updateCount) > 0;
     }
-    async refresh(key, owner, ttl) {
-        const result = await this.adapter.refresh(key, owner, ttl.toEndDate());
-        return result > 0;
+    async getState(key) {
+        const lockData = await this.adapter.find(key);
+        if (lockData === null) {
+            return null;
+        }
+        if (lockData.expiration === null) {
+            return lockData;
+        }
+        if (lockData.expiration <= new Date()) {
+            return null;
+        }
+        return lockData;
     }
 }
 //# sourceMappingURL=database-lock-adapter.js.map

package/dist/lock/implementations/derivables/lock-provider/database-lock-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"database-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/derivables/lock-provider/database-lock-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,eAAe,EAAiB,MAAM,gCAAgC,CAAC;AAMhF;;GAEG;AACH,MAAM,OAAO,mBAAmB;IACC;IAA7B,YAA6B,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;IAAG,CAAC;IAE9D,KAAK,CAAC,OAAO,CACT,GAAW,EACX,KAAa,EACb,GAAoB;QAEpB,MAAM,UAAU,GAAG,GAAG,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC;QAE5C,IAAI,CAAC;YACD,qDAAqD;YACrD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YAClD,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACtB,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;gBACnC,MAAM,KAAK,CAAC;YAChB,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YACjE,OAAO,MAAM,GAAG,CAAC,CAAC;QACtB,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,KAAK,KAAK,CAAC;QACrC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAW;QAC1B,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW,EAAE,KAAa,EAAE,GAAa;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QACvE,OAAO,MAAM,GAAG,CAAC,CAAC;IACtB,CAAC;CACJ"}
+{"version":3,"file":"database-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/derivables/lock-provider/database-lock-adapter.ts"],"names":[],"mappings":"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"}

package/dist/lock/implementations/derivables/lock-provider/is-database-lock-adapter.d.ts

@@ -2,8 +2,8 @@
  * @module Lock
  */
 import type { IDatabaseLockAdapter } from "../../../../lock/contracts/_module-exports.js";
-import type { ILockAdapter } from "../../../../lock/contracts/_module-exports.js";
+import type { LockAdapterVariants } from "../../../../lock/contracts/_module-exports.js";
 /**
  * @internal
  */
-export declare function isDatabaseLockAdapter(adapter: ILockAdapter | IDatabaseLockAdapter): adapter is IDatabaseLockAdapter;
+export declare function isDatabaseLockAdapter(adapter: LockAdapterVariants): adapter is IDatabaseLockAdapter;

package/dist/lock/implementations/derivables/lock-provider/is-database-lock-adapter.js

@@ -3,14 +3,14 @@
  */
 export function isDatabaseLockAdapter(adapter) {
     const adapter_ = adapter;
-    return (typeof adapter_["insert"] === "function" &&
-        adapter_["insert"].length === 3 &&
-        typeof adapter_["update"] === "function" &&
-        adapter_["update"].length === 3 &&
+    return (typeof adapter_["transaction"] === "function" &&
+        adapter_["transaction"].length === 1 &&
         typeof adapter_["remove"] === "function" &&
-        adapter_["remove"].length === 2 &&
-        typeof adapter_["refresh"] === "function" &&
-        adapter_["refresh"].length === 3 &&
+        adapter_["remove"].length === 1 &&
+        typeof adapter_["removeIfOwner"] === "function" &&
+        adapter_["removeIfOwner"].length === 2 &&
+        typeof adapter_["updateExpiration"] === "function" &&
+        adapter_["updateExpiration"].length === 3 &&
         typeof adapter_["find"] === "function" &&
         adapter_["find"].length === 1);
 }

package/dist/lock/implementations/derivables/lock-provider/is-database-lock-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-database-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/derivables/lock-provider/is-database-lock-adapter.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACjC,OAA4C;IAE5C,MAAM,QAAQ,GAAG,OAEhB,CAAC;IACF,OAAO,CACH,OAAO,QAAQ,CAAC,QAAQ,CAAC,KAAK,UAAU;QACxC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC;QAC/B,OAAO,QAAQ,CAAC,QAAQ,CAAC,KAAK,UAAU;QACxC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC;QAC/B,OAAO,QAAQ,CAAC,QAAQ,CAAC,KAAK,UAAU;QACxC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC;QAC/B,OAAO,QAAQ,CAAC,SAAS,CAAC,KAAK,UAAU;QACzC,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC;QAChC,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,UAAU;QACtC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAChC,CAAC;AACN,CAAC"}
+{"version":3,"file":"is-database-lock-adapter.js","sourceRoot":"","sources":["../../../../../src/lock/implementations/derivables/lock-provider/is-database-lock-adapter.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACjC,OAA4B;IAE5B,MAAM,QAAQ,GAAG,OAEhB,CAAC;IAEF,OAAO,CACH,OAAO,QAAQ,CAAC,aAAa,CAAC,KAAK,UAAU;QAC7C,QAAQ,CAAC,aAAa,CAAC,CAAC,MAAM,KAAK,CAAC;QACpC,OAAO,QAAQ,CAAC,QAAQ,CAAC,KAAK,UAAU;QACxC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC;QAC/B,OAAO,QAAQ,CAAC,eAAe,CAAC,KAAK,UAAU;QAC/C,QAAQ,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,CAAC;QACtC,OAAO,QAAQ,CAAC,kBAAkB,CAAC,KAAK,UAAU;QAClD,QAAQ,CAAC,kBAAkB,CAAC,CAAC,MAAM,KAAK,CAAC;QACzC,OAAO,QAAQ,CAAC,MAAM,CAAC,KAAK,UAAU;QACtC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,CAChC,CAAC;AACN,CAAC"}

package/dist/lock/implementations/derivables/lock-provider/lock-provider.d.ts

@@ -1,13 +1,15 @@
 /**
  * @module Lock
  */
-import { TimeSpan, type Factory, type AsyncLazy, type Invokable } from "../../../../utilities/_module-exports.js";
-import { Namespace, type OneOrMore } from "../../../../utilities/_module-exports.js";
-import type { IDatabaseLockAdapter, LockEventMap } from "../../../../lock/contracts/_module-exports.js";
-import { type ILock, type LockProviderCreateSettings, type ILockProvider, type ILockAdapter } from "../../../../lock/contracts/_module-exports.js";
-import { LazyPromise } from "../../../../async/_module-exports.js";
+import { type Invokable } from "../../../../utilities/_module-exports.js";
+import { type OneOrMore } from "../../../../utilities/_module-exports.js";
+import type { LockAdapterVariants, LockEventMap } from "../../../../lock/contracts/_module-exports.js";
+import { type ILock, type LockProviderCreateSettings, type ILockProvider } from "../../../../lock/contracts/_module-exports.js";
+import type { Task } from "../../../../task/_module-exports.js";
 import type { EventListener, IEventBus, Unsubscribe } from "../../../../event-bus/contracts/_module-exports.js";
 import type { ISerderRegister } from "../../../../serde/contracts/_module-exports.js";
+import type { ITimeSpan } from "../../../../time-span/contracts/_module-exports.js";
+import { Namespace } from "../../../../namespace/_module-exports.js";
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock"`
@@ -17,31 +19,21 @@ export type LockProviderSettingsBase = {
     /**
      * @default
      * ```ts
-     * import { Namespace } from "@daiso-tech/core/utilities";
+     * import { Namespace } from "@daiso-tech/core/namespace";
      *
-     * new Namespace(["@", "lock"])
+     * new Namespace("@lock")
      * ```
      */
     namespace?: Namespace;
-    /**
-     * You can pass a {@link Factory | `Factory`} of {@link LazyPromise| `LazyPromise`} to configure default settings for all {@link LazyPromise| `LazyPromise`} instances used in the `LockProvider` class.
-     * @default
-     * ```ts
-     * import { LazyPromise } from "@daiso-tech/core/async";
-     *
-     * (invokable) => new LazyPromise(invokable)
-     * ```
-     */
-    lazyPromiseFactory?: Factory<AsyncLazy<any>, LazyPromise<any>>;
     serde: OneOrMore<ISerderRegister>;
     /**
      * @default ""
      */
     serdeTransformerName?: string;
     /**
-     * You can pass your owner id generator function.
+     * You can pass your lock id id generator function.
      */
-    createOwnerId?: Invokable<[], string>;
+    createLockId?: Invokable<[], string>;
     /**
      * @default
      * ```ts
@@ -61,7 +53,7 @@ export type LockProviderSettingsBase = {
      * TimeSpan.fromMinutes(5);
      * ```
      */
-    defaultTtl?: TimeSpan | null;
+    defaultTtl?: ITimeSpan | null;
     /**
      * The default refresh time used in the {@link ILock | `ILock`} `acquireBlocking` and `runBlocking` methods.
      * @default
@@ -69,7 +61,7 @@ export type LockProviderSettingsBase = {
      * TimeSpan.fromSeconds(1);
      * ```
      */
-    defaultBlockingInterval?: TimeSpan;
+    defaultBlockingInterval?: ITimeSpan;
     /**
      * The default refresh time used in the {@link ILock | `ILock`} `acquireBlocking` and `runBlocking` methods.
      * @default
@@ -77,29 +69,29 @@ export type LockProviderSettingsBase = {
      * TimeSpan.fromMinutes(1);
      * ```
      */
-    defaultBlockingTime?: TimeSpan;
+    defaultBlockingTime?: ITimeSpan;
     /**
      * The default refresh time used in the {@link ILock | `ILock`} `referesh` method.
      * ```ts
      * TimeSpan.fromMinutes(5);
      * ```
      */
-    defaultRefreshTime?: TimeSpan;
+    defaultRefreshTime?: ITimeSpan;
 };
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock"`
  * @group Derivables
  */
-export type LockAdapter = ILockAdapter | IDatabaseLockAdapter;
+export type LockProviderSettings = LockProviderSettingsBase & {
+    adapter: LockAdapterVariants;
+};
 /**
  *
  * IMPORT_PATH: `"@daiso-tech/core/lock"`
  * @group Derivables
  */
-export type LockProviderSettings = LockProviderSettingsBase & {
-    adapter: LockAdapter;
-};
+export declare const DEFAULT_LOCK_PROVIDER_NAMESPACE: Namespace;
 /**
  * `LockProvider` class can be derived from any {@link ILockAdapter | `ILockAdapter`} or {@link IDatabaseLockAdapter | `IDatabaseLockAdapter`}.
  *
@@ -111,17 +103,16 @@ export type LockProviderSettings = LockProviderSettingsBase & {
  * @group Derivables
  */
 export declare class LockProvider implements ILockProvider {
-    private lockStore;
     private readonly eventBus;
+    private readonly originalAdapter;
     private readonly adapter;
     private readonly namespace;
-    private readonly createOwnerId;
+    private readonly creatLockId;
     private readonly defaultTtl;
     private readonly defaultBlockingInterval;
     private readonly defaultBlockingTime;
     private readonly defaultRefreshTime;
     private readonly serde;
-    private readonly lazyPromiseFactory;
     private readonly serdeTransformerName;
     /**
      * @example
@@ -152,39 +143,38 @@ export declare class LockProvider implements ILockProvider {
      * You can listen to the following {@link LockEventMap | `LockEventMap`} of all {@link ILock | `ILock`} instances created by the {@link ILockProvider | `ILockProvider`}.
      * To understand how this method works, refer to {@link IEventListenable | `IEventListenable `}.
      */
-    addListener<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): LazyPromise<void>;
+    addListener<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): Task<void>;
     /**
      * You can listen to the following {@link LockEventMap | `LockEventMap`} of all {@link ILock | `ILock`} instances created by the {@link ILockProvider | `ILockProvider`}.
      * To understand how this method works, refer to {@link IEventListenable | `IEventListenable `}.
      */
-    removeListener<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): LazyPromise<void>;
+    removeListener<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): Task<void>;
     /**
      * You can listen to the following {@link LockEventMap | `LockEventMap`} of all {@link ILock | `ILock`} instances created by the {@link ILockProvider | `ILockProvider`}.
      * To understand how this method works, refer to {@link IEventListenable | `IEventListenable `}.
      */
-    listenOnce<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): LazyPromise<void>;
+    listenOnce<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): Task<void>;
     /**
      * You can listen to the following {@link LockEventMap | `LockEventMap`} of all {@link ILock | `ILock`} instances created by the {@link ILockProvider | `ILockProvider`}.
      * To understand how this method works, refer to {@link IEventListenable | `IEventListenable `}.
      */
-    asPromise<TEventName extends keyof LockEventMap>(eventName: TEventName): LazyPromise<LockEventMap[TEventName]>;
+    asPromise<TEventName extends keyof LockEventMap>(eventName: TEventName): Task<LockEventMap[TEventName]>;
     /**
      * You can listen to the following {@link LockEventMap | `LockEventMap`} of all {@link ILock | `ILock`} instances created by the {@link ILockProvider | `ILockProvider`}.
      * To understand how this method works, refer to {@link IEventListenable | `IEventListenable `}.
      */
-    subscribeOnce<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): LazyPromise<Unsubscribe>;
+    subscribeOnce<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): Task<Unsubscribe>;
     /**
      * You can listen to the following {@link LockEventMap | `LockEventMap`} of all {@link ILock | `ILock`} instances created by the {@link ILockProvider | `ILockProvider`}.
      * To understand how this method works, refer to {@link IEventListenable | `IEventListenable `}.
      */
-    subscribe<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): LazyPromise<Unsubscribe>;
-    private createLazyPromise;
+    subscribe<TEventName extends keyof LockEventMap>(eventName: TEventName, listener: EventListener<LockEventMap[TEventName]>): Task<Unsubscribe>;
     /**
      * @example
      * ```ts
      * import { LockProvider } from "@daiso-tech/core/lock";
      * import { MemoryLockAdapter } from "@daiso-tech/core/lock/adapters";
-     * import { Namespace } from "@daiso-tech/core/utilities";
+     * import { Namespace } from "@daiso-tech/core/namespace";
      * import { Serde } from "@daiso-tech/core/serde";
      * import { SuperJsonSerdeAdapter } from "@daiso-tech/core/serde/adapters";
      *
@@ -197,5 +187,5 @@ export declare class LockProvider implements ILockProvider {
      * const lock = lockProvider.create("a");
      * ```
      */
-    create(key: OneOrMore<string>, settings?: LockProviderCreateSettings): ILock;
+    create(key: string, settings?: LockProviderCreateSettings): ILock;
 }