namirasoft-node-redis 1.4.10 → 1.4.11

package/dist/RedisScopeDelay.js

@@ -33,6 +33,8 @@ class RedisScopeDelay extends RedisScope_1.RedisScope {
             console.log({ LastRun });
             if (!LastRun)
                 return;
+            LastRun = new Date(LastRun);
+            console.log({ LastRun });
             let difference = new Date().getTime() - LastRun.getTime();
             let delay_required = Math.max(delay_requested - difference, 0);
             console.log({ difference, delay_required });

package/dist/RedisScopeDelay.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisScopeDelay.js","sourceRoot":"","sources":["../src/RedisScopeDelay.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkE;AAElE,6CAA0C;AAU1C,MAAsB,eAA4B,SAAQ,uBAAgB;IAGtE,YAAY,QAAuB,EAAE,MAAkC;QAEnE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAEK,IAAI,CAAC,aAAyB,EAAE,SAAmC;;YAErE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;YACvD,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,UAAU;gBACnE,OAAO;YAEX,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAGlC,IAAI,eAAe,GAAG,mCAAiB,CAAC,cAAc,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;YACpG,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,CAAA;YACrC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;YAEhF,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAE1C,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YACxB,IAAI,CAAC,OAAO;gBACR,OAAO;YAEX,IAAI,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1D,IAAI,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC;YAE/D,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;YAC3C,IAAI,cAAc,GAAG,CAAC;gBAClB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QAC1E,CAAC;KAAA;IACK,OAAO,CAAC,aAAyB,EAAE,SAAmC;;YAExE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;YAC1D,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,UAAU;gBACnE,OAAO;YAEX,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC5C,CAAC;KAAA;CACJ;AAhDD,0CAgDC;AAAA,CAAC"}
+{"version":3,"file":"RedisScopeDelay.js","sourceRoot":"","sources":["../src/RedisScopeDelay.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAkE;AAElE,6CAA0C;AAU1C,MAAsB,eAA4B,SAAQ,uBAAgB;IAGtE,YAAY,QAAuB,EAAE,MAAkC;QAEnE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IAEK,IAAI,CAAC,aAAyB,EAAE,SAAmC;;YAErE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;YACvD,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,UAAU;gBACnE,OAAO;YAEX,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAGlC,IAAI,eAAe,GAAG,mCAAiB,CAAC,cAAc,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;YACpG,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,CAAA;YACrC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC,CAAC;YAEhF,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC1C,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YACxB,IAAI,CAAC,OAAO;gBACR,OAAO;YACX,OAAO,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YAExB,IAAI,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAC1D,IAAI,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,eAAe,GAAG,UAAU,EAAE,CAAC,CAAC,CAAC;YAE/D,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAA;YAC3C,IAAI,cAAc,GAAG,CAAC;gBAClB,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;QAC1E,CAAC;KAAA;IACK,OAAO,CAAC,aAAyB,EAAE,SAAmC;;YAExE,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC,CAAA;YAC1D,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,UAAU;gBACnE,OAAO;YAEX,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAClC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC5C,CAAC;KAAA;CACJ;AAjDD,0CAiDC;AAAA,CAAC"}

package/package.json

@@ -8,7 +8,7 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.4.10",
+    "version": "1.4.11",
     "author": "Amir Abolhasani",
     "license": "MIT",
     "main": "./dist/index.js",

package/src/RedisInstance.ts

@@ -1,18 +1,18 @@
-import * as Redis from "ioredis";
-import { Logger } from "namirasoft-log";
-
-export abstract class RedisInstance
-{
-    public client!: Redis.Redis;
-    constructor(host: string, port: number, password: string, db: number = 0)
-    {
-        if (!process.env.NAMIRASOFT_MUTE)
-            this.client = new Redis.Redis({ host, port, password, db });
-        Logger.main?.success(`Redis was connected to: ${host}:${port}`);
-        this.disconnect = this.disconnect.bind(this);
-    }
-    disconnect()
-    {
-        this.client?.disconnect();
-    }
+import * as Redis from "ioredis";
+import { Logger } from "namirasoft-log";
+
+export abstract class RedisInstance
+{
+    public client!: Redis.Redis;
+    constructor(host: string, port: number, password: string, db: number = 0)
+    {
+        if (!process.env.NAMIRASOFT_MUTE)
+            this.client = new Redis.Redis({ host, port, password, db });
+        Logger.main?.success(`Redis was connected to: ${host}:${port}`);
+        this.disconnect = this.disconnect.bind(this);
+    }
+    disconnect()
+    {
+        this.client?.disconnect();
+    }
 };

package/src/RedisScope.ts

@@ -1,53 +1,53 @@
-import { EncodingOperation } from "namirasoft-core";
-import { RedisInstance } from "./RedisInstance";
-
-export abstract class RedisScope<V>
-{
-    protected instance: RedisInstance;
-    constructor(instance: RedisInstance)
-    {
-        this.instance = instance;
-        this._get = this._get.bind(this);
-        this._set = this._set.bind(this);
-        this._del = this._del.bind(this);
-    }
-    protected async _get(key: string, base64: boolean): Promise<V | null>
-    {
-        if (process.env.NAMIRASOFT_MUTE)
-            return null;
-        let data = await this.instance.client.get(key);
-        if (data)
-        {
-            if (base64)
-                data = EncodingOperation.Base64Decode(data);
-            return JSON.parse(data) as V;
-        }
-        return null;
-    }
-    protected async _set(key: string, value: V, base64: boolean, ttl_seconds?: number, NotExists: boolean = false)
-    {
-        if (process.env.NAMIRASOFT_MUTE)
-            return null;
-        let data = JSON.stringify(value);
-        if (base64)
-            data = EncodingOperation.Base64Encode(data);
-        if (NotExists)
-        {
-            if (ttl_seconds)
-                return await this.instance.client.set(key, data, "EX", ttl_seconds, "NX");
-            return await this.instance.client.set(key, data, "NX");
-        }
-        else 
-        {
-            if (ttl_seconds)
-                return await this.instance.client.set(key, data, "EX", ttl_seconds);
-            return await this.instance.client.set(key, data);
-        }
-    }
-    protected async _del(key: string)
-    {
-        if (process.env.NAMIRASOFT_MUTE)
-            return;
-        await this.instance.client.del(key);
-    }
+import { EncodingOperation } from "namirasoft-core";
+import { RedisInstance } from "./RedisInstance";
+
+export abstract class RedisScope<V>
+{
+    protected instance: RedisInstance;
+    constructor(instance: RedisInstance)
+    {
+        this.instance = instance;
+        this._get = this._get.bind(this);
+        this._set = this._set.bind(this);
+        this._del = this._del.bind(this);
+    }
+    protected async _get(key: string, base64: boolean): Promise<V | null>
+    {
+        if (process.env.NAMIRASOFT_MUTE)
+            return null;
+        let data = await this.instance.client.get(key);
+        if (data)
+        {
+            if (base64)
+                data = EncodingOperation.Base64Decode(data);
+            return JSON.parse(data) as V;
+        }
+        return null;
+    }
+    protected async _set(key: string, value: V, base64: boolean, ttl_seconds?: number, NotExists: boolean = false)
+    {
+        if (process.env.NAMIRASOFT_MUTE)
+            return null;
+        let data = JSON.stringify(value);
+        if (base64)
+            data = EncodingOperation.Base64Encode(data);
+        if (NotExists)
+        {
+            if (ttl_seconds)
+                return await this.instance.client.set(key, data, "EX", ttl_seconds, "NX");
+            return await this.instance.client.set(key, data, "NX");
+        }
+        else 
+        {
+            if (ttl_seconds)
+                return await this.instance.client.set(key, data, "EX", ttl_seconds);
+            return await this.instance.client.set(key, data);
+        }
+    }
+    protected async _del(key: string)
+    {
+        if (process.env.NAMIRASOFT_MUTE)
+            return;
+        await this.instance.client.del(key);
+    }
 };

package/src/RedisScopeDelay.ts

@@ -1,61 +1,62 @@
-import { DurationUnit, TimeUnitOperation } from "namirasoft-core";
-import { RedisInstance } from "./RedisInstance";
-import { RedisScope } from "./RedisScope";
-import { RedisScopeLock } from "./RedisScopeLock";
-
-export type RedisScopeDelayParameter = {
-    id: string;
-    delay: boolean;
-    delay_value: number | null;
-    delay_unit: DurationUnit | null;
-};
-
-export abstract class RedisScopeDelay<Parameters> extends RedisScope<Date>
-{
-    private locker: RedisScopeLock<Parameters>;
-    constructor(instance: RedisInstance, locker: RedisScopeLock<Parameters>)
-    {
-        super(instance);
-        this.locker = locker;
-        this.key = this.key.bind(this);
-        this.wait = this.wait.bind(this);
-        this.release = this.release.bind(this);
-    }
-    protected abstract key(key_parameter: Parameters): string;
-    async wait(key_parameter: Parameters, parameter: RedisScopeDelayParameter): Promise<void>
-    {
-        console.log({ name: "wait", key_parameter, parameter })
-        if (!parameter.delay || !parameter.delay_value || !parameter.delay_unit)
-            return;
-
-        let key = this.key(key_parameter);
-
-
-        let delay_requested = TimeUnitOperation.toMilliseconds(parameter.delay_value, parameter.delay_unit);
-        console.log({ key, delay_requested })
-        await this.locker.waitForLock(key_parameter, Math.ceil(delay_requested / 1000));
-
-        let LastRun = await this._get(key, false);
-
-        console.log({ LastRun })
-        if (!LastRun)
-            return;
-
-        let difference = new Date().getTime() - LastRun.getTime();
-        let delay_required = Math.max(delay_requested - difference, 0);
-
-        console.log({ difference, delay_required })
-        if (delay_required > 0)
-            await new Promise(resolve => setTimeout(resolve, delay_required));
-    }
-    async release(key_parameter: Parameters, parameter: RedisScopeDelayParameter)
-    {
-        console.log({ name: "release", key_parameter, parameter })
-        if (!parameter.delay || !parameter.delay_value || !parameter.delay_unit)
-            return;
-
-        let key = this.key(key_parameter);
-        await this._set(key, new Date(), false);
-        await this.locker.unlock(key_parameter);
-    }
+import { DurationUnit, TimeUnitOperation } from "namirasoft-core";
+import { RedisInstance } from "./RedisInstance";
+import { RedisScope } from "./RedisScope";
+import { RedisScopeLock } from "./RedisScopeLock";
+
+export type RedisScopeDelayParameter = {
+    id: string;
+    delay: boolean;
+    delay_value: number | null;
+    delay_unit: DurationUnit | null;
+};
+
+export abstract class RedisScopeDelay<Parameters> extends RedisScope<Date>
+{
+    private locker: RedisScopeLock<Parameters>;
+    constructor(instance: RedisInstance, locker: RedisScopeLock<Parameters>)
+    {
+        super(instance);
+        this.locker = locker;
+        this.key = this.key.bind(this);
+        this.wait = this.wait.bind(this);
+        this.release = this.release.bind(this);
+    }
+    protected abstract key(key_parameter: Parameters): string;
+    async wait(key_parameter: Parameters, parameter: RedisScopeDelayParameter): Promise<void>
+    {
+        console.log({ name: "wait", key_parameter, parameter })
+        if (!parameter.delay || !parameter.delay_value || !parameter.delay_unit)
+            return;
+
+        let key = this.key(key_parameter);
+
+
+        let delay_requested = TimeUnitOperation.toMilliseconds(parameter.delay_value, parameter.delay_unit);
+        console.log({ key, delay_requested })
+        await this.locker.waitForLock(key_parameter, Math.ceil(delay_requested / 1000));
+
+        let LastRun = await this._get(key, false);
+        console.log({ LastRun })
+        if (!LastRun)
+            return;
+        LastRun = new Date(LastRun);
+        console.log({ LastRun })
+
+        let difference = new Date().getTime() - LastRun.getTime();
+        let delay_required = Math.max(delay_requested - difference, 0);
+
+        console.log({ difference, delay_required })
+        if (delay_required > 0)
+            await new Promise(resolve => setTimeout(resolve, delay_required));
+    }
+    async release(key_parameter: Parameters, parameter: RedisScopeDelayParameter)
+    {
+        console.log({ name: "release", key_parameter, parameter })
+        if (!parameter.delay || !parameter.delay_value || !parameter.delay_unit)
+            return;
+
+        let key = this.key(key_parameter);
+        await this._set(key, new Date(), false);
+        await this.locker.unlock(key_parameter);
+    }
 };

package/src/RedisScopeLimit.ts

@@ -1,63 +1,63 @@
-import { DurationUnit, TimeOperation, TimeUnitOperation } from "namirasoft-core";
-import { RedisInstance } from "./RedisInstance";
-import { RedisScope } from "./RedisScope";
-
-export type RedisScopeLimitParameter = {
-    id: string;
-    name: string;
-    limit: boolean;
-    limit_count: number | null;
-    limit_per_value: number | null;
-    limit_per_unit: DurationUnit | null;
-};
-
-export abstract class RedisScopeLimit<Parameters> extends RedisScope<number>
-{
-    constructor(instance: RedisInstance)
-    {
-        super(instance);
-        this.key = this.key.bind(this);
-        this.getCount = this.getCount.bind(this);
-        this.add = this.add.bind(this);
-        this.del = this.del.bind(this);
-    }
-    protected abstract key(key_parameter: Parameters): string;
-    async getCount(key_parameter: Parameters, limit_per_value: number, limit_per_unit: DurationUnit): Promise<number>
-    {
-        let key = this.key(key_parameter);
-
-        let milliseconds = TimeUnitOperation.toMilliseconds(limit_per_value, limit_per_unit);
-        let date_finish = new Date();
-        let date_start = TimeOperation.millisecondsAgo(milliseconds, date_finish);
-
-        return await this.instance.client.zcount(key, date_start.getTime(), date_finish.getTime());
-    }
-    async add(key_parameter: Parameters, limit_per_value: number, limit_per_unit: DurationUnit)
-    {
-        let key = this.key(key_parameter);
-
-        let milliseconds = TimeUnitOperation.toMilliseconds(limit_per_value, limit_per_unit);
-        let date_finish = new Date();
-        let date_start = TimeOperation.millisecondsAgo(milliseconds, date_finish)
-
-        await this.instance.client.zadd(key, date_finish.getTime(), date_finish.getTime());
-        await this.instance.client.zremrangebyscore(key, 0, date_start.getTime());
-    }
-    async del(key_parameter: Parameters)
-    {
-        let key = this.key(key_parameter);
-        await this._del(key);
-    }
-    async check(key_parameter: Parameters, parameter: RedisScopeLimitParameter)
-    {
-        if (parameter.limit)
-            if (parameter.limit_count && parameter.limit_per_value && parameter.limit_per_unit)
-            {
-                let count = await this.getCount(key_parameter, parameter.limit_per_value, parameter.limit_per_unit);
-                if (count < parameter.limit_count)
-                    await this.add(key_parameter, parameter.limit_per_value, parameter.limit_per_unit);
-                else
-                    throw new Error(`Limit has reached for '${parameter.name}' '${parameter.id}' for ${parameter.limit_count} messages every ${parameter.limit_per_value} ${parameter.limit_per_unit}`);
-            }
-    }
+import { DurationUnit, TimeOperation, TimeUnitOperation } from "namirasoft-core";
+import { RedisInstance } from "./RedisInstance";
+import { RedisScope } from "./RedisScope";
+
+export type RedisScopeLimitParameter = {
+    id: string;
+    name: string;
+    limit: boolean;
+    limit_count: number | null;
+    limit_per_value: number | null;
+    limit_per_unit: DurationUnit | null;
+};
+
+export abstract class RedisScopeLimit<Parameters> extends RedisScope<number>
+{
+    constructor(instance: RedisInstance)
+    {
+        super(instance);
+        this.key = this.key.bind(this);
+        this.getCount = this.getCount.bind(this);
+        this.add = this.add.bind(this);
+        this.del = this.del.bind(this);
+    }
+    protected abstract key(key_parameter: Parameters): string;
+    async getCount(key_parameter: Parameters, limit_per_value: number, limit_per_unit: DurationUnit): Promise<number>
+    {
+        let key = this.key(key_parameter);
+
+        let milliseconds = TimeUnitOperation.toMilliseconds(limit_per_value, limit_per_unit);
+        let date_finish = new Date();
+        let date_start = TimeOperation.millisecondsAgo(milliseconds, date_finish);
+
+        return await this.instance.client.zcount(key, date_start.getTime(), date_finish.getTime());
+    }
+    async add(key_parameter: Parameters, limit_per_value: number, limit_per_unit: DurationUnit)
+    {
+        let key = this.key(key_parameter);
+
+        let milliseconds = TimeUnitOperation.toMilliseconds(limit_per_value, limit_per_unit);
+        let date_finish = new Date();
+        let date_start = TimeOperation.millisecondsAgo(milliseconds, date_finish)
+
+        await this.instance.client.zadd(key, date_finish.getTime(), date_finish.getTime());
+        await this.instance.client.zremrangebyscore(key, 0, date_start.getTime());
+    }
+    async del(key_parameter: Parameters)
+    {
+        let key = this.key(key_parameter);
+        await this._del(key);
+    }
+    async check(key_parameter: Parameters, parameter: RedisScopeLimitParameter)
+    {
+        if (parameter.limit)
+            if (parameter.limit_count && parameter.limit_per_value && parameter.limit_per_unit)
+            {
+                let count = await this.getCount(key_parameter, parameter.limit_per_value, parameter.limit_per_unit);
+                if (count < parameter.limit_count)
+                    await this.add(key_parameter, parameter.limit_per_value, parameter.limit_per_unit);
+                else
+                    throw new Error(`Limit has reached for '${parameter.name}' '${parameter.id}' for ${parameter.limit_count} messages every ${parameter.limit_per_value} ${parameter.limit_per_unit}`);
+            }
+    }
 };

package/src/RedisScopeLock.ts

@@ -1,35 +1,35 @@
-import { RedisInstance } from "./RedisInstance";
-import { RedisScope } from "./RedisScope";
-
-export abstract class RedisScopeLock<Parameters> extends RedisScope<number>
-{
-    constructor(instance: RedisInstance, private ttl_seconds: number)
-    {
-        super(instance);
-        this.lock = this.lock.bind(this);
-        this.waitForLock = this.waitForLock.bind(this);
-        this.unlock = this.unlock.bind(this);
-    }
-    protected abstract key(key_parameter: Parameters): string;
-    async lock(key_parameter: Parameters, ttl_seconds?: number): Promise<boolean>
-    {
-        let ans = await this._set(this.key(key_parameter), Math.random(), true, ttl_seconds ?? this.ttl_seconds);
-        if (ans)
-            return true;
-        return false;
-    }
-    async waitForLock(key_parameter: Parameters, ttl_seconds?: number): Promise<void>
-    {
-        while (true)
-        {
-            let ans = await this.lock(key_parameter, ttl_seconds);
-            if (ans)
-                break;
-            await new Promise(res => setTimeout(res, 10));
-        }
-    }
-    async unlock(key_parameter: Parameters)
-    {
-        await this._del(this.key(key_parameter));
-    }
+import { RedisInstance } from "./RedisInstance";
+import { RedisScope } from "./RedisScope";
+
+export abstract class RedisScopeLock<Parameters> extends RedisScope<number>
+{
+    constructor(instance: RedisInstance, private ttl_seconds: number)
+    {
+        super(instance);
+        this.lock = this.lock.bind(this);
+        this.waitForLock = this.waitForLock.bind(this);
+        this.unlock = this.unlock.bind(this);
+    }
+    protected abstract key(key_parameter: Parameters): string;
+    async lock(key_parameter: Parameters, ttl_seconds?: number): Promise<boolean>
+    {
+        let ans = await this._set(this.key(key_parameter), Math.random(), true, ttl_seconds ?? this.ttl_seconds);
+        if (ans)
+            return true;
+        return false;
+    }
+    async waitForLock(key_parameter: Parameters, ttl_seconds?: number): Promise<void>
+    {
+        while (true)
+        {
+            let ans = await this.lock(key_parameter, ttl_seconds);
+            if (ans)
+                break;
+            await new Promise(res => setTimeout(res, 10));
+        }
+    }
+    async unlock(key_parameter: Parameters)
+    {
+        await this._del(this.key(key_parameter));
+    }
 };

package/src/index.ts

@@ -1,5 +1,5 @@
-export * from "./RedisInstance";
-export * from "./RedisScope";
-export * from "./RedisScopeDelay";
-export * from "./RedisScopeLimit";
+export * from "./RedisInstance";
+export * from "./RedisScope";
+export * from "./RedisScopeDelay";
+export * from "./RedisScopeLimit";
 export * from "./RedisScopeLock";