Revert "fix: adapt limit-count-local for lua-resty-limit-traffic v1.2.0 semantics"

This reverts commit 98ce8f3.

Author: nic-6443

apisix/plugins/limit-count/init.lua

@@ -401,10 +401,6 @@ local function run_rate_limit(conf, rule, ctx, name, cost, dry_run)
     local delay, remaining, reset
     if not conf.policy or conf.policy == "local" then
         delay, remaining, reset = lim:incoming(key, not dry_run, conf, cost)
-        if dry_run and type(remaining) == "number" and remaining - cost < 0 then
-            delay = nil
-            remaining = "rejected"
-        end
     else
         delay, remaining, reset = lim:incoming(key, cost)
     end

apisix/plugins/limit-count/limit-count-local.lua

@@ -18,7 +18,6 @@ local limit_count = require("resty.limit.count")
 
 local ngx = ngx
 local ngx_time = ngx.time
-local type = type
 local assert = assert
 local setmetatable = setmetatable
 local core = require("apisix.core")
@@ -67,22 +66,16 @@ function _M.new(plugin_name, limit, window)
 end
 
 function _M.incoming(self, key, commit, conf, cost)
-    local actual_cost = commit and cost or 0
-    local delay, consumed_or_err = self.limit_count:incoming(key, true, actual_cost)
+    local delay, remaining = self.limit_count:incoming(key, commit, cost)
     local reset
 
-    local remaining_or_err = consumed_or_err
-    if type(consumed_or_err) == "number" then
-        remaining_or_err = self.limit - consumed_or_err
-    end
-
-    if remaining_or_err == self.limit - actual_cost then
+    if remaining == self.limit - cost then
         reset = set_endtime(self, key, self.window)
     else
         reset = read_reset(self, key)
     end
 
-    return delay, remaining_or_err, reset
+    return delay, remaining, reset
 end
 
 return _M

t/plugin/ai-rate-limiting-expression.t

@@ -271,8 +271,8 @@ passed
 ]
 --- response_headers_like eval
 [
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 500",
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 320",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 499",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 319",
 ]
 --- no_error_log
 [error]
@@ -340,8 +340,8 @@ passed
 ]
 --- response_headers_like eval
 [
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 500",
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 320",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 499",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 319",
 ]
 --- no_error_log
 [error]
@@ -475,8 +475,8 @@ passed
 ]
 --- response_headers_like eval
 [
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 1000",
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 775",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 999",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 774",
 ]
 --- no_error_log
 [error]
@@ -544,8 +544,8 @@ passed
 ]
 --- response_headers_like eval
 [
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 500",
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 420",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 499",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 419",
 ]
 --- no_error_log
 [error]
@@ -613,8 +613,8 @@ passed
 ]
 --- response_headers_like eval
 [
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 100",
-    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 100",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 99",
+    "X-AI-RateLimit-Remaining-ai-proxy-anthropic: 99",
 ]
 --- no_error_log
 [error]