zhamao-robot/zhamao-framework
1
0
Fork 0
mirror of https://github.com/zhamao-robot/zhamao-framework.git synced 2026-07-21 15:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix tick coroutine bug, update to 3.1.13

Browse Source
This commit is contained in:
crazywhalecc
2023-05-26 20:30:15 +08:00
committed by Jerry Ma
parent e2005af5dd
commit 92fabb0bfc
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZM/Framework.php
View File

@@ -50,7 +50,7 @@ class Framework
public const VERSION_ID = 718;
/** @var string 版本名称 */
public const VERSION = '3.1.12';
public const VERSION = '3.1.13';
/**
* @var RuntimePreferences 运行时偏好（环境信息&参数）

12
src/ZM/Schedule/Timer.php
View File

@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace ZM\Schedule;
use OneBot\Driver\Coroutine\Adaptive;
use ZM\Annotation\Framework\Tick;
use ZM\Framework;
@@ -11,12 +12,19 @@ class Timer
{
public static function tick(int $ms, callable $callback, int $times = 0): int
{
return Framework::getInstance()->getDriver()->getEventLoop()->addTimer($ms, $callback, $times);
return Framework::getInstance()->getDriver()->getEventLoop()->addTimer(
$ms,
fn (...$params) => Adaptive::getCoroutine() !== null ? Adaptive::getCoroutine()->create($callback, ...$params) : $callback(...$params),
$times
);
}
public static function after(int $ms, callable $callback): int
{
return Framework::getInstance()->getDriver()->getEventLoop()->addTimer($ms, $callback);
return Framework::getInstance()->getDriver()->getEventLoop()->addTimer(
$ms,
fn (...$params) => Adaptive::getCoroutine() !== null ? Adaptive::getCoroutine()->create($callback, ...$params) : $callback(...$params)
);
}
public static function del(int $timer_id): void