@daiso-tech/core 0.43.2 → 0.44.0

package/dist/rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-storage.js

@@ -3,9 +3,8 @@
  */
 import {} from "../../../../backoff-policies/_module.js";
 import { RATE_LIMITER_STATE, } from "../../../../rate-limiter/contracts/_module.js";
-import {} from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-policy.js";
-import { TimeSpan } from "../../../../time-span/implementations/time-span.js";
-import { callInvokable } from "../../../../utilities/_module.js";
+import {} from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/internal-rate-limiter-policy.js";
+import {} from "../../../../utilities/_module.js";
 /**
  * @internal
  */
@@ -19,12 +18,31 @@ export class RateLimiterStorage {
         this.rateLimiterPolicy = rateLimiterPolicy;
         this.backoffPolicy = backoffPolicy;
     }
+    static resolveStorageData(data) {
+        if (data === null) {
+            return null;
+        }
+        if (data.expiration <= new Date()) {
+            return null;
+        }
+        return data.state;
+    }
+    toAdapterState(state) {
+        const currentDate = new Date();
+        return {
+            success: state.type === RATE_LIMITER_STATE.ALLOWED,
+            attempt: this.rateLimiterPolicy.getAttempts(state, currentDate),
+            resetTime: this.rateLimiterPolicy.getExpiration(state, {
+                backoffPolicy: this.backoffPolicy,
+                currentDate,
+            }),
+        };
+    }
     async atomicUpdate(args) {
         const currentDate = new Date();
         const state = await this.adapter.transaction(async (trx) => {
-            const data = await this.adapter.find(args.key);
-            let currentState = data?.state;
-            if (currentState === undefined) {
+            let currentState = RateLimiterStorage.resolveStorageData(await this.adapter.find(args.key));
+            if (currentState === null) {
                 currentState = this.rateLimiterPolicy.initialState(currentDate);
             }
             const newState = args.update(currentState);
@@ -36,21 +54,12 @@ export class RateLimiterStorage {
         });
         return this.toAdapterState(state);
     }
-    toAdapterState(state) {
-        return {
-            success: state.type === RATE_LIMITER_STATE.ALLOWED,
-            attempt: state.attempt,
-            resetTime: state.type === RATE_LIMITER_STATE.ALLOWED
-                ? null
-                : TimeSpan.fromTimeSpan(callInvokable(this.backoffPolicy, state.attempt, null)).toEndDate(new Date(state.startedAt)),
-        };
-    }
     async find(key) {
-        const data = await this.adapter.find(key);
-        if (data === null) {
+        const state = RateLimiterStorage.resolveStorageData(await this.adapter.find(key));
+        if (state === null) {
             return null;
         }
-        return this.toAdapterState(data.state);
+        return this.toAdapterState(state);
     }
     async remove(key) {
         await this.adapter.remove(key);

package/dist/rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limiter-storage.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-storage.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,EACH,kBAAkB,GAErB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAGN,MAAM,8FAA8F,CAAC;AACtG,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AACpE,OAAO,EAAE,aAAa,EAAoB,MAAM,wBAAwB,CAAC;AA+BzE;;GAEG;AACH,MAAM,OAAO,kBAAkB;IACV,OAAO,CAEtB;IACe,iBAAiB,CAA8B;IAC/C,aAAa,CAAgB;IAE9C,YAAY,QAA8C;QACtD,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,GAAG,QAAQ,CAAC;QAE/D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,YAAY,CACd,IAAgC;QAEhC,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACvD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/C,IAAI,YAAY,GAAG,IAAI,EAAE,KAAK,CAAC;YAC/B,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC7B,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAE3C,MAAM,GAAG,CAAC,MAAM,CACZ,IAAI,CAAC,GAAG,EACR,QAAQ,EACR,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,QAAQ,EAAE;gBAC3C,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,WAAW;aACd,CAAC,CACL,CAAC;YAEF,OAAO,QAAQ,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAEO,cAAc,CAClB,KAAoC;QAEpC,OAAO;YACH,OAAO,EAAE,KAAK,CAAC,IAAI,KAAK,kBAAkB,CAAC,OAAO;YAClD,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,SAAS,EACL,KAAK,CAAC,IAAI,KAAK,kBAAkB,CAAC,OAAO;gBACrC,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,QAAQ,CAAC,YAAY,CACjB,aAAa,CACT,IAAI,CAAC,aAAa,EAClB,KAAK,CAAC,OAAO,EACb,IAAI,CACP,CACJ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SACnD,CAAC;IACN,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAW;QAClB,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,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACpB,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;CACJ"}
+{"version":3,"file":"rate-limiter-storage.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-storage.ts"],"names":[],"mappings":"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"}

package/dist/rate-limiter/implementations/adapters/no-op-rate-limiter-adapter/no-op-rate-limiter-adapter.js

@@ -2,6 +2,7 @@
  * @module RateLimiter
  */
 import {} from "../../../../rate-limiter/contracts/_module.js";
+import { TimeSpan } from "../../../../time-span/implementations/time-span.js";
 /**
  * IMPORT_PATH: `"@daiso-tech/core/rate-limiter/no-op-rate-limiter-adapter"`
  * @group Adapters
@@ -11,7 +12,7 @@ export class NoOpRateLimiterAdapter {
         return Promise.resolve({
             success: true,
             attempt: 1,
-            resetTime: null,
+            resetTime: TimeSpan.fromMilliseconds(1),
         });
     }
     updateState(_key, limit) {
@@ -19,7 +20,7 @@ export class NoOpRateLimiterAdapter {
             success: true,
             attempt: 1,
             limit,
-            resetTime: null,
+            resetTime: TimeSpan.fromMilliseconds(1),
         });
     }
     reset(_key) {

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

@@ -1 +1 @@
-{"version":3,"file":"no-op-rate-limiter-adapter.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/no-op-rate-limiter-adapter/no-op-rate-limiter-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAGN,MAAM,qCAAqC,CAAC;AAE7C;;;GAGG;AACH,MAAM,OAAO,sBAAsB;IAC/B,QAAQ,CAAC,IAAY;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,CAAC;YACV,SAAS,EAAE,IAAI;SAClB,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CACP,IAAY,EACZ,KAAa;QAEb,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,CAAC;YACV,KAAK;YACL,SAAS,EAAE,IAAI;SAClB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,IAAY;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ"}
+{"version":3,"file":"no-op-rate-limiter-adapter.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/no-op-rate-limiter-adapter/no-op-rate-limiter-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAGN,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,0CAA0C,CAAC;AAEpE;;;GAGG;AACH,MAAM,OAAO,sBAAsB;IAC/B,QAAQ,CAAC,IAAY;QACjB,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,CAAC;YACV,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAC1C,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CACP,IAAY,EACZ,KAAa;QAEb,OAAO,OAAO,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,CAAC;YACV,KAAK;YACL,SAAS,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC;SAC1C,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,IAAY;QACd,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ"}

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/fixed-window-limiter-lua.d.ts

@@ -4,4 +4,4 @@
 /**
  * @internal
  */
-export declare const fixedWindowLimiterLua = "\n-- @param settings Required<SerializedFixedWindowLimiterSettings>\n-- @return IRateLimiterPolicy<FixedWindowLimiterState>\nlocal function FixedWindowLimiter(settings)\n    return {\n        -- @param currentDate number\n        -- @return FixedWindowLimiterState\n        initialMetrics = function(currentDate)\n            return {\n                attempt = 0,\n                lastAttemptAt = currentDate\n            }\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param limit number\n        -- @param currentDate number\n        shouldBlock = function(currentMetrics, limit, currentDate)\n            local timeSinceLastAttempt = currentDate + currentMetrics.lastAttemptAt\n            return timeSinceLastAttempt < settings.window and currentMetrics.attempt >= limit\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param _currentDate number\n        -- @return number\n        getExpiration = function(currentMetrics, _currentDate)\n            return settings.window + currentMetrics.lastAttemptAt\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param _currentDate number\n        -- @return number\n        getAttempts = function(currentMetrics, _currentDate)\n            return currentMetrics.attempt\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param currentDate number\n        -- @return FixedWindowLimiterState\n        updateMetrics = function(currentMetrics, currentDate)\n            return {\n                attempt = currentMetrics.attempt + 1,\n                lastAttemptAt = currentDate\n            }\n        end\n    }\nend\n";
+export declare const fixedWindowLimiterLua = "\n-- @param settings Required<SerializedFixedWindowLimiterSettings>\n-- @return IRateLimiterPolicy<FixedWindowLimiterState>\nlocal function FixedWindowLimiter(settings)\n    return {\n        -- @param currentDate number\n        -- @return FixedWindowLimiterState\n        initialMetrics = function(currentDate)\n            return {\n                attempt = 0,\n                lastAttemptAt = currentDate\n            }\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param limit number\n        -- @param currentDate number\n        shouldBlock = function(currentMetrics, limit, currentDate)\n            local timeSinceLastAttempt = currentDate - currentMetrics.lastAttemptAt\n            return timeSinceLastAttempt < settings.window and currentMetrics.attempt > limit\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param _currentDate number\n        -- @return number\n        getExpiration = function(currentMetrics, _currentDate)\n            return settings.window + currentMetrics.lastAttemptAt\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param _currentDate number\n        -- @return number\n        getAttempts = function(currentMetrics, _currentDate)\n            return currentMetrics.attempt\n        end,\n\n        -- @param currentMetrics FixedWindowLimiterState\n        -- @param currentDate number\n        -- @return FixedWindowLimiterState\n        updateMetrics = function(currentMetrics, currentDate)\n            return {\n                attempt = currentMetrics.attempt + 1,\n                lastAttemptAt = currentDate\n            }\n        end\n    }\nend\n";

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/fixed-window-limiter-lua.js

@@ -22,8 +22,8 @@ local function FixedWindowLimiter(settings)
         -- @param limit number
         -- @param currentDate number
         shouldBlock = function(currentMetrics, limit, currentDate)
-            local timeSinceLastAttempt = currentDate + currentMetrics.lastAttemptAt
-            return timeSinceLastAttempt < settings.window and currentMetrics.attempt >= limit
+            local timeSinceLastAttempt = currentDate - currentMetrics.lastAttemptAt
+            return timeSinceLastAttempt < settings.window and currentMetrics.attempt > limit
         end,
 
         -- @param currentMetrics FixedWindowLimiterState

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/{rate-limiter-policy-lua.js → internal-rate-limiter-policy-lua.js}

@@ -8,14 +8,23 @@ import { RATE_LIMITER_STATE } from "../../../../../rate-limiter/contracts/_modul
 export const rateLimiterPolicyLua = `
 -- @template TMetrics
 -- @param rateLimiterPolicy IRateLimiterPolicy
-local function RateLimiterPolicy(rateLimiterPolicy)
+local function InternalRateLimiterPolicy(rateLimiterPolicy)
     return {
-        -- @param currentState AllowedRateLimiterState<TMetrics>
+        -- @param currentDate number
+        -- @return AllowedState<TMetrics>
+        initialState = function(currentDate)
+            return {
+                type = "${RATE_LIMITER_STATE.ALLOWED}",
+                metrics = rateLimiterPolicy.initialMetrics(currentDate)
+            }
+        end,
+
+        -- @param currentState AllowedState<TMetrics>
         -- @param limit number
         -- @param currentDate number
-        -- @return AllowedRateLimiterState<TMetrics>
+        -- @return AllRateLimiterState<TMetrics>
         whenAllowed = function(currentState, limit, currentDate)
-            if rateLimiterPolicy.shouldBlock(currentState, limit, currentDate) then
+            if rateLimiterPolicy.shouldBlock(currentState.metrics, limit, currentDate) then
                 return {
                     type = "${RATE_LIMITER_STATE.BLOCKED}",
                     attempt = 1,
@@ -26,57 +35,66 @@ local function RateLimiterPolicy(rateLimiterPolicy)
             return currentState
         end,
 
-        -- @param currentState BlockedRateLimiterState
+        -- @param currentState BlockedState
         -- @param settings BackoffPolicySettings
         -- @return AllRateLimiterState<TMetrics>
         whenBlocked = function(currentState, settings)
-            local endDate = settings.backoffPolicy(currentState.attempt, nil) + currentState.startedAt
+            local waitTime = settings.backoffPolicy(currentState.attempt, nil)
+            local endDate = currentState.startedAt + waitTime
             local isWaitTimeOver = endDate <= settings.currentDate
 
             if isWaitTimeOver then
-                local currentMetrics = rateLimiterPolicy.initialMetrics(settings.currentDate)
                 return {
-                    attempt = rateLimiterPolicy.getAttempts(currentMetrics, settings.currentDate),
                     type = "${RATE_LIMITER_STATE.ALLOWED}",
-                    metrics = currentMetrics
+                    metrics = rateLimiterPolicy.initialMetrics(settings.currentDate),
                 }
             end
 
             return currentState
         end,
 
-        -- @param currentState AllowedRateLimiterState<TMetrics>
+        -- @param currentState AllowedState<TMetrics>
         -- @param currentDate number
-        -- @return AllowedRateLimiterState<TMetrics>
+        -- @return AllowedState<TMetrics>
         trackWhenAllowed = function(currentState, currentDate)
             return {
                 type = currentState.type,
-                attempt = currentState.attempt,
-                metrics = rateLimiterPolicy.updateMetrics(currentState.metrics, currentDate)
+                metrics = rateLimiterPolicy.updateMetrics(currentState.metrics, currentDate),
             }
         end,
 
-        -- @param currentState BlockedRateLimiterState
-        -- @return BlockedRateLimiterState
+        -- @param currentState BlockedState
+        -- @return BlockedState
         trackWhenBlocked = function(currentState)
             return {
                 type = currentState.type,
                 startedAt = currentState.startedAt,
-                attempt = currentState.attempt + 1
-            }
+                attempt = currentState.attempt + 1,
+            };
         end,
 
-        -- @param AllRateLimiterState<TMetrics>
+        -- @param currentState AllRateLimiterState<TMetrics>
         -- @param settings BackoffPolicySettings
         -- @return number
         getExpiration = function(currentState, settings)
             if currentState.type == "${RATE_LIMITER_STATE.ALLOWED}" then
-                return rateLimiterPolicy.getExpiration(currentState.metrics, settings.currentDate)
+                return rateLimiterPolicy.getExpiration(currentState.metrics, settings.currentDate);
             end
 
             return settings.backoffPolicy(currentState.attempt, nil) + settings.currentDate
+        end,
+
+        -- @param currentState AllRateLimiterState<TMetrics>
+        -- @param currentDate number
+        -- @return number
+        getAttempts = function(currentState, currentDate)
+            if currentState.type == "${RATE_LIMITER_STATE.ALLOWED}" then
+                return rateLimiterPolicy.getAttempts(currentState.metrics, currentDate);
+            end
+
+            return currentState.attempt
         end
     }
 end
 `;
-//# sourceMappingURL=rate-limiter-policy-lua.js.map
+//# sourceMappingURL=internal-rate-limiter-policy-lua.js.map

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/internal-rate-limiter-policy-lua.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-rate-limiter-policy-lua.js","sourceRoot":"","sources":["../../../../../../src/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/internal-rate-limiter-policy-lua.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;;;;;;0BASV,kBAAkB,CAAC,OAAO;;;;;;;;;;;;8BAYtB,kBAAkB,CAAC,OAAO;;;;;;;;;;;;;;;;;;;8BAmB1B,kBAAkB,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAgCjB,kBAAkB,CAAC,OAAO;;;;;;;;;;;uCAW1B,kBAAkB,CAAC,OAAO;;;;;;;;CAQhE,CAAC"}

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-factory-lua.js

@@ -4,8 +4,8 @@
 import { BACKOFFS } from "../../../../../backoff-policies/_module.js";
 import { backoffsLua } from "../../../../../backoff-policies/backoffs-lua.js";
 import { fixedWindowLimiterLua } from "../../../../../rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/fixed-window-limiter-lua.js";
+import { rateLimiterPolicyLua } from "../../../../../rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/internal-rate-limiter-policy-lua.js";
 import { rateLimiterLua } from "../../../../../rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-lua.js";
-import { rateLimiterPolicyLua } from "../../../../../rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-policy-lua.js";
 import { rateLimiterStateManagerLua } from "../../../../../rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-state-manager-lua.js";
 import { rateLimterStorageLua } from "../../../../../rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-storage-lua.js";
 import { slidingWindowLimiterLua } from "../../../../../rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/sliding-window-limiter-lua.js";
@@ -61,11 +61,11 @@ ${rateLimiterLua}
 -- @param currentDate number
 -- @return IRateLimiterAdapter
 local function rateLimiterFactory(backoffSettings, policySettings, currentDate)
-    local rateLimiterPolicy = RateLimiterPolicy(rateLimiterPolicyFactory(policySettings))
+    local rateLimiterPolicy = InternalRateLimiterPolicy(rateLimiterPolicyFactory(policySettings))
     local backoffPolicy = backoffPolicyFactory(backoffSettings)
     local storage = RateLimiterStorage(rateLimiterPolicy, backoffPolicy, currentDate)
     local stateManager = RateLimiterStateManager(rateLimiterPolicy, backoffPolicy)
-    return RateLimiter(storage, stateManager)
+    return RateLimiter(storage, stateManager, currentDate)
 end
 `;
 //# sourceMappingURL=rate-limiter-factory-lua.js.map

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-factory-lua.js.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limiter-factory-lua.js","sourceRoot":"","sources":["../../../../../../src/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-factory-lua.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oGAAoG,CAAC;AAC3I,OAAO,EAAE,cAAc,EAAE,MAAM,4FAA4F,CAAC;AAC5H,OAAO,EAAE,oBAAoB,EAAE,MAAM,mGAAmG,CAAC;AACzI,OAAO,EAAE,0BAA0B,EAAE,MAAM,0GAA0G,CAAC;AACtJ,OAAO,EAAE,oBAAoB,EAAE,MAAM,oGAAoG,CAAC;AAC1I,OAAO,EAAE,uBAAuB,EAAE,MAAM,sGAAsG,CAAC;AAC/I,OAAO,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AAEtF;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG;EACnC,WAAW;;;;;2BAKc,QAAQ,CAAC,QAAQ;;;;2BAIjB,QAAQ,CAAC,WAAW;;;;2BAIpB,QAAQ,CAAC,MAAM;;;;2BAIf,QAAQ,CAAC,UAAU;;;;;EAK5C,qBAAqB;EACrB,uBAAuB;;;;;2BAKE,gBAAgB,CAAC,YAAY;;;;2BAI7B,gBAAgB,CAAC,cAAc;;;;;EAKxD,oBAAoB;EACpB,oBAAoB;EACpB,0BAA0B;EAC1B,cAAc;;;;;;;;;;;;;CAaf,CAAC"}
+{"version":3,"file":"rate-limiter-factory-lua.js","sourceRoot":"","sources":["../../../../../../src/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-factory-lua.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oGAAoG,CAAC;AAC3I,OAAO,EAAE,oBAAoB,EAAE,MAAM,4GAA4G,CAAC;AAClJ,OAAO,EAAE,cAAc,EAAE,MAAM,4FAA4F,CAAC;AAC5H,OAAO,EAAE,0BAA0B,EAAE,MAAM,0GAA0G,CAAC;AACtJ,OAAO,EAAE,oBAAoB,EAAE,MAAM,oGAAoG,CAAC;AAC1I,OAAO,EAAE,uBAAuB,EAAE,MAAM,sGAAsG,CAAC;AAC/I,OAAO,EAAE,gBAAgB,EAAE,MAAM,oDAAoD,CAAC;AAEtF;;GAEG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG;EACnC,WAAW;;;;;2BAKc,QAAQ,CAAC,QAAQ;;;;2BAIjB,QAAQ,CAAC,WAAW;;;;2BAIpB,QAAQ,CAAC,MAAM;;;;2BAIf,QAAQ,CAAC,UAAU;;;;;EAK5C,qBAAqB;EACrB,uBAAuB;;;;;2BAKE,gBAAgB,CAAC,YAAY;;;;2BAI7B,gBAAgB,CAAC,cAAc;;;;;EAKxD,oBAAoB;EACpB,oBAAoB;EACpB,0BAA0B;EAC1B,cAAc;;;;;;;;;;;;;CAaf,CAAC"}

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-lua.d.ts

@@ -1,4 +1,4 @@
 /**
  * @module RateLimiter
  */
-export declare const rateLimiterLua = "\n-- @template TMetrics\n-- @param rateLimiterStorage RateLimiterStorage<AllRateLimiterState<TMetrics>>\n-- @param rateLimiterStateManager RateLimiterStateManager<TMetrics>\n-- @param currentDate number\n-- @return IRateLimiterAdapter\nlocal function RateLimiter(rateLimiterStorage, rateLimiterStateManager, currentDate)\n    return {\n        -- @param key string\n        -- @param limit number\n        -- @return IRedisJsonRateLimiterState\n        updateState = function(key, limit)\n            return rateLimiterStorage.atomicUpdate({\n                key = key,\n                update = function(state)\n                    return rateLimiterStateManager.updateState(\n                        limit,\n                        currentDate\n                    )(rateLimtierStateManager.track(currentDate)(state))\n                end\n            })\n        end,\n    }\nend\n";
+export declare const rateLimiterLua = "\n-- @template TMetrics\n-- @param rateLimiterStorage RateLimiterStorage<AllRateLimiterState<TMetrics>>\n-- @param rateLimiterStateManager RateLimiterStateManager<TMetrics>\n-- @param currentDate number\n-- @return IRateLimiterAdapter\nlocal function RateLimiter(rateLimiterStorage, rateLimiterStateManager, currentDate)\n    return {\n        -- @param key string\n        -- @return IRedisJsonRateLimiterState | null\n        getState = function(key)\n            local state = rateLimiterStorage.find(key)\n            if state == nil or state == cjson.null then\n                return nil\n            end\n\n            return {\n                success = state.success,\n                attempt = state.attempt,\n                resetTime = state.resetTime\n            }\n        end,\n\n        -- @param key string\n        -- @param limit number\n        -- @return IRedisJsonRateLimiterState\n        updateState = function(key, limit)\n            local track = rateLimiterStateManager.track(currentDate) \n            local updateState = rateLimiterStateManager.updateState(limit, currentDate)\n            return rateLimiterStorage.atomicUpdate({\n                key = key,\n                update = function(prevState)\n                    local newState1 = track(prevState)\n                    local newState2 = updateState(newState1)\n                    return newState2\n                end\n            })\n        end,\n    }\nend\n";

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-lua.js

@@ -9,17 +9,33 @@ export const rateLimiterLua = `
 -- @return IRateLimiterAdapter
 local function RateLimiter(rateLimiterStorage, rateLimiterStateManager, currentDate)
     return {
+        -- @param key string
+        -- @return IRedisJsonRateLimiterState | null
+        getState = function(key)
+            local state = rateLimiterStorage.find(key)
+            if state == nil or state == cjson.null then
+                return nil
+            end
+
+            return {
+                success = state.success,
+                attempt = state.attempt,
+                resetTime = state.resetTime
+            }
+        end,
+
         -- @param key string
         -- @param limit number
         -- @return IRedisJsonRateLimiterState
         updateState = function(key, limit)
+            local track = rateLimiterStateManager.track(currentDate) 
+            local updateState = rateLimiterStateManager.updateState(limit, currentDate)
             return rateLimiterStorage.atomicUpdate({
                 key = key,
-                update = function(state)
-                    return rateLimiterStateManager.updateState(
-                        limit,
-                        currentDate
-                    )(rateLimtierStateManager.track(currentDate)(state))
+                update = function(prevState)
+                    local newState1 = track(prevState)
+                    local newState2 = updateState(newState1)
+                    return newState2
                 end
             })
         end,

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-lua.js.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limiter-lua.js","sourceRoot":"","sources":["../../../../../../src/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-lua.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;CAwB7B,CAAC"}
+{"version":3,"file":"rate-limiter-lua.js","sourceRoot":"","sources":["../../../../../../src/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-lua.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwC7B,CAAC"}

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-state-manager-lua.js

@@ -7,7 +7,7 @@ import { RATE_LIMITER_STATE } from "../../../../../rate-limiter/contracts/_modul
  */
 export const rateLimiterStateManagerLua = `
 -- @template TMetrics
--- @param rateLimiterPolicy RateLimiterPolicy<TMetrics>
+-- @param rateLimiterPolicy InternalRateLimiterPolicy<TMetrics>
 -- @param backoffPolicy BackoffPolicy
 local function RateLimiterStateManager(rateLimiterPolicy, backoffPolicy)
     return {

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-storage-lua.js

@@ -7,7 +7,7 @@ import { RATE_LIMITER_STATE } from "../../../../../rate-limiter/contracts/_modul
  */
 export const rateLimterStorageLua = `
 -- @template TMetrics
--- @param rateLimiterPolicy RateLimiterPolicy<TMetrics>
+-- @param rateLimiterPolicy InternalRateLimiterPolicy<TMetrics>
 -- @param backoffPolicy BackoffPolicy
 -- @param currentDate number
 local function RateLimiterStorage(rateLimiterPolicy, backoffPolicy, currentDate)
@@ -15,14 +15,24 @@ local function RateLimiterStorage(rateLimiterPolicy, backoffPolicy, currentDate)
     -- @param AllRateLimiterState<TMetrics>
     -- @return IRedisJsonRateLimiterState
     local function toAdapterState(state)
-        local resetTime = state.startedAt
-        if state.type == "${RATE_LIMITER_STATE.ALLOWED}" then
-            resetTime = nil
-        end
         return {
             success = state.type == "${RATE_LIMITER_STATE.ALLOWED}",
-            attempt = state.attempt,
-            resetTime = resetTime 
+            attempt = rateLimiterPolicy.getAttempts(state, currentDate),
+            resetTime = rateLimiterPolicy.getExpiration(state, {
+                backoffPolicy = backoffPolicy,
+                currentDate = currentDate
+            }),
+        }
+    end
+
+    local function toAdapterState2(state)
+        return {
+            success = state.type == "${RATE_LIMITER_STATE.ALLOWED}",
+            attempt = rateLimiterPolicy.getAttempts(state, currentDate),
+            resetTime = rateLimiterPolicy.getExpiration(state, {
+                backoffPolicy = backoffPolicy,
+                currentDate = currentDate
+            }),
         }
     end
     
@@ -30,28 +40,35 @@ local function RateLimiterStorage(rateLimiterPolicy, backoffPolicy, currentDate)
         -- @param args AtomicUpdateArgs<TMetrics>
         -- @return IRedisJsonRateLimiterState
         atomicUpdate = function(args)
-            local data = cjson.decode(redis.call(args.key))
-            local currentState = nil
-            if data ~= nil and data ~= cjson.null then
-                currentState = data.state
-            end
-            if currentState == nil or currentState == cjson.null then
-                currentState = rateLimiterPolicy.initialState(currentDate)
+            -- local currentState = cjson.decode(redis.call("get", args.key))
+            -- if currentState == nil or currentState == cjson.null then
+            --     currentState = rateLimiterPolicy.initialState(currentDate)
+            -- end
+
+            local currentState = rateLimiterPolicy.initialState(currentDate)
+            if redis.call("exists", args.key) == 1 then
+                currentState = cjson.decode(redis.call("get", args.key))
             end
 
             local newState = args.update(currentState)
 
-            redis.call("set", args.key, newState)
-            redis.call(
-                "pexpireat",
-                args.key,
-                rateLimiterPolicy.getExpiration(newState, {
-                    backoffPolicy = backoffPolicy,
-                    currentDate = currentDate
-                })
-            )
-
+            local expiration = rateLimiterPolicy.getExpiration(newState, {
+                backoffPolicy = backoffPolicy,
+                currentDate = currentDate
+            })
+            redis.call("set", args.key, cjson.encode(newState), "pxat", expiration)
+            
             return toAdapterState(newState)
+        end,
+        
+        -- @param Key
+        -- @return IRedisJsonRateLimiterState | null
+        find = function(key)
+            if redis.call("exists", key) == 0 then
+                return nil
+            end
+
+            return toAdapterState(cjson.decode(redis.call("get", key)))
         end
     }
 end

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-storage-lua.js.map

@@ -1 +1 @@
-{"version":3,"file":"rate-limiter-storage-lua.js","sourceRoot":"","sources":["../../../../../../src/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-storage-lua.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;;;;;;;;4BAWR,kBAAkB,CAAC,OAAO;;;;uCAIf,kBAAkB,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmChE,CAAC"}
+{"version":3,"file":"rate-limiter-storage-lua.js","sourceRoot":"","sources":["../../../../../../src/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/lua/rate-limiter-storage-lua.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG;;;;;;;;;;;uCAWG,kBAAkB,CAAC,OAAO;;;;;;;;;;;uCAW1B,kBAAkB,CAAC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6ChE,CAAC"}

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/redis-rate-limiter-adapter.d.ts

@@ -8,9 +8,13 @@ import { type RateLimiterPolicySettingsEnum } from "../../../../rate-limiter/imp
 declare module "ioredis" {
     interface RedisCommander<Context> {
         /**
-         * @returns {string} {@link IRedisJsonRateLimiterState | `IRedisJsonRateLimiterState | null`} as json string.
+         * @returns {string} {@link IRedisJsonRateLimiterState | `IRedisJsonRateLimiterState`} as json string.
          */
         daiso_rate_limiter_update_state(key: string, limit: number, backoffSettings: string, policySettings: string, currentDate: number): Result<string, Context>;
+        /**
+         * @returns {string} {@link IRedisJsonRateLimiterState | `IRedisJsonRateLimiterState | null`} as json string.
+         */
+        daiso_rate_limiter_get_state(key: string, backoffSettings: string, policySettings: string, currentDate: number): Result<string, Context>;
     }
 }
 /**
@@ -26,7 +30,7 @@ export type RedisRateLimiterAdapterSettings = {
      * { type: BACKOFFS.EXPONENTIAL }
      * ```
      */
-    backoff?: BackoffSettingsEnum;
+    backoffPolicy?: BackoffSettingsEnum;
     /**
      * You can choose between different types of predefined circuit breaker policies.
      * @default
@@ -34,7 +38,7 @@ export type RedisRateLimiterAdapterSettings = {
      * { type: LIMITER.FIXED_WINDOW }
      * ```
      */
-    policy?: RateLimiterPolicySettingsEnum;
+    rateLimiterPolicy?: RateLimiterPolicySettingsEnum;
 };
 /**
  * IMPORT_PATH: `"@daiso-tech/core/rate-limiter/redis-rate-limiter-adapter"`
@@ -57,6 +61,7 @@ export declare class RedisRateLimiterAdapter implements IRateLimiterAdapter {
      * ```
      */
     constructor(settings: RedisRateLimiterAdapterSettings);
+    private initGetStateCommand;
     private initUpdateStateCommmand;
     getState(key: string): Promise<IRateLimiterAdapterState | null>;
     updateState(key: string, limit: number): Promise<IRateLimiterAdapterState>;

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/redis-rate-limiter-adapter.js

@@ -28,16 +28,37 @@ export class RedisRateLimiterAdapter {
      * ```
      */
     constructor(settings) {
-        const { database, backoff = {
+        const { database, backoffPolicy = {
             type: BACKOFFS.EXPONENTIAL,
-        }, policy = {
+        }, rateLimiterPolicy = {
             type: LIMITER_POLICIES.FIXED_WINDOW,
         }, } = settings;
         this.database = database;
-        this.backoff = resolveBackoffSettingsEnum(backoff);
-        this.policy = resolveRateLimiterPolicySettings(policy);
+        this.backoff = resolveBackoffSettingsEnum(backoffPolicy);
+        this.policy = resolveRateLimiterPolicySettings(rateLimiterPolicy);
+        this.initGetStateCommand();
         this.initUpdateStateCommmand();
     }
+    initGetStateCommand() {
+        if (typeof this.database.daiso_rate_limiter_get_state === "function") {
+            return;
+        }
+        this.database.defineCommand("daiso_rate_limiter_get_state", {
+            numberOfKeys: 1,
+            lua: `
+            ${rateLimiterFactoryLua}
+
+            local key = KEYS[1];
+            local backoffSettings = cjson.decode(ARGV[1]);
+            local policySettings = cjson.decode(ARGV[2]);
+            local currentDate = tonumber(ARGV[3]);
+
+            local rateLimiter = rateLimiterFactory(backoffSettings, policySettings, currentDate)
+            local state = rateLimiter.getState(key)
+            return cjson.encode(state)
+            `,
+        });
+    }
     initUpdateStateCommmand() {
         if (typeof this.database.daiso_rate_limiter_update_state === "function") {
             return;
@@ -60,19 +81,17 @@ export class RedisRateLimiterAdapter {
         });
     }
     async getState(key) {
-        const json = await this.database.get(key);
-        if (json === null) {
+        const json = await this.database.daiso_rate_limiter_get_state(key, JSON.stringify(serializeBackoffSettingsEnum(this.backoff)), JSON.stringify(serializeRateLimiterPolicySettingsEnum(this.policy)), Date.now());
+        const state = JSON.parse(json);
+        if (state === null) {
             return null;
         }
-        const state = JSON.parse(json);
         return {
             success: state.success,
             attempt: state.attempt,
-            resetTime: state.resetTime === -1
-                ? null
-                : TimeSpan.fromDateRange({
-                    end: new Date(state.resetTime),
-                }),
+            resetTime: TimeSpan.fromDateRange({
+                end: new Date(state.resetTime),
+            }),
         };
     }
     async updateState(key, limit) {
@@ -81,11 +100,9 @@ export class RedisRateLimiterAdapter {
         return {
             success: state.success,
             attempt: state.attempt,
-            resetTime: state.resetTime === -1
-                ? null
-                : TimeSpan.fromDateRange({
-                    end: new Date(state.resetTime),
-                }),
+            resetTime: TimeSpan.fromDateRange({
+                end: new Date(state.resetTime),
+            }),
         };
     }
     async reset(key) {

package/dist/rate-limiter/implementations/adapters/redis-rate-limiter-adapter/redis-rate-limiter-adapter.js.map

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