Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions sdk_v2/js/src/detail/coreInterop.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ export class CoreInterop {
return null;
}

private _toBytes(str: string): Uint8Array {
return new TextEncoder().encode(str);
}

constructor(config: Configuration) {
const corePath = config.params['FoundryLocalCorePath'] || CoreInterop._resolveDefaultCorePath(config);

Expand Down Expand Up @@ -96,14 +100,15 @@ export class CoreInterop {
koffi.encode(cmdBuf, 'char', command, command.length + 1);

const dataStr = params ? JSON.stringify(params) : '';
const dataBuf = koffi.alloc('char', dataStr.length + 1);
koffi.encode(dataBuf, 'char', dataStr, dataStr.length + 1);
const dataBytes = this._toBytes(dataStr);
const dataBuf = koffi.alloc('char', dataBytes.length + 1);
koffi.encode(dataBuf, 'char', dataStr, dataBytes.length + 1);

const req = {
Command: koffi.address(cmdBuf),
CommandLength: command.length,
Data: koffi.address(dataBuf),
DataLength: dataStr.length
DataLength: dataBytes.length
};
const res = { Data: 0, DataLength: 0, Error: 0, ErrorLength: 0 };

Expand All @@ -129,8 +134,9 @@ export class CoreInterop {
koffi.encode(cmdBuf, 'char', command, command.length + 1);

const dataStr = params ? JSON.stringify(params) : '';
const dataBuf = koffi.alloc('char', dataStr.length + 1);
koffi.encode(dataBuf, 'char', dataStr, dataStr.length + 1);
const dataBytes = this._toBytes(dataStr);
const dataBuf = koffi.alloc('char', dataBytes.length + 1);
koffi.encode(dataBuf, 'char', dataStr, dataBytes.length + 1);

const cb = koffi.register((data: any, length: number, userData: any) => {
const chunk = koffi.decode(data, 'char', length);
Expand All @@ -142,7 +148,7 @@ export class CoreInterop {
Command: koffi.address(cmdBuf),
CommandLength: command.length,
Data: koffi.address(dataBuf),
DataLength: dataStr.length
DataLength: dataBytes.length
};
const res = { Data: 0, DataLength: 0, Error: 0, ErrorLength: 0 };

Expand Down