From f8d55b230df91b4ddb8f923dad2526a9c795f1d8 Mon Sep 17 00:00:00 2001 From: Egor Aristov Date: Sat, 6 Dec 2025 11:24:49 +0300 Subject: [PATCH] rollback some of wrong code from prev commit --- example/ts/src/remote.ts | 4 ---- kitcom/internal/ts/tsgen.tmpl | 5 ----- lib/ts/src/lib.ts | 1 + 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/example/ts/src/remote.ts b/example/ts/src/remote.ts index 4a499de..c384b56 100644 --- a/example/ts/src/remote.ts +++ b/example/ts/src/remote.ts @@ -10,16 +10,12 @@ export default class GoIpcApi { } async Div(a: number, b: number): Promise { - a = this.ipc.convType(a, "number"); - b = this.ipc.convType(b, "number"); const results = await this.ipc.call("GoIpcApi.Div", a, b); results[0] = this.ipc.convType(results[0], "number"); return results[0] as number; } async XorData(data1: Buffer, data2: Buffer): Promise { - data1 = this.ipc.convType(data1, "Buffer"); - data2 = this.ipc.convType(data2, "Buffer"); const results = await this.ipc.call("GoIpcApi.XorData", data1, data2); results[0] = this.ipc.convType(results[0], "Buffer"); return results[0] as Buffer; diff --git a/kitcom/internal/ts/tsgen.tmpl b/kitcom/internal/ts/tsgen.tmpl index 8e09604..61bf2c2 100644 --- a/kitcom/internal/ts/tsgen.tmpl +++ b/kitcom/internal/ts/tsgen.tmpl @@ -16,11 +16,6 @@ export default class {{ $e.Name }} { async {{ $mtd.Name }}( {{ range $par := $mtd.Params }}{{ $par.Name }}: {{ $par.Type | typedef }}, {{ end }} ): Promise<{{ if len $mtd.Ret }}{{ (index $mtd.Ret 0).Type | typedef }}{{ else }}void{{ end }}> { - - {{ range $par := $mtd.Params -}} - {{ $par.Name }} = this.ipc.convType({{ $par.Name }}, '{{ $par.Type | typedef }}'); - {{- end -}} - const results = await this.ipc.call('{{ $e.Name }}.{{ $mtd.Name }}', {{ range $par := $mtd.Params }}{{ $par.Name }}, {{ end }} ); diff --git a/lib/ts/src/lib.ts b/lib/ts/src/lib.ts index 4cd305d..aba1873 100644 --- a/lib/ts/src/lib.ts +++ b/lib/ts/src/lib.ts @@ -146,6 +146,7 @@ abstract class IPCCommon { if (result instanceof Promise) { result = await result; } + result = this.convType(result); this.sendMsg({type: MsgType.Response, id: msg.id, result: [result]}); } catch (err) { this.sendMsg({type: MsgType.Response, id: msg.id, error: `${ err }`});