await.wait 也要使用延迟检查器

main-beta.lua

@@ -5,7 +5,7 @@ local fs = require 'bee.filesystem'
 ROOT = fs.path(rootPath)
 LANG = LANG or 'en-US'
 
---collectgarbage('generational', 10, 50)
+collectgarbage('generational', 10, 50)
 --collectgarbage('incremental', 120, 120, 0)
 
 log = require 'log'

script-beta/await.lua

@@ -31,6 +31,7 @@ function m.create(callback, ...)
     return m.checkResult(co, coroutine.resume(co, ...))
 end
 
+--- 对当前任务设置一个延迟检查器，当延迟前后检查器的返回值不同时，放弃此任务
 function m.setDelayer(callback)
     local co = coroutine.running()
     m.coDelayer[co] = callback
@@ -47,8 +48,11 @@ function m.sleep(time, getVersion)
     end
     local version = getVersion and getVersion()
     local co = coroutine.running()
+    local delayer = m.coDelayer[co]
+    local dVersion = delayer and delayer()
     timer.wait(time, function ()
-        if version == (getVersion and getVersion()) then
+        if  version == (getVersion and getVersion())
+        and dVersion == (delayer and delayer()) then
             return m.checkResult(co, coroutine.resume(co))
         else
             coroutine.close(co)

script-beta/vm/guideInterface.lua

@@ -2,6 +2,7 @@ local vm    = require 'vm.vm'
 local files = require 'files'
 local ws    = require 'workspace'
 local guide = require 'parser.guide'
+local await = require 'await'
 
 local m = {}
 
@@ -63,6 +64,7 @@ function vm.interface.call(func, args, index)
     if not lib then
         return nil
     end
+    await.delay()
     if lib.name == 'require' and index == 1 then
         return m.require(args, index)
     end
@@ -72,9 +74,11 @@ function vm.interface.call(func, args, index)
 end
 
 function vm.interface.global(name)
+    await.delay()
     return vm.getGlobals(name)
 end
 
 function vm.interface.link(uri)
+    await.delay()
     return vm.getLinksTo(uri)
 end