From bdc97b3976786bb744a27e59b0f4f28554a682df Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 21 Aug 2019 20:42:48 -0400 Subject: Organize dispatch a bit (#2796) Just some clean up reorganization around flatbuffer/minimal dispatch code. This is prep for adding a JSON dispatcher. --- js/process.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'js/process.ts') diff --git a/js/process.ts b/js/process.ts index 0629b26b0..b2b6d4734 100644 --- a/js/process.ts +++ b/js/process.ts @@ -1,7 +1,5 @@ // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license. -import * as dispatch from "./dispatch"; -import * as flatbuffers from "./flatbuffers"; -import * as msg from "gen/cli/msg_generated"; +import { sendSync, sendAsync, msg, flatbuffers } from "./dispatch_flatbuffers"; import { File, close } from "./files"; import { ReadCloser, WriteCloser } from "./io"; @@ -37,7 +35,7 @@ async function runStatus(rid: number): Promise { const builder = flatbuffers.createBuilder(); const inner = msg.RunStatus.createRunStatus(builder, rid); - const baseRes = await dispatch.sendAsync(builder, msg.Any.RunStatus, inner); + const baseRes = await sendAsync(builder, msg.Any.RunStatus, inner); assert(baseRes != null); assert(msg.Any.RunStatusRes === baseRes!.innerType()); const res = new msg.RunStatusRes(); @@ -60,7 +58,7 @@ async function runStatus(rid: number): Promise { export function kill(pid: number, signo: number): void { const builder = flatbuffers.createBuilder(); const inner = msg.Kill.createKill(builder, pid, signo); - dispatch.sendSync(builder, msg.Any.Kill, inner); + sendSync(builder, msg.Any.Kill, inner); } export class Process { @@ -227,7 +225,7 @@ export function run(opt: RunOptions): Process { stdoutRidOffset, stderrRidOffset ); - const baseRes = dispatch.sendSync(builder, msg.Any.Run, inner); + const baseRes = sendSync(builder, msg.Any.Run, inner); assert(baseRes != null); assert(msg.Any.RunRes === baseRes!.innerType()); const res = new msg.RunRes(); -- cgit v1.2.3