michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-02-18 20:42:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: improve python rpc buffer wrangling

Browse Source
This commit is contained in:
Koushik Dutta
2022-09-21 21:53:38 -07:00
parent 0a890ddabb
commit a4582da683
4 changed files with 103 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/src/plugin/runtime/python-worker.ts
View File

@@ -5,10 +5,12 @@ import path from 'path';
import readline from 'readline';
import { Readable, Writable } from 'stream';
import { RpcMessage, RpcPeer } from "../../rpc";
import { createRpcDuplexSerializer } from '../../rpc-serializer';
import { ChildProcessWorker } from "./child-process-worker";
import { RuntimeWorkerOptions } from "./runtime-worker";
export class PythonRuntimeWorker extends ChildProcessWorker {
serializer: ReturnType<typeof createRpcDuplexSerializer>;
constructor(pluginId: string, options: RuntimeWorkerOptions) {
super(pluginId, options);
@@ -62,21 +64,24 @@ export class PythonRuntimeWorker extends ChildProcessWorker {
const peerin = this.worker.stdio[3] as Writable;
const peerout = this.worker.stdio[4] as Readable;
peerin.on('error', e => this.emit('error', e));
peerout.on('error', e => this.emit('error', e));
const readInterface = readline.createInterface({
input: peerout,
terminal: false,
const serializer = this.serializer = createRpcDuplexSerializer(peerin);
serializer.setupRpcPeer(peer);
peerout.on('data', data => serializer.onData(data));
peerin.on('error', e => {
this.emit('error', e);
serializer.onDisconnected();
});
peerout.on('error', e => {
this.emit('error', e)
serializer.onDisconnected();
});
readInterface.on('line', line => peer.handleMessage(JSON.parse(line)));
}
send(message: RpcMessage, reject?: (e: Error) => void): void {
send(message: RpcMessage, reject?: (e: Error) => void, serializationContext?: any): void {
try {
if (!this.worker)
throw new Error('worked has been killed');
(this.worker.stdio[3] as Writable).write(JSON.stringify(message) + '\n', e => e && reject?.(e));
this.serializer.sendMessage(message, reject, serializationContext);
}
catch (e) {
reject?.(e);