support croutine.close

Author: CppCXY

resources/luajitCompact.lua

@@ -1,39 +1,23 @@
+local select = select
+local type = type
+local getmetatable = getmetatable
+local xpcall = xpcall
+local math_floor = math.floor
+local math_ceil = math.ceil
+
 table.unpack = unpack
 
 table.pack = function(...)
     return { n = select('#', ...), ... }
 end
 
-function defer(toBeClosed, callback)
-    local ctype = type(toBeClosed)
-    local meta = getmetatable(toBeClosed)
-    if meta and meta.__close then
-        local ok, result = xpcall(callback, log.error)
-        meta.__close(toBeClosed)
-        if ok then
-            return result
-        end
-    elseif ctype == 'function' then
-        local ok, result = xpcall(callback, log.error)
-        toBeClosed()
-        if ok then
-            return result
-        end
-    else
-        local ok, result = xpcall(callback, log.error)
-        if ok then
-            return result
-        end
-    end
-end
-
 math.maxinteger = 0x7FFFFFFFLL
-function math.tointeger(x)
+local function tointeger(x)
     if type(x) ~= "number" then
         return nil
     end
 
-    local int = x >= 0 and math.floor(x) or math.ceil(x)
+    local int = x >= 0 and math_floor(x) or math_ceil(x)
 
     if int == x then
         return int
@@ -42,10 +26,62 @@ function math.tointeger(x)
     end
 end
 
+math.tointeger = tointeger
+
 function math.type(x)
     if type(x) == "number" then
-        return math.tointeger(x) and "integer" or "number"
+        return tointeger(x) and "integer" or "number"
     else
         return nil
     end
 end
+
+local coroutine_resume = coroutine.resume
+local coroutine_status = coroutine.status
+local coroutine_running = coroutine.running
+
+local cancel_table = setmetatable({}, { __mode = 'kv' })
+
+function coroutine.resume(co, ...)
+    if cancel_table[co] then
+        return false, 'cannot resume dead coroutine'
+    end
+
+    return coroutine_resume(co, ...)
+end
+
+function coroutine.status(co)
+    if cancel_table[co] then
+        return 'dead'
+    end
+
+    return coroutine_status(co)
+end
+
+function coroutine.close(co)
+    if coroutine_status(co) == 'suspended' then
+        cancel_table[co] = true
+    end
+end
+
+function defer(toBeClosed, callback)
+    local ctype = type(toBeClosed)
+    local meta = getmetatable(toBeClosed)
+    local closeCallback = nil
+    local ok, result
+
+    local co = coroutine_running()
+    if coroutine.status(co) ~= 'dead' then
+        ok, result = xpcall(callback, log.error)
+    end
+
+    if meta and meta.__close then
+        meta.__close(toBeClosed)
+    elseif ctype == 'function' then
+        toBeClosed()
+    end
+
+    if ok then
+        return result
+    end
+end

resources/override_script/await.lua

@@ -100,8 +100,7 @@ function m.close(id)
             if type(callback) == 'function' then
                 xpcall(callback, log.error)
             end
-            -- luajit donot support coroutine.close
-            -- coroutine.close(co)
+            coroutine.close(co)
         end
     end
 end