@daiso-tech/core 0.43.2 → 0.45.0

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

@@ -3,7 +3,7 @@
  */
 import { exponentialBackoff, } from "../../../../backoff-policies/_module.js";
 import {} from "../../../../rate-limiter/contracts/_module.js";
-import { RateLimiterPolicy, } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-policy.js";
+import { InternalRateLimiterPolicy, } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/internal-rate-limiter-policy.js";
 import { RateLimiterStateManager } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-state-manager.js";
 import { RateLimiterStorage } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-storage.js";
 import { FixedWindowLimiter } from "../../../../rate-limiter/implementations/policies/_module.js";
@@ -29,7 +29,7 @@ export class DatabaseRateLimiterAdapter {
      */
     constructor(settings) {
         const { adapter, backoffPolicy = exponentialBackoff(), rateLimiterPolicy = new FixedWindowLimiter(), } = settings;
-        const internalRateLimiterPolicy = new RateLimiterPolicy(rateLimiterPolicy);
+        const internalRateLimiterPolicy = new InternalRateLimiterPolicy(rateLimiterPolicy);
         this.rateLimiterStorage = new RateLimiterStorage({
             adapter: adapter,
             rateLimiterPolicy: internalRateLimiterPolicy,
@@ -43,29 +43,31 @@ export class DatabaseRateLimiterAdapter {
             return null;
         }
         return {
-            ...state,
-            resetTime: state.resetTime === null
-                ? null
-                : TimeSpan.fromDateRange({
-                    end: state.resetTime,
-                }),
+            success: state.success,
+            attempt: state.attempt,
+            resetTime: TimeSpan.fromDateRange({
+                end: state.resetTime,
+            }),
         };
     }
     async updateState(key, limit) {
         const currentDate = new Date();
+        const track = this.rateLimiterStateManager.track(currentDate);
+        const updateState = this.rateLimiterStateManager.updateState(limit, currentDate);
         const state = await this.rateLimiterStorage.atomicUpdate({
             key,
-            update: (state) => {
-                return this.rateLimiterStateManager.updateState(limit, currentDate)(this.rateLimiterStateManager.track(currentDate)(state));
+            update: (prevState) => {
+                const newState1 = track(prevState);
+                const newState2 = updateState(newState1);
+                return newState2;
             },
         });
         return {
-            ...state,
-            resetTime: state.resetTime === null
-                ? null
-                : TimeSpan.fromDateRange({
-                    end: state.resetTime,
-                }),
+            success: state.success,
+            attempt: state.attempt,
+            resetTime: TimeSpan.fromDateRange({
+                end: state.resetTime,
+            }),
         };
     }
     async reset(key) {

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

@@ -1 +1 @@
-{"version":3,"file":"database-rate-limiter-adapter.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/database-rate-limiter-adapter/database-rate-limiter-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACH,kBAAkB,GAErB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAKN,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACH,iBAAiB,GAEpB,MAAM,8FAA8F,CAAC;AACtG,OAAO,EAAE,uBAAuB,EAAE,MAAM,qGAAqG,CAAC;AAC9I,OAAO,EAAE,kBAAkB,EAAE,MAAM,+FAA+F,CAAC;AACnI,OAAO,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAgClE;;;GAGG;AACH,MAAM,OAAO,0BAA0B;IAGlB,kBAAkB,CAA+B;IACjD,uBAAuB,CAAoC;IAE5E;;;;;;;;;;;OAWG;IACH,YAAY,QAA4C;QACpD,MAAM,EACF,OAAO,EACP,aAAa,GAAG,kBAAkB,EAAE,EACpC,iBAAiB,GAAG,IAAI,kBAAkB,EAAE,GAC/C,GAAG,QAAQ,CAAC;QACb,MAAM,yBAAyB,GAAG,IAAI,iBAAiB,CACnD,iBAAiD,CACpD,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,CAAC;YAC7C,OAAO,EAAE,OAER;YACD,iBAAiB,EAAE,yBAAyB;YAC5C,aAAa;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,GAAG,IAAI,uBAAuB,CACtD,yBAAyB,EACzB,aAAa,CAChB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAW;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO;YACH,GAAG,KAAK;YACR,SAAS,EACL,KAAK,CAAC,SAAS,KAAK,IAAI;gBACpB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;oBACnB,GAAG,EAAE,KAAK,CAAC,SAAS;iBACvB,CAAC;SACf,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CACb,GAAW,EACX,KAAa;QAEb,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC;YACrD,GAAG;YACH,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBACd,OAAO,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAC3C,KAAK,EACL,WAAW,CACd,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;YAC9D,CAAC;SACJ,CAAC,CAAC;QACH,OAAO;YACH,GAAG,KAAK;YACR,SAAS,EACL,KAAK,CAAC,SAAS,KAAK,IAAI;gBACpB,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;oBACnB,GAAG,EAAE,KAAK,CAAC,SAAS;iBACvB,CAAC;SACf,CAAC;IACN,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACnB,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;CACJ"}
+{"version":3,"file":"database-rate-limiter-adapter.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/database-rate-limiter-adapter/database-rate-limiter-adapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACH,kBAAkB,GAErB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAKN,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACH,yBAAyB,GAE5B,MAAM,uGAAuG,CAAC;AAC/G,OAAO,EAAE,uBAAuB,EAAE,MAAM,qGAAqG,CAAC;AAC9I,OAAO,EAAE,kBAAkB,EAAE,MAAM,+FAA+F,CAAC;AACnI,OAAO,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAgClE;;;GAGG;AACH,MAAM,OAAO,0BAA0B;IAGlB,kBAAkB,CAA+B;IACjD,uBAAuB,CAAoC;IAE5E;;;;;;;;;;;OAWG;IACH,YAAY,QAA4C;QACpD,MAAM,EACF,OAAO,EACP,aAAa,GAAG,kBAAkB,EAAE,EACpC,iBAAiB,GAAG,IAAI,kBAAkB,EAAE,GAC/C,GAAG,QAAQ,CAAC;QACb,MAAM,yBAAyB,GAAG,IAAI,yBAAyB,CAC3D,iBAAiD,CACpD,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,CAAC;YAC7C,OAAO,EAAE,OAER;YACD,iBAAiB,EAAE,yBAAyB;YAC5C,aAAa;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,GAAG,IAAI,uBAAuB,CACtD,yBAAyB,EACzB,aAAa,CAChB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAW;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO;YACH,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC;gBAC9B,GAAG,EAAE,KAAK,CAAC,SAAS;aACvB,CAAC;SACL,CAAC;IACN,CAAC;IAED,KAAK,CAAC,WAAW,CACb,GAAW,EACX,KAAa;QAEb,MAAM,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,CACxD,KAAK,EACL,WAAW,CACd,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC;YACrD,GAAG;YACH,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE;gBAClB,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;gBACnC,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;gBACzC,OAAO,SAAS,CAAC;YACrB,CAAC;SACJ,CAAC,CAAC;QACH,OAAO;YACH,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,SAAS,EAAE,QAAQ,CAAC,aAAa,CAAC;gBAC9B,GAAG,EAAE,KAAK,CAAC,SAAS;aACvB,CAAC;SACL,CAAC;IACN,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW;QACnB,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;CACJ"}

package/dist/rate-limiter/implementations/adapters/database-rate-limiter-adapter/{rate-limiter-policy.d.ts → internal-rate-limiter-policy.d.ts}

@@ -9,7 +9,6 @@ import { RATE_LIMITER_STATE, type IRateLimiterPolicy } from "../../../../rate-li
 export type AllowedState<TMetrics = unknown> = {
     type: (typeof RATE_LIMITER_STATE)["ALLOWED"];
     metrics: TMetrics;
-    attempt: number;
 };
 /**
  * @internal
@@ -36,13 +35,14 @@ export type BackoffPolicySettings = {
 /**
  * @internal
  */
-export declare class RateLimiterPolicy<TMetrics = unknown> {
+export declare class InternalRateLimiterPolicy<TMetrics = unknown> {
     private readonly rateLimiterPolicy;
     constructor(rateLimiterPolicy: IRateLimiterPolicy<TMetrics>);
     initialState(currentDate: Date): AllowedState<TMetrics>;
     whenAllowed(currentState: AllowedState<TMetrics>, limit: number, currentDate: Date): AllRateLimiterState<TMetrics>;
     whenBlocked(currentState: BlockedState, settings: BackoffPolicySettings): AllRateLimiterState<TMetrics>;
-    trackWhenAllowed(currentState: AllowedState<TMetrics>, currentDate: Date): AllRateLimiterState<TMetrics>;
+    trackWhenAllowed(currentState: AllowedState<TMetrics>, currentDate: Date): AllowedState<TMetrics>;
     trackWhenBlocked(currentState: BlockedState): BlockedState;
     getExpiration(currentState: AllRateLimiterState<TMetrics>, settings: BackoffPolicySettings): Date;
+    getAttempts(currentState: AllRateLimiterState<TMetrics>, currentDate: Date): number;
 }

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

@@ -8,17 +8,15 @@ import { callInvokable } from "../../../../utilities/_module.js";
 /**
  * @internal
  */
-export class RateLimiterPolicy {
+export class InternalRateLimiterPolicy {
     rateLimiterPolicy;
     constructor(rateLimiterPolicy) {
         this.rateLimiterPolicy = rateLimiterPolicy;
     }
     initialState(currentDate) {
-        const currentMetrics = this.rateLimiterPolicy.initialMetrics(currentDate);
         return {
-            attempt: this.rateLimiterPolicy.getAttempts(currentMetrics, currentDate),
             type: RATE_LIMITER_STATE.ALLOWED,
-            metrics: currentMetrics,
+            metrics: this.rateLimiterPolicy.initialMetrics(currentDate),
         };
     }
     whenAllowed(currentState, limit, currentDate) {
@@ -36,11 +34,9 @@ export class RateLimiterPolicy {
         const endDate = waitTime.toEndDate(new Date(currentState.startedAt));
         const isWaitTimeOver = endDate.getTime() <= settings.currentDate.getTime();
         if (isWaitTimeOver) {
-            const currentMetrics = this.rateLimiterPolicy.initialMetrics(settings.currentDate);
             return {
-                attempt: this.rateLimiterPolicy.getAttempts(currentMetrics, settings.currentDate),
                 type: RATE_LIMITER_STATE.ALLOWED,
-                metrics: currentMetrics,
+                metrics: this.rateLimiterPolicy.initialMetrics(settings.currentDate),
             };
         }
         return currentState;
@@ -48,7 +44,6 @@ export class RateLimiterPolicy {
     trackWhenAllowed(currentState, currentDate) {
         return {
             type: currentState.type,
-            attempt: currentState.attempt,
             metrics: this.rateLimiterPolicy.updateMetrics(currentState.metrics, currentDate),
         };
     }
@@ -65,5 +60,11 @@ export class RateLimiterPolicy {
         }
         return TimeSpan.fromTimeSpan(callInvokable(settings.backoffPolicy, currentState.attempt, null)).toEndDate(settings.currentDate);
     }
+    getAttempts(currentState, currentDate) {
+        if (currentState.type === RATE_LIMITER_STATE.ALLOWED) {
+            return this.rateLimiterPolicy.getAttempts(currentState.metrics, currentDate);
+        }
+        return currentState.attempt;
+    }
 }
-//# sourceMappingURL=rate-limiter-policy.js.map
+//# sourceMappingURL=internal-rate-limiter-policy.js.map

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

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

package/dist/rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-state-manager.d.ts

@@ -2,14 +2,14 @@
  * @module RateLimiter
  */
 import { type BackoffPolicy } from "../../../../backoff-policies/_module.js";
-import { type AllRateLimiterState, type RateLimiterPolicy } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-policy.js";
+import { type AllRateLimiterState, type InternalRateLimiterPolicy } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/internal-rate-limiter-policy.js";
 /**
  * @internal
  */
 export declare class RateLimiterStateManager<TMetrics = unknown> {
     private readonly rateLimiterPolicy;
     private readonly backoffPolicy;
-    constructor(rateLimiterPolicy: RateLimiterPolicy<TMetrics>, backoffPolicy: BackoffPolicy);
+    constructor(rateLimiterPolicy: InternalRateLimiterPolicy<TMetrics>, backoffPolicy: BackoffPolicy);
     updateState: (limit: number, currentDate: Date) => (currentState: AllRateLimiterState<TMetrics>) => AllRateLimiterState<TMetrics>;
     track: (currentDate: Date) => (currentState: AllRateLimiterState<TMetrics>) => AllRateLimiterState<TMetrics>;
 }

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

@@ -3,7 +3,7 @@
  */
 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 {} from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/internal-rate-limiter-policy.js";
 /**
  * @internal
  */

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

@@ -1 +1 @@
-{"version":3,"file":"rate-limiter-state-manager.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-state-manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAGN,MAAM,8FAA8F,CAAC;AAEtG;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAEX;IACA;IAFrB,YACqB,iBAA8C,EAC9C,aAA4B;QAD5B,sBAAiB,GAAjB,iBAAiB,CAA6B;QAC9C,kBAAa,GAAb,aAAa,CAAe;IAC9C,CAAC;IAEJ,WAAW,GACP,CAAC,KAAa,EAAE,WAAiB,EAAE,EAAE,CACrC,CACI,YAA2C,EACd,EAAE;QAC/B,IAAI,YAAY,CAAC,IAAI,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CACrC,YAAY,EACZ,KAAK,EACL,WAAW,CACd,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,EAAE;YACpD,WAAW;YACX,aAAa,EAAE,IAAI,CAAC,aAAa;SACpC,CAAC,CAAC;IACP,CAAC,CAAC;IAEN,KAAK,GACD,CAAC,WAAiB,EAAE,EAAE,CACtB,CACI,YAA2C,EACd,EAAE;QAC/B,IAAI,YAAY,CAAC,IAAI,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAC1C,YAAY,EACZ,WAAW,CACd,CAAC;QACN,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC,CAAC;CACT"}
+{"version":3,"file":"rate-limiter-state-manager.js","sourceRoot":"","sources":["../../../../../src/rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-state-manager.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAsB,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACzE,OAAO,EAGN,MAAM,uGAAuG,CAAC;AAE/G;;GAEG;AACH,MAAM,OAAO,uBAAuB;IAEX;IACA;IAFrB,YACqB,iBAAsD,EACtD,aAA4B;QAD5B,sBAAiB,GAAjB,iBAAiB,CAAqC;QACtD,kBAAa,GAAb,aAAa,CAAe;IAC9C,CAAC;IAEJ,WAAW,GACP,CAAC,KAAa,EAAE,WAAiB,EAAE,EAAE,CACrC,CACI,YAA2C,EACd,EAAE;QAC/B,IAAI,YAAY,CAAC,IAAI,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CACrC,YAAY,EACZ,KAAK,EACL,WAAW,CACd,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,EAAE;YACpD,WAAW;YACX,aAAa,EAAE,IAAI,CAAC,aAAa;SACpC,CAAC,CAAC;IACP,CAAC,CAAC;IAEN,KAAK,GACD,CAAC,WAAiB,EAAE,EAAE,CACtB,CACI,YAA2C,EACd,EAAE;QAC/B,IAAI,YAAY,CAAC,IAAI,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACnD,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAC1C,YAAY,EACZ,WAAW,CACd,CAAC;QACN,CAAC;QAED,OAAO,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC,CAAC;CACT"}

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

@@ -3,14 +3,14 @@
  */
 import { type BackoffPolicy } from "../../../../backoff-policies/_module.js";
 import { type IRateLimiterStorageAdapter } from "../../../../rate-limiter/contracts/_module.js";
-import { type AllRateLimiterState, type RateLimiterPolicy } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/rate-limiter-policy.js";
+import { type AllRateLimiterState, type InternalRateLimiterPolicy } from "../../../../rate-limiter/implementations/adapters/database-rate-limiter-adapter/internal-rate-limiter-policy.js";
 import { type InvokableFn } from "../../../../utilities/_module.js";
 /**
  * @internal
  */
 export type RateLimiterStorageSettings<TMetrics> = {
     adapter: IRateLimiterStorageAdapter<AllRateLimiterState<TMetrics>>;
-    rateLimiterPolicy: RateLimiterPolicy<TMetrics>;
+    rateLimiterPolicy: InternalRateLimiterPolicy<TMetrics>;
     backoffPolicy: BackoffPolicy;
 };
 /**
@@ -19,7 +19,7 @@ export type RateLimiterStorageSettings<TMetrics> = {
 export type IRateLimiterStorageState = {
     success: boolean;
     attempt: number;
-    resetTime: Date | null;
+    resetTime: Date;
 };
 /**
  * @internal
@@ -38,8 +38,9 @@ export declare class RateLimiterStorage<TMetrics = unknown> {
     private readonly rateLimiterPolicy;
     private readonly backoffPolicy;
     constructor(settings: RateLimiterStorageSettings<TMetrics>);
-    atomicUpdate(args: AtomicUpdateArgs<TMetrics>): Promise<IRateLimiterStorageState>;
+    private static resolveStorageData;
     private toAdapterState;
+    atomicUpdate(args: AtomicUpdateArgs<TMetrics>): Promise<IRateLimiterStorageState>;
     find(key: string): Promise<IRateLimiterStorageState | null>;
     remove(key: string): Promise<void>;
 }

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 {