Skip to content

Commit

Permalink
feat(node): update
Browse files Browse the repository at this point in the history
  • Loading branch information
neko-para committed Mar 6, 2025
1 parent 490c701 commit 2ef7822
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 25 deletions.
12 changes: 10 additions & 2 deletions source/binding/NodeJS/release/maa-node/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,17 @@ export class AgentClient {
}
}

start_child(exec: string, args: string[]) {
if (!maa.agent_client_start_child(this.handle, exec, args)) {
start_child(identifier: string | null) {
const rid = maa.agent_client_start_child(this.handle, identifier)
if (rid === null) {
throw 'AgentClient start child failed'
}
return rid
}

connect() {
if (!maa.agent_client_connect(this.handle)) {
throw 'AgentClient connect failed'
}
}
}
8 changes: 4 additions & 4 deletions source/binding/NodeJS/release/maa-node/src/maa.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,9 @@ export declare function agent_client_bind_resource(
): boolean
export declare function agent_client_start_child(

This comment has been minimized.

Copy link
@MistEO

MistEO Mar 6, 2025

Member

这里还有个没改的 @neko-para

handle: AgentClientHandle,
child_exec: string,
child_args: string[]
): boolean
identifier: string | null
): string | null
export declare function agent_client_connect(handle: AgentClientHandle): boolean

// agent.cpp - server

Expand All @@ -399,7 +399,7 @@ export declare function agent_server_register_custom_action(
name: string,
action: CustomActionCallback
): boolean
export declare function agent_server_start_up(args: string[]): boolean
export declare function agent_server_start_up(identifier: string): boolean
export declare function agent_server_shut_down(): void
// export declare function agent_server_join(): void
// export declare function agent_server_detach(): void
4 changes: 2 additions & 2 deletions source/binding/NodeJS/release/maa-node/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ export const AgentServer = {
)
},

start_up(args: string[]) {
if (!maa.agent_server_start_up(args)) {
start_up(identifier: string) {
if (!maa.agent_server_start_up(identifier)) {
throw 'AgentServer start up failed'
}
},
Expand Down
38 changes: 21 additions & 17 deletions source/binding/NodeJS/src/agent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,9 @@ bool agent_server_register_custom_action(Napi::Env env, ExtContextInfo* context,
}
}

bool agent_server_start_up(std::vector<std::string> args)
bool agent_server_start_up(std::string identifier)

This comment has been minimized.

Copy link
@MistEO

MistEO Mar 6, 2025

Member

说起来这种需要 const std::string& 吗?

This comment has been minimized.

Copy link
@neko-para

neko-para Mar 6, 2025

Author Contributor

不用, 外面直接move进来的

{
StringListBuffer buffer;
buffer.set_vector(args, [](auto str) {
StringBuffer buf;
buf.set(str);
return buf;
});
return MaaAgentServerStartUp(buffer);
return MaaAgentServerStartUp(identifier.c_str());
}

void agent_server_shut_down()
Expand Down Expand Up @@ -93,16 +87,25 @@ bool agent_client_bind_resource(Napi::External<AgentClientInfo> info, Napi::Exte
}
}

bool agent_client_start_child(Napi::External<AgentClientInfo> info, std::string child_exec, std::vector<std::string> child_args)
std::optional<std::string> agent_client_create_socket(Napi::External<AgentClientInfo> info, std::optional<std::string> identifier)
{
StringListBuffer buffer;
buffer.set_vector(child_args, [](auto str) {
StringBuffer buf;
buf.set(str);
return buf;
});
return MaaAgentClientStartChild(info.Data()->handle, child_exec.c_str(), buffer);
StringBuffer buf;
if (identifier) {
buf.set(identifier.value());
}
if (MaaAgentClientCreateSocket(info.Data()->handle, buf.buffer)) {
return buf.str();
}
else {
return std::nullopt;
}
}

bool agent_client_connect(Napi::External<AgentClientInfo> info)
{
return MaaAgentClientConnect(info.Data()->handle);
}

#endif

void load_agent(Napi::Env env, Napi::Object& exports, Napi::External<ExtContextInfo> context)
Expand All @@ -120,7 +123,8 @@ void load_agent(Napi::Env env, Napi::Object& exports, Napi::External<ExtContextI
BIND(agent_client_create);
BIND(agent_client_destroy);
BIND(agent_client_bind_resource);
BIND(agent_client_start_child);
BIND(agent_client_create_socket);
BIND(agent_client_connect);

exports["AgentRole"] = "client";
#endif
Expand Down

0 comments on commit 2ef7822

Please sign in to comment.