warscript 0.0.1-dev.d63794c → 0.0.1-dev.d6e2c10

package/core/types/timer.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__Promise = ____lualib.__TS__Promise
 local ____exports = {}
@@ -9,8 +10,13 @@ local Event = ____event.Event
 local InitializingEvent = ____event.InitializingEvent
 local ____objectPool = require("util.objectPool")
 local ObjectPool = ____objectPool.ObjectPool
-local ____exception = require("exception")
-local IllegalStateException = ____exception.IllegalStateException
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
+local ____callback_2Darray = require("utility.callback-array")
+local addCallback = ____callback_2Darray.addCallback
+local callbackArray = ____callback_2Darray.callbackArray
+local consumeCallback = ____callback_2Darray.consumeCallback
+local consumeCallbacks = ____callback_2Darray.consumeCallbacks
 local createTimer = CreateTimer
 local timerStart = TimerStart
 local pauseTimer = PauseTimer
@@ -23,6 +29,7 @@ local getHandleId = GetHandleId
 local ____pcall = _G.pcall
 local ____print = _G.print
 local select = _G.select
+local ____type = _G.type
 local safeCall = warpack.safeCall
 local corunning = coroutine.running
 local coresume = coroutine.resume
@@ -35,61 +42,76 @@ local timerByHandleId = {}
 local function timerSafeCall()
     local timer = timerByHandleId[getHandleId(getExpiredTimer())]
     if timer ~= nil then
-        if timer[2] then
+        if timer[1] then
             timer:destroy()
         end
-        local callback = timer[3]
+        local callback = timer[2]
         if callback ~= nil then
             safeCall(
                 callback,
-                ____unpack(timer, 4 + 1, 4 + (timer[4] or 0))
+                ____unpack(timer, 3 + 1, 3 + (timer[3] or 0))
             )
         end
     end
 end
+local zeroTimerScheduled = false
+local zeroTimerCallbacks = callbackArray()
+---
+-- @internal For use by internal systems only.
+____exports.consumeZeroTimerCallback = function(id)
+    consumeCallback(zeroTimerCallbacks, id)
+end
+local function invokeZeroTimerCallbacks()
+    zeroTimerScheduled = false
+    consumeCallbacks(zeroTimerCallbacks)
+end
 ____exports.Timer = __TS__Class()
 local Timer = ____exports.Timer
 Timer.name = "Timer"
+__TS__ClassExtends(Timer, AbstractDestroyable)
 function Timer.prototype.____constructor(self)
+    AbstractDestroyable.prototype.____constructor(self)
     self[0] = get()
     timerByHandleId[getHandleId(self[0])] = self
 end
 function Timer.prototype.start(self, timeout, periodic, callback, ...)
-    self[3] = callback
+    self[2] = callback
     local argsLength = select("#", ...)
-    self[4] = argsLength
+    self[3] = argsLength
     for i = 1, argsLength do
-        self[4 + i] = (select(i, ...))
+        self[3 + i] = (select(i, ...))
     end
     timerStart(self.handle, timeout, periodic, timerSafeCall)
 end
+function Timer.prototype.onDestroy(self)
+    local handle = self[0]
+    timerByHandleId[getHandleId(handle)] = nil
+    release(handle)
+    return AbstractDestroyable.prototype.onDestroy(self)
+end
 function Timer.prototype.pause(self)
     pauseTimer(self[0])
 end
 function Timer.prototype.resume(self)
     resumeTimer(self[0])
 end
-function Timer.prototype.destroy(self)
-    if self[1] then
-        error(
-            __TS__New(IllegalStateException, "Double-destroy run for timer"),
-            0
-        )
-    end
-    local handle = self[0]
-    timerByHandleId[getHandleId(handle)] = nil
-    release(handle)
-    self[1] = true
-end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
-function Timer.run(self, callback, ...)
-    ____exports.Timer:simple(0, callback, ...)
+function Timer.run(self, objectOrCallback, keyOrFirstArg, ...)
+    if not zeroTimerScheduled then
+        zeroTimerScheduled = true
+        ____exports.Timer:simple(0, invokeZeroTimerCallbacks)
+    end
+    if ____type(objectOrCallback) == "function" then
+        return addCallback(zeroTimerCallbacks, objectOrCallback, keyOrFirstArg, ...)
+    else
+        return addCallback(zeroTimerCallbacks, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
+    end
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)
-    timer[2] = true
+    timer[1] = true
     timer:start(timeout, false, callback, ...)
     return timer
 end

package/core/util.lua

@@ -1,3 +1,5 @@
+local ____lualib = require("lualib_bundle")
+local __TS__StringPadEnd = ____lualib.__TS__StringPadEnd
 local ____exports = {}
 local ns = {}
 do
@@ -14,7 +16,10 @@ do
         if type(id) == "number" then
             return id
         else
-            local numid = string.unpack(">I4", id)
+            local numid = string.unpack(
+                ">I4",
+                __TS__StringPadEnd(id, 4, "\0")
+            )
             return numid
         end
     end