From f281eeaf2d9d578b1fdad2292bf8a33e57e44efa Mon Sep 17 00:00:00 2001 From: nekosu Date: Thu, 5 Dec 2024 11:46:16 +0800 Subject: [PATCH] feat: nodejs update for #441 --- source/binding/NodeJS/release/maa-node/src/maa.d.ts | 2 +- source/binding/NodeJS/release/maa-node/src/tasker.ts | 8 +++++--- source/binding/NodeJS/src/instance/tasker.cpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/binding/NodeJS/release/maa-node/src/maa.d.ts b/source/binding/NodeJS/release/maa-node/src/maa.d.ts index 6cec36b34..a74fbdffc 100644 --- a/source/binding/NodeJS/release/maa-node/src/maa.d.ts +++ b/source/binding/NodeJS/release/maa-node/src/maa.d.ts @@ -252,7 +252,7 @@ export declare function tasker_post_pipeline( export declare function tasker_status(handle: TaskerHandle, task_id: TaskId): Status export declare function tasker_wait(handle: TaskerHandle, task_id: TaskId): Promise export declare function tasker_running(handle: TaskerHandle): boolean -export declare function tasker_post_stop(handle: TaskerHandle): boolean +export declare function tasker_post_stop(handle: TaskerHandle): TaskId export declare function tasker_get_resource(handle: TaskerHandle): ResourceHandle | null export declare function tasker_get_controller(handle: TaskerHandle): ControllerHandle | null export declare function tasker_clear_cache(handle: TaskerHandle): boolean diff --git a/source/binding/NodeJS/release/maa-node/src/tasker.ts b/source/binding/NodeJS/release/maa-node/src/tasker.ts index 9d5370c9c..9ed301fd1 100644 --- a/source/binding/NodeJS/release/maa-node/src/tasker.ts +++ b/source/binding/NodeJS/release/maa-node/src/tasker.ts @@ -134,9 +134,11 @@ export class TaskerBase { } post_stop() { - if (!maa.tasker_post_stop(this.handle)) { - throw 'Tasker post_stop failed' - } + return new TaskJob( + this, + this.#source, + maa.tasker_post_stop(this.handle) + ) } get resource() { diff --git a/source/binding/NodeJS/src/instance/tasker.cpp b/source/binding/NodeJS/src/instance/tasker.cpp index 219b23344..f91a592db 100644 --- a/source/binding/NodeJS/src/instance/tasker.cpp +++ b/source/binding/NodeJS/src/instance/tasker.cpp @@ -108,7 +108,7 @@ bool tasker_running(Napi::External info) return MaaTaskerRunning(info.Data()->handle); } -bool tasker_post_stop(Napi::External info) +MaaTaskId tasker_post_stop(Napi::External info) { return MaaTaskerPostStop(info.Data()->handle); }