compact

Author: CppCXY

resources/luajitCompact.lua

@@ -3,3 +3,28 @@ table.unpack = unpack
 table.pack = function(...)
     return { n = select('#', ...), ... }
 end
+
+function defer(toBeClosed, callback)
+    local ctype = type(toBeClosed)
+    if ctype == 'table' then
+        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
+        else
+            local ok, result = xpcall(callback, log.error)
+            if ok then
+                return result
+            end
+        end
+    elseif ctype == 'function' then
+        local ok, result = xpcall(callback, log.error)
+        toBeClosed()
+        if ok then
+            return result 
+        end
+    end
+end

resources/override_script/await.lua

@@ -73,7 +73,10 @@ function m.await(callback, ...)
     end
     return m.wait(function(resume, ...)
         m.call(function()
-            resume(callback())
+            local returnNil = resume
+            defer(returnNil, function ()
+                resume(callback())
+            end)
         end, ...)
     end, ...)
 end

resources/override_script/files.lua

@@ -695,33 +695,34 @@ function m.compileState(uri)
         log.error('Client not ready!', uri)
     end
     local prog = progress.create(uri, lang.script.WINDOW_COMPILING, 0.5)
-    prog:setMessage(ws.getRelativePath(uri))
-    log.trace('Compile State:', uri)
-    local clock = os.clock()
-    local state, err = parser.compile(file.text
-    , 'Lua'
-    , config.get(uri, 'Lua.runtime.version')
-    , options
-    )
-    local passed = os.clock() - clock
-    if passed > 0.1 then
-        log.warn(('Compile [%s] takes [%.3f] sec, size [%.3f] kb.'):format(uri, passed, #file.text / 1000))
-    end
-
-    if not state then
-        log.error('Compile failed:', uri, err)
-        return nil
-    end
+    return defer(prog, function()
+        prog:setMessage(ws.getRelativePath(uri))
+        log.trace('Compile State:', uri)
+        local clock = os.clock()
+        local state, err = parser.compile(file.text
+        , 'Lua'
+        , config.get(uri, 'Lua.runtime.version')
+        , options
+        )
+        local passed = os.clock() - clock
+        if passed > 0.1 then
+            log.warn(('Compile [%s] takes [%.3f] sec, size [%.3f] kb.'):format(uri, passed, #file.text / 1000))
+        end
 
-    state = pluginOnTransformAst(uri, state)
-    if not state then
-        log.error('pluginOnTransformAst failed! discard the file state')
-        return nil
-    end
+        if not state then
+            log.error('Compile failed:', uri, err)
+            return nil
+        end
 
-    m.compileStateThen(state, file)
+        state = pluginOnTransformAst(uri, state)
+        if not state then
+            log.error('pluginOnTransformAst failed! discard the file state')
+            return nil
+        end
 
-    return state
+        m.compileStateThen(state, file)
+        return state
+    end)
 end
 
 ---@class parser.state

resources/override_script/proto/proto.lua

@@ -199,8 +199,11 @@ function m.applyMethod(proto)
                 m.responseErr(proto.id, proto._closeReason or define.ErrorCodes.InternalError, proto._closeMessage or res)
             end
         end
-        ok, res = xpcall(abil, log.error, proto.params, proto.id)
-        await.delay()
+
+        defer(response, function()
+            ok, res = xpcall(abil, log.error, proto.params, proto.id)
+            await.delay()
+        end)
     end)
 end