summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/compiler.ts56
-rw-r--r--js/dispatch.ts52
-rw-r--r--js/error_stack.ts51
-rw-r--r--js/fetch.ts96
-rw-r--r--js/files.ts52
-rw-r--r--js/format_error.ts18
-rw-r--r--js/get_random_values.ts18
-rw-r--r--js/main.ts24
-rw-r--r--js/metrics.ts27
-rw-r--r--js/net.ts46
-rw-r--r--js/os.ts63
-rw-r--r--js/performance.ts18
-rw-r--r--js/permissions.ts42
-rw-r--r--js/process.ts132
-rw-r--r--js/repl.ts30
-rw-r--r--js/resources.ts20
-rw-r--r--js/timers.ts14
-rw-r--r--js/workers.ts89
18 files changed, 289 insertions, 559 deletions
diff --git a/js/compiler.ts b/js/compiler.ts
index 7519c5115..5399d59ad 100644
--- a/js/compiler.ts
+++ b/js/compiler.ts
@@ -7,9 +7,11 @@ import { Console } from "./console";
import { core } from "./core";
import { Diagnostic, fromTypeScriptDiagnostic } from "./diagnostics";
import { cwd } from "./dir";
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
+import { msg } from "./dispatch_flatbuffers";
import * as os from "./os";
-import { TextDecoder, TextEncoder } from "./text_encoding";
+import { TextEncoder } from "./text_encoding";
import { getMappedModuleName, parseTypeDirectives } from "./type_directives";
import { assert, notImplemented } from "./util";
import * as util from "./util";
@@ -121,35 +123,15 @@ interface EmitResult {
/** Ops to Rust to resolve and fetch a modules meta data. */
function fetchSourceFile(specifier: string, referrer: string): SourceFile {
- util.log("fetchSourceFile", { specifier, referrer });
- // Send FetchSourceFile message
- const builder = flatbuffers.createBuilder();
- const specifier_ = builder.createString(specifier);
- const referrer_ = builder.createString(referrer);
- const inner = msg.FetchSourceFile.createFetchSourceFile(
- builder,
- specifier_,
- referrer_
- );
- const baseRes = sendSync(builder, msg.Any.FetchSourceFile, inner);
- assert(baseRes != null);
- assert(
- msg.Any.FetchSourceFileRes === baseRes!.innerType(),
- `base.innerType() unexpectedly is ${baseRes!.innerType()}`
- );
- const fetchSourceFileRes = new msg.FetchSourceFileRes();
- assert(baseRes!.inner(fetchSourceFileRes) != null);
- const dataArray = fetchSourceFileRes.dataArray();
- const decoder = new TextDecoder();
- const sourceCode = dataArray ? decoder.decode(dataArray) : undefined;
- // flatbuffers returns `null` for an empty value, this does not fit well with
- // idiomatic TypeScript under strict null checks, so converting to `undefined`
+ util.log("compiler.fetchSourceFile", { specifier, referrer });
+ const res = sendSync(dispatch.OP_FETCH_SOURCE_FILE, {
+ specifier,
+ referrer
+ });
+
return {
- moduleName: fetchSourceFileRes.moduleName() || undefined,
- filename: fetchSourceFileRes.filename() || undefined,
- mediaType: fetchSourceFileRes.mediaType(),
- sourceCode,
- typeDirectives: parseTypeDirectives(sourceCode)
+ ...res,
+ typeDirectives: parseTypeDirectives(res.sourceCode)
};
}
@@ -171,19 +153,7 @@ function humanFileSize(bytes: number): string {
/** Ops to rest for caching source map and compiled js */
function cache(extension: string, moduleId: string, contents: string): void {
- util.log("cache", extension, moduleId);
- const builder = flatbuffers.createBuilder();
- const extension_ = builder.createString(extension);
- const moduleId_ = builder.createString(moduleId);
- const contents_ = builder.createString(contents);
- const inner = msg.Cache.createCache(
- builder,
- extension_,
- moduleId_,
- contents_
- );
- const baseRes = sendSync(builder, msg.Any.Cache, inner);
- assert(baseRes == null);
+ sendSync(dispatch.OP_CACHE, { extension, moduleId, contents });
}
const encoder = new TextEncoder();
diff --git a/js/dispatch.ts b/js/dispatch.ts
index 0c5c59553..6c7551441 100644
--- a/js/dispatch.ts
+++ b/js/dispatch.ts
@@ -12,6 +12,40 @@ export const OP_IS_TTY = 4;
export const OP_ENV = 5;
export const OP_EXEC_PATH = 6;
export const OP_UTIME = 7;
+export const OP_SET_ENV = 8;
+export const OP_HOME_DIR = 9;
+export const OP_START = 10;
+export const OP_APPLY_SOURCE_MAP = 11;
+export const OP_FORMAT_ERROR = 12;
+export const OP_CACHE = 13;
+export const OP_FETCH_SOURCE_FILE = 14;
+export const OP_OPEN = 15;
+export const OP_CLOSE = 16;
+export const OP_SEEK = 17;
+export const OP_FETCH = 18;
+export const OP_METRICS = 19;
+export const OP_REPL_START = 20;
+export const OP_REPL_READLINE = 21;
+export const OP_ACCEPT = 22;
+export const OP_DIAL = 23;
+export const OP_SHUTDOWN = 24;
+export const OP_LISTEN = 25;
+export const OP_RESOURCES = 26;
+export const OP_GET_RANDOM_VALUES = 27;
+export const OP_GLOBAL_TIMER_STOP = 28;
+export const OP_GLOBAL_TIMER = 29;
+export const OP_NOW = 30;
+export const OP_PERMISSIONS = 31;
+export const OP_REVOKE_PERMISSION = 32;
+export const OP_CREATE_WORKER = 33;
+export const OP_HOST_GET_WORKER_CLOSED = 34;
+export const OP_HOST_POST_MESSAGE = 35;
+export const OP_HOST_GET_MESSAGE = 36;
+export const OP_WORKER_POST_MESSAGE = 37;
+export const OP_WORKER_GET_MESSAGE = 38;
+export const OP_RUN = 39;
+export const OP_RUN_STATUS = 40;
+export const OP_KILL = 41;
export function asyncMsgFromRust(opId: number, ui8: Uint8Array): void {
switch (opId) {
@@ -22,10 +56,26 @@ export function asyncMsgFromRust(opId: number, ui8: Uint8Array): void {
case OP_READ:
minimal.asyncMsgFromRust(opId, ui8);
break;
+ case OP_EXIT:
+ case OP_IS_TTY:
+ case OP_ENV:
+ case OP_EXEC_PATH:
case OP_UTIME:
+ case OP_OPEN:
+ case OP_SEEK:
+ case OP_FETCH:
+ case OP_REPL_START:
+ case OP_REPL_READLINE:
+ case OP_ACCEPT:
+ case OP_DIAL:
+ case OP_GLOBAL_TIMER:
+ case OP_HOST_GET_WORKER_CLOSED:
+ case OP_HOST_GET_MESSAGE:
+ case OP_WORKER_GET_MESSAGE:
+ case OP_RUN_STATUS:
json.asyncMsgFromRust(opId, ui8);
break;
default:
- throw Error("bad opId");
+ throw Error("bad async opId");
}
}
diff --git a/js/error_stack.ts b/js/error_stack.ts
index 003717a72..7d41b9cf4 100644
--- a/js/error_stack.ts
+++ b/js/error_stack.ts
@@ -1,8 +1,8 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
// Some of the code here is adapted directly from V8 and licensed under a BSD
// style license available here: https://github.com/v8/v8/blob/24886f2d1c565287d33d71e4109a53bf0b54b75c/LICENSE.v8
-
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
import { assert } from "./util";
export interface Location {
@@ -17,40 +17,6 @@ export interface Location {
column: number;
}
-function req(
- filename: string,
- line: number,
- column: number
-): [flatbuffers.Builder, msg.Any.ApplySourceMap, flatbuffers.Offset] {
- const builder = flatbuffers.createBuilder();
- const filename_ = builder.createString(filename);
- const inner = msg.ApplySourceMap.createApplySourceMap(
- builder,
- filename_,
- // On this side, line/column are 1 based, but in the source maps, they are
- // 0 based, so we have to convert back and forth
- line - 1,
- column - 1
- );
- return [builder, msg.Any.ApplySourceMap, inner];
-}
-
-function res(baseRes: msg.Base | null): Location {
- assert(baseRes != null);
- assert(baseRes!.innerType() === msg.Any.ApplySourceMap);
- const res = new msg.ApplySourceMap();
- assert(baseRes!.inner(res) != null);
- const filename = res.filename()!;
- assert(filename != null);
- return {
- filename,
- // On this side, line/column are 1 based, but in the source maps, they are
- // 0 based, so we have to convert back and forth
- line: res.line() + 1,
- column: res.column() + 1
- };
-}
-
/** Given a current location in a module, lookup the source location and
* return it.
*
@@ -75,7 +41,18 @@ function res(baseRes: msg.Base | null): Location {
*/
export function applySourceMap(location: Location): Location {
const { filename, line, column } = location;
- return res(sendSync(...req(filename, line, column)));
+ // On this side, line/column are 1 based, but in the source maps, they are
+ // 0 based, so we have to convert back and forth
+ const res = sendSync(dispatch.OP_APPLY_SOURCE_MAP, {
+ filename,
+ line: line - 1,
+ column: column - 1
+ });
+ return {
+ filename: res.filename,
+ line: res.line + 1,
+ column: res.column + 1
+ };
}
/** Mutate the call site so that it returns the location, instead of its
diff --git a/js/fetch.ts b/js/fetch.ts
index 505da218c..317239630 100644
--- a/js/fetch.ts
+++ b/js/fetch.ts
@@ -1,6 +1,5 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { assert, createResolvable, notImplemented, isTypedArray } from "./util";
-import { sendAsync, msg, flatbuffers } from "./dispatch_flatbuffers";
import * as domTypes from "./dom_types";
import { TextDecoder, TextEncoder } from "./text_encoding";
import { DenoBlob, bytesSymbol as blobBytesSymbol } from "./blob";
@@ -10,6 +9,8 @@ import { read, close } from "./files";
import { Buffer } from "./buffer";
import { FormData } from "./form_data";
import { URLSearchParams } from "./url_search_params";
+import * as dispatch from "./dispatch";
+import { sendAsync } from "./dispatch_json";
function getHeaderValueParams(value: string): Map<string, string> {
const params = new Map();
@@ -320,67 +321,35 @@ export class Response implements domTypes.Response {
}
}
-function msgHttpRequest(
- builder: flatbuffers.Builder,
- url: string,
- method: null | string,
- headers: null | domTypes.Headers
-): flatbuffers.Offset {
- const methodOffset = !method ? 0 : builder.createString(method);
- let fieldsOffset: flatbuffers.Offset = 0;
- const urlOffset = builder.createString(url);
- if (headers) {
- const kvOffsets: flatbuffers.Offset[] = [];
- for (const [key, val] of headers.entries()) {
- const keyOffset = builder.createString(key);
- const valOffset = builder.createString(val);
- kvOffsets.push(
- msg.KeyValue.createKeyValue(builder, keyOffset, valOffset)
- );
- }
- fieldsOffset = msg.HttpHeader.createFieldsVector(builder, kvOffsets);
- } else {
- }
- return msg.HttpHeader.createHttpHeader(
- builder,
- true,
- methodOffset,
- urlOffset,
- 0,
- fieldsOffset
- );
-}
-
-function deserializeHeaderFields(m: msg.HttpHeader): Array<[string, string]> {
- const out: Array<[string, string]> = [];
- for (let i = 0; i < m.fieldsLength(); i++) {
- const item = m.fields(i)!;
- out.push([item.key()!, item.value()!]);
- }
- return out;
+interface FetchResponse {
+ bodyRid: number;
+ status: number;
+ headers: Array<[string, string]>;
}
-async function getFetchRes(
+async function sendFetchReq(
url: string,
method: string | null,
headers: domTypes.Headers | null,
body: ArrayBufferView | undefined
-): Promise<msg.FetchRes> {
- // Send Fetch message
- const builder = flatbuffers.createBuilder();
- const headerOff = msgHttpRequest(builder, url, method, headers);
- const resBase = await sendAsync(
- builder,
- msg.Any.Fetch,
- msg.Fetch.createFetch(builder, headerOff),
- body
- );
-
- // Decode FetchRes
- assert(msg.Any.FetchRes === resBase.innerType());
- const inner = new msg.FetchRes();
- assert(resBase.inner(inner) != null);
- return inner;
+): Promise<FetchResponse> {
+ let headerArray: Array<[string, string]> = [];
+ if (headers) {
+ headerArray = Array.from(headers.entries());
+ }
+
+ let zeroCopy = undefined;
+ if (body) {
+ zeroCopy = new Uint8Array(body.buffer, body.byteOffset, body.byteLength);
+ }
+
+ const args = {
+ method,
+ url,
+ headers: headerArray
+ };
+
+ return (await sendAsync(dispatch.OP_FETCH, args, zeroCopy)) as FetchResponse;
}
/** Fetch a resource from the network. */
@@ -448,20 +417,13 @@ export async function fetch(
}
while (remRedirectCount) {
- const inner = await getFetchRes(url, method, headers, body);
-
- const header = inner.header()!;
- const bodyRid = inner.bodyRid();
- assert(!header.isRequest());
- const status = header.status();
-
- const headersList = deserializeHeaderFields(header);
+ const fetchResponse = await sendFetchReq(url, method, headers, body);
const response = new Response(
url,
- status,
- headersList,
- bodyRid,
+ fetchResponse.status,
+ fetchResponse.headers,
+ fetchResponse.bodyRid,
redirected
);
if ([301, 302, 303, 307, 308].includes(response.status)) {
diff --git a/js/files.ts b/js/files.ts
index 6f0e523c9..4eff17aac 100644
--- a/js/files.ts
+++ b/js/files.ts
@@ -12,37 +12,22 @@ import {
} from "./io";
import { sendAsyncMinimal } from "./dispatch_minimal";
import { assert } from "./util";
-import { sendAsync, sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
+import * as dispatch from "./dispatch";
+import {
+ sendSync as sendSyncJson,
+ sendAsync as sendAsyncJson
+} from "./dispatch_json";
+import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
import { OP_READ, OP_WRITE } from "./dispatch";
-function reqOpen(
- filename: string,
- mode: OpenMode
-): [flatbuffers.Builder, msg.Any, flatbuffers.Offset] {
- const builder = flatbuffers.createBuilder();
- const filename_ = builder.createString(filename);
- const mode_ = builder.createString(mode);
- const inner = msg.Open.createOpen(builder, filename_, 0, mode_);
- return [builder, msg.Any.Open, inner];
-}
-
-function resOpen(baseRes: null | msg.Base): File {
- assert(baseRes != null);
- assert(msg.Any.OpenRes === baseRes!.innerType());
- const res = new msg.OpenRes();
- assert(baseRes!.inner(res) != null);
- const rid = res.rid();
- // eslint-disable-next-line @typescript-eslint/no-use-before-define
- return new File(rid);
-}
-
/** Open a file and return an instance of the `File` object
* synchronously.
*
* const file = Deno.openSync("/foo/bar.txt");
*/
export function openSync(filename: string, mode: OpenMode = "r"): File {
- return resOpen(sendSync(...reqOpen(filename, mode)));
+ const rid = sendSyncJson(dispatch.OP_OPEN, { filename, mode });
+ return new File(rid);
}
/** Open a file and return an instance of the `File` object.
@@ -55,7 +40,8 @@ export async function open(
filename: string,
mode: OpenMode = "r"
): Promise<File> {
- return resOpen(await sendAsync(...reqOpen(filename, mode)));
+ const rid = await sendAsyncJson(dispatch.OP_OPEN, { filename, mode });
+ return new File(rid);
}
function reqRead(
@@ -165,23 +151,13 @@ export async function write(rid: number, p: Uint8Array): Promise<number> {
}
}
-function reqSeek(
- rid: number,
- offset: number,
- whence: SeekMode
-): [flatbuffers.Builder, msg.Any, flatbuffers.Offset] {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Seek.createSeek(builder, rid, offset, whence);
- return [builder, msg.Any.Seek, inner];
-}
-
/** Seek a file ID synchronously to the given offset under mode given by `whence`.
*
* const file = Deno.openSync("/foo/bar.txt");
* Deno.seekSync(file.rid, 0, 0);
*/
export function seekSync(rid: number, offset: number, whence: SeekMode): void {
- sendSync(...reqSeek(rid, offset, whence));
+ sendSyncJson(dispatch.OP_SEEK, { rid, offset, whence });
}
/** Seek a file ID to the given offset under mode given by `whence`.
@@ -196,14 +172,12 @@ export async function seek(
offset: number,
whence: SeekMode
): Promise<void> {
- await sendAsync(...reqSeek(rid, offset, whence));
+ await sendAsyncJson(dispatch.OP_SEEK, { rid, offset, whence });
}
/** Close the file ID. */
export function close(rid: number): void {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Close.createClose(builder, rid);
- sendSync(builder, msg.Any.Close, inner);
+ sendSyncJson(dispatch.OP_CLOSE, { rid });
}
/** The Deno abstraction for reading and writing files. */
diff --git a/js/format_error.ts b/js/format_error.ts
index 6670b05e2..dde0f6a58 100644
--- a/js/format_error.ts
+++ b/js/format_error.ts
@@ -1,17 +1,9 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
-import { assert } from "./util";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
+// TODO(bartlomieju): move to `repl.ts`?
export function formatError(errString: string): string {
- const builder = flatbuffers.createBuilder();
- const errString_ = builder.createString(errString);
- const offset = msg.FormatError.createFormatError(builder, errString_);
- const baseRes = sendSync(builder, msg.Any.FormatError, offset);
- assert(baseRes != null);
- assert(msg.Any.FormatErrorRes === baseRes!.innerType());
- const formatErrorResMsg = new msg.FormatErrorRes();
- assert(baseRes!.inner(formatErrorResMsg) != null);
- const formattedError = formatErrorResMsg.error();
- assert(formatError != null);
- return formattedError!;
+ const res = sendSync(dispatch.OP_FORMAT_ERROR, { error: errString });
+ return res.error;
}
diff --git a/js/get_random_values.ts b/js/get_random_values.ts
index d5c0828c5..154e77f75 100644
--- a/js/get_random_values.ts
+++ b/js/get_random_values.ts
@@ -1,15 +1,8 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
import { assert } from "./util";
-function req(
- typedArray: ArrayBufferView
-): [flatbuffers.Builder, msg.Any, flatbuffers.Offset, ArrayBufferView] {
- const builder = flatbuffers.createBuilder();
- const inner = msg.GetRandomValues.createGetRandomValues(builder);
- return [builder, msg.Any.GetRandomValues, inner, typedArray];
-}
-
/** Synchronously collects cryptographically secure random values. The
* underlying CSPRNG in use is Rust's `rand::rngs::ThreadRng`.
*
@@ -28,6 +21,11 @@ export function getRandomValues<
>(typedArray: T): T {
assert(typedArray !== null, "Input must not be null");
assert(typedArray.length <= 65536, "Input must not be longer than 65536");
- sendSync(...req(typedArray as ArrayBufferView));
+ const ui8 = new Uint8Array(
+ typedArray.buffer,
+ typedArray.byteOffset,
+ typedArray.byteLength
+ );
+ sendSync(dispatch.OP_GET_RANDOM_VALUES, {}, ui8);
return typedArray;
}
diff --git a/js/main.ts b/js/main.ts
index 769f522a6..25e27b69f 100644
--- a/js/main.ts
+++ b/js/main.ts
@@ -22,12 +22,12 @@ export default function denoMain(
preserveDenoNamespace: boolean = true,
name?: string
): void {
- const startResMsg = os.start(preserveDenoNamespace, name);
+ const s = os.start(preserveDenoNamespace, name);
- setVersions(startResMsg.denoVersion()!, startResMsg.v8Version()!);
+ setVersions(s.denoVersion, s.v8Version);
// handle `--version`
- if (startResMsg.versionFlag()) {
+ if (s.versionFlag) {
console.log("deno:", deno.version.deno);
console.log("v8:", deno.version.v8);
console.log("typescript:", deno.version.typescript);
@@ -36,24 +36,22 @@ export default function denoMain(
setPrepareStackTrace(Error);
- const mainModule = startResMsg.mainModule();
- if (mainModule) {
- assert(mainModule.length > 0);
- setLocation(mainModule);
+ if (s.mainModule) {
+ assert(s.mainModule.length > 0);
+ setLocation(s.mainModule);
}
- const cwd = startResMsg.cwd();
- log("cwd", cwd);
+ log("cwd", s.cwd);
- for (let i = 1; i < startResMsg.argvLength(); i++) {
- args.push(startResMsg.argv(i));
+ for (let i = 1; i < s.argv.length; i++) {
+ args.push(s.argv[i]);
}
log("args", args);
Object.freeze(args);
if (window["_xevalWrapper"] !== undefined) {
- xevalMain(window["_xevalWrapper"] as XevalFunc, startResMsg.xevalDelim());
- } else if (!mainModule) {
+ xevalMain(window["_xevalWrapper"] as XevalFunc, s.xevalDelim);
+ } else if (!s.mainModule) {
replLoop();
}
}
diff --git a/js/metrics.ts b/js/metrics.ts
index e93e9528c..48e3102e5 100644
--- a/js/metrics.ts
+++ b/js/metrics.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { assert } from "./util";
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
export interface Metrics {
opsDispatched: number;
@@ -10,27 +10,6 @@ export interface Metrics {
bytesReceived: number;
}
-function req(): [flatbuffers.Builder, msg.Any, flatbuffers.Offset] {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Metrics.createMetrics(builder);
- return [builder, msg.Any.Metrics, inner];
-}
-
-function res(baseRes: null | msg.Base): Metrics {
- assert(baseRes !== null);
- assert(msg.Any.MetricsRes === baseRes!.innerType());
- const res = new msg.MetricsRes();
- assert(baseRes!.inner(res) !== null);
-
- return {
- opsDispatched: res.opsDispatched().toFloat64(),
- opsCompleted: res.opsCompleted().toFloat64(),
- bytesSentControl: res.bytesSentControl().toFloat64(),
- bytesSentData: res.bytesSentData().toFloat64(),
- bytesReceived: res.bytesReceived().toFloat64()
- };
-}
-
/** Receive metrics from the privileged side of Deno.
*
* > console.table(Deno.metrics())
@@ -45,5 +24,5 @@ function res(baseRes: null | msg.Base): Metrics {
* └──────────────────┴────────┘
*/
export function metrics(): Metrics {
- return res(sendSync(...req()));
+ return sendSync(dispatch.OP_METRICS);
}
diff --git a/js/net.ts b/js/net.ts
index 9c3bfbba5..b478ae613 100644
--- a/js/net.ts
+++ b/js/net.ts
@@ -1,8 +1,9 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { EOF, Reader, Writer, Closer } from "./io";
-import { assert, notImplemented } from "./util";
-import { sendSync, sendAsync, msg, flatbuffers } from "./dispatch_flatbuffers";
+import { notImplemented } from "./util";
import { read, write, close } from "./files";
+import * as dispatch from "./dispatch";
+import { sendSync, sendAsync } from "./dispatch_json";
export type Network = "tcp";
// TODO support other types:
@@ -36,10 +37,7 @@ enum ShutdownMode {
}
function shutdown(rid: number, how: ShutdownMode): void {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Shutdown.createShutdown(builder, rid, how);
- const baseRes = sendSync(builder, msg.Any.Shutdown, inner);
- assert(baseRes == null);
+ sendSync(dispatch.OP_SHUTDOWN, { rid, how });
}
class ConnImpl implements Conn {
@@ -80,14 +78,9 @@ class ListenerImpl implements Listener {
constructor(readonly rid: number) {}
async accept(): Promise<Conn> {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Accept.createAccept(builder, this.rid);
- const baseRes = await sendAsync(builder, msg.Any.Accept, inner);
- assert(baseRes != null);
- assert(msg.Any.NewConn === baseRes!.innerType());
- const res = new msg.NewConn();
- assert(baseRes!.inner(res) != null);
- return new ConnImpl(res.rid(), res.remoteAddr()!, res.localAddr()!);
+ const res = await sendAsync(dispatch.OP_ACCEPT, { rid: this.rid });
+ // TODO(bartlomieju): add remoteAddr and localAddr on Rust side
+ return new ConnImpl(res.rid, res.remoteAddr!, res.localAddr!);
}
close(): void {
@@ -143,16 +136,8 @@ export interface Conn extends Reader, Writer, Closer {
* See `dial()` for a description of the network and address parameters.
*/
export function listen(network: Network, address: string): Listener {
- const builder = flatbuffers.createBuilder();
- const network_ = builder.createString(network);
- const address_ = builder.createString(address);
- const inner = msg.Listen.createListen(builder, network_, address_);
- const baseRes = sendSync(builder, msg.Any.Listen, inner);
- assert(baseRes != null);
- assert(msg.Any.ListenRes === baseRes!.innerType());
- const res = new msg.ListenRes();
- assert(baseRes!.inner(res) != null);
- return new ListenerImpl(res.rid());
+ const rid = sendSync(dispatch.OP_LISTEN, { network, address });
+ return new ListenerImpl(rid);
}
/** Dial connects to the address on the named network.
@@ -183,16 +168,9 @@ export function listen(network: Network, address: string): Listener {
* dial("tcp", ":80")
*/
export async function dial(network: Network, address: string): Promise<Conn> {
- const builder = flatbuffers.createBuilder();
- const network_ = builder.createString(network);
- const address_ = builder.createString(address);
- const inner = msg.Dial.createDial(builder, network_, address_);
- const baseRes = await sendAsync(builder, msg.Any.Dial, inner);
- assert(baseRes != null);
- assert(msg.Any.NewConn === baseRes!.innerType());
- const res = new msg.NewConn();
- assert(baseRes!.inner(res) != null);
- return new ConnImpl(res.rid(), res.remoteAddr()!, res.localAddr()!);
+ const res = await sendAsync(dispatch.OP_DIAL, { network, address });
+ // TODO(bartlomieju): add remoteAddr and localAddr on Rust side
+ return new ConnImpl(res.rid, res.remoteAddr!, res.localAddr!);
}
/** **RESERVED** */
diff --git a/js/os.ts b/js/os.ts
index f8938ab70..c44c27825 100644
--- a/js/os.ts
+++ b/js/os.ts
@@ -1,8 +1,7 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { core } from "./core";
import * as dispatch from "./dispatch";
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
-import * as dispatchJson from "./dispatch_json";
+import { sendSync } from "./dispatch_json";
import { assert } from "./util";
import * as util from "./util";
import { window } from "./window";
@@ -24,21 +23,17 @@ function setGlobals(pid_: number, noColor_: boolean): void {
* console.log(Deno.isTTY().stdout);
*/
export function isTTY(): { stdin: boolean; stdout: boolean; stderr: boolean } {
- return dispatchJson.sendSync(dispatch.OP_IS_TTY);
+ return sendSync(dispatch.OP_IS_TTY);
}
/** Exit the Deno process with optional exit code. */
export function exit(code = 0): never {
- dispatchJson.sendSync(dispatch.OP_EXIT, { code });
+ sendSync(dispatch.OP_EXIT, { code });
return util.unreachable();
}
function setEnv(key: string, value: string): void {
- const builder = flatbuffers.createBuilder();
- const key_ = builder.createString(key);
- const value_ = builder.createString(value);
- const inner = msg.SetEnv.createSetEnv(builder, key_, value_);
- sendSync(builder, msg.Any.SetEnv, inner);
+ sendSync(dispatch.OP_SET_ENV, { key, value });
}
/** Returns a snapshot of the environment variables at invocation. Mutating a
@@ -53,7 +48,7 @@ function setEnv(key: string, value: string): void {
* console.log(myEnv.TEST_VAR == newEnv.TEST_VAR);
*/
export function env(): { [index: string]: string } {
- const env = dispatchJson.sendSync(dispatch.OP_ENV);
+ const env = sendSync(dispatch.OP_ENV);
return new Proxy(env, {
set(obj, prop: string, value: string): boolean {
setEnv(prop, value);
@@ -62,35 +57,35 @@ export function env(): { [index: string]: string } {
});
}
-/** Send to the privileged side that we have setup and are ready. */
-function sendStart(): msg.StartRes {
- const builder = flatbuffers.createBuilder();
- const startOffset = msg.Start.createStart(builder, 0 /* unused */);
- const baseRes = sendSync(builder, msg.Any.Start, startOffset);
- assert(baseRes != null);
- assert(msg.Any.StartRes === baseRes!.innerType());
- const startResMsg = new msg.StartRes();
- assert(baseRes!.inner(startResMsg) != null);
- return startResMsg;
+interface Start {
+ cwd: string;
+ pid: number;
+ argv: string[];
+ mainModule: string; // Absolute URL.
+ debugFlag: boolean;
+ depsFlag: boolean;
+ typesFlag: boolean;
+ versionFlag: boolean;
+ denoVersion: string;
+ v8Version: string;
+ noColor: boolean;
+ xevalDelim: string;
}
// This function bootstraps an environment within Deno, it is shared both by
// the runtime and the compiler environments.
// @internal
-export function start(
- preserveDenoNamespace = true,
- source?: string
-): msg.StartRes {
+export function start(preserveDenoNamespace = true, source?: string): Start {
core.setAsyncHandler(dispatch.asyncMsgFromRust);
// First we send an empty `Start` message to let the privileged side know we
// are ready. The response should be a `StartRes` message containing the CLI
// args and other info.
- const startResMsg = sendStart();
+ const s = sendSync(dispatch.OP_START);
- util.setLogDebug(startResMsg.debugFlag(), source);
+ util.setLogDebug(s.debugFlag, source);
- setGlobals(startResMsg.pid(), startResMsg.noColor());
+ setGlobals(s.pid, s.noColor);
if (preserveDenoNamespace) {
util.immutableDefine(window, "Deno", window.Deno);
@@ -105,7 +100,7 @@ export function start(
assert(window.Deno === undefined);
}
- return startResMsg;
+ return s;
}
/**
@@ -113,18 +108,10 @@ export function start(
* Requires the `--allow-env` flag.
*/
export function homeDir(): string {
- const builder = flatbuffers.createBuilder();
- const inner = msg.HomeDir.createHomeDir(builder);
- const baseRes = sendSync(builder, msg.Any.HomeDir, inner)!;
- assert(msg.Any.HomeDirRes === baseRes.innerType());
- const res = new msg.HomeDirRes();
- assert(baseRes.inner(res) != null);
- const path = res.path();
-
+ const path = sendSync(dispatch.OP_HOME_DIR);
if (!path) {
throw new Error("Could not get home directory.");
}
-
return path;
}
@@ -133,5 +120,5 @@ export function homeDir(): string {
* Requires the `--allow-env` flag.
*/
export function execPath(): string {
- return dispatchJson.sendSync(dispatch.OP_EXEC_PATH);
+ return sendSync(dispatch.OP_EXEC_PATH);
}
diff --git a/js/performance.ts b/js/performance.ts
index 7aaa7ae45..d2f339c46 100644
--- a/js/performance.ts
+++ b/js/performance.ts
@@ -1,6 +1,11 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
-import { assert } from "./util";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
+
+interface NowResponse {
+ seconds: number;
+ subsecNanos: number;
+}
export class Performance {
/** Returns a current time from Deno's start in milliseconds.
@@ -11,12 +16,7 @@ export class Performance {
* console.log(`${t} ms since start!`);
*/
now(): number {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Now.createNow(builder);
- const baseRes = sendSync(builder, msg.Any.Now, inner)!;
- assert(msg.Any.NowRes === baseRes.innerType());
- const res = new msg.NowRes();
- assert(baseRes.inner(res) != null);
- return res.seconds().toFloat64() * 1e3 + res.subsecNanos() / 1e6;
+ const res = sendSync(dispatch.OP_NOW) as NowResponse;
+ return res.seconds * 1e3 + res.subsecNanos / 1e6;
}
}
diff --git a/js/permissions.ts b/js/permissions.ts
index 822ae8cbd..bc969f3a8 100644
--- a/js/permissions.ts
+++ b/js/permissions.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
-import { assert } from "./util";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
/** Permissions as granted by the caller */
export interface Permissions {
@@ -15,23 +15,6 @@ export interface Permissions {
export type Permission = keyof Permissions;
-function getReq(): [flatbuffers.Builder, msg.Any, flatbuffers.Offset] {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Permissions.createPermissions(builder);
- return [builder, msg.Any.Permissions, inner];
-}
-
-function createPermissions(inner: msg.PermissionsRes): Permissions {
- return {
- read: inner.read(),
- write: inner.write(),
- net: inner.net(),
- env: inner.env(),
- run: inner.run(),
- hrtime: inner.hrtime()
- };
-}
-
/** Inspect granted permissions for the current program.
*
* if (Deno.permissions().read) {
@@ -40,24 +23,7 @@ function createPermissions(inner: msg.PermissionsRes): Permissions {
* }
*/
export function permissions(): Permissions {
- const baseRes = sendSync(...getReq())!;
- assert(msg.Any.PermissionsRes === baseRes.innerType());
- const res = new msg.PermissionsRes();
- assert(baseRes.inner(res) != null);
- // TypeScript cannot track assertion above, therefore not null assertion
- return createPermissions(res);
-}
-
-function revokeReq(
- permission: string
-): [flatbuffers.Builder, msg.Any, flatbuffers.Offset] {
- const builder = flatbuffers.createBuilder();
- const permission_ = builder.createString(permission);
- const inner = msg.PermissionRevoke.createPermissionRevoke(
- builder,
- permission_
- );
- return [builder, msg.Any.PermissionRevoke, inner];
+ return sendSync(dispatch.OP_PERMISSIONS) as Permissions;
}
/** Revoke a permission. When the permission was already revoked nothing changes
@@ -69,5 +35,5 @@ function revokeReq(
* Deno.readFile("example.test"); // -> error or permission prompt
*/
export function revokePermission(permission: Permission): void {
- sendSync(...revokeReq(permission));
+ sendSync(dispatch.OP_REVOKE_PERMISSION, { permission });
}
diff --git a/js/process.ts b/js/process.ts
index b2b6d4734..dd4f70103 100644
--- a/js/process.ts
+++ b/js/process.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { sendSync, sendAsync, msg, flatbuffers } from "./dispatch_flatbuffers";
-
+import { sendSync, sendAsync } from "./dispatch_json";
+import * as dispatch from "./dispatch";
import { File, close } from "./files";
import { ReadCloser, WriteCloser } from "./io";
import { readAll } from "./buffer";
@@ -31,21 +31,22 @@ export interface RunOptions {
stdin?: ProcessStdio | number;
}
-async function runStatus(rid: number): Promise<ProcessStatus> {
- const builder = flatbuffers.createBuilder();
- const inner = msg.RunStatus.createRunStatus(builder, rid);
+interface RunStatusResponse {
+ gotSignal: boolean;
+ exitCode: number;
+ exitSignal: number;
+}
- const baseRes = await sendAsync(builder, msg.Any.RunStatus, inner);
- assert(baseRes != null);
- assert(msg.Any.RunStatusRes === baseRes!.innerType());
- const res = new msg.RunStatusRes();
- assert(baseRes!.inner(res) != null);
+async function runStatus(rid: number): Promise<ProcessStatus> {
+ const res = (await sendAsync(dispatch.OP_RUN_STATUS, {
+ rid
+ })) as RunStatusResponse;
- if (res.gotSignal()) {
- const signal = res.exitSignal();
+ if (res.gotSignal) {
+ const signal = res.exitSignal;
return { signal, success: false };
} else {
- const code = res.exitCode();
+ const code = res.exitCode;
return { code, success: code === 0 };
}
}
@@ -56,9 +57,7 @@ async function runStatus(rid: number): Promise<ProcessStatus> {
* Requires the `--allow-run` flag.
*/
export function kill(pid: number, signo: number): void {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Kill.createKill(builder, pid, signo);
- sendSync(builder, msg.Any.Kill, inner);
+ sendSync(dispatch.OP_KILL, { pid, signo });
}
export class Process {
@@ -69,20 +68,20 @@ export class Process {
readonly stderr?: ReadCloser;
// @internal
- constructor(res: msg.RunRes) {
- this.rid = res.rid();
- this.pid = res.pid();
+ constructor(res: RunResponse) {
+ this.rid = res.rid;
+ this.pid = res.pid;
- if (res.stdinRid() > 0) {
- this.stdin = new File(res.stdinRid());
+ if (res.stdinRid && res.stdinRid > 0) {
+ this.stdin = new File(res.stdinRid);
}
- if (res.stdoutRid() > 0) {
- this.stdout = new File(res.stdoutRid());
+ if (res.stdoutRid && res.stdoutRid > 0) {
+ this.stdout = new File(res.stdoutRid);
}
- if (res.stderrRid() > 0) {
- this.stderr = new File(res.stderrRid());
+ if (res.stderrRid && res.stderrRid > 0) {
+ this.stderr = new File(res.stderrRid);
}
}
@@ -135,14 +134,13 @@ export interface ProcessStatus {
signal?: number; // TODO: Make this a string, e.g. 'SIGTERM'.
}
-function stdioMap(s: ProcessStdio): msg.ProcessStdio {
+// TODO: this method is only used to validate proper option, probably can be renamed
+function stdioMap(s: string): string {
switch (s) {
case "inherit":
- return msg.ProcessStdio.Inherit;
case "piped":
- return msg.ProcessStdio.Piped;
case "null":
- return msg.ProcessStdio.Null;
+ return s;
default:
return unreachable();
}
@@ -152,6 +150,13 @@ function isRid(arg: unknown): arg is number {
return !isNaN(arg as number);
}
+interface RunResponse {
+ rid: number;
+ pid: number;
+ stdinRid: number | null;
+ stdoutRid: number | null;
+ stderrRid: number | null;
+}
/**
* Spawns new subprocess.
*
@@ -166,71 +171,56 @@ function isRid(arg: unknown): arg is number {
* they can be set to either `ProcessStdio` or `rid` of open file.
*/
export function run(opt: RunOptions): Process {
- const builder = flatbuffers.createBuilder();
- const argsOffset = msg.Run.createArgsVector(
- builder,
- opt.args.map((a): number => builder.createString(a))
- );
- const cwdOffset = opt.cwd == null ? 0 : builder.createString(opt.cwd);
- const kvOffset: flatbuffers.Offset[] = [];
+ assert(opt.args.length > 0);
+ let env: Array<[string, string]> = [];
if (opt.env) {
- for (const [key, val] of Object.entries(opt.env)) {
- const keyOffset = builder.createString(key);
- const valOffset = builder.createString(String(val));
- kvOffset.push(msg.KeyValue.createKeyValue(builder, keyOffset, valOffset));
- }
+ env = Array.from(Object.entries(opt.env));
}
- const envOffset = msg.Run.createEnvVector(builder, kvOffset);
- let stdInOffset = stdioMap("inherit");
- let stdOutOffset = stdioMap("inherit");
- let stdErrOffset = stdioMap("inherit");
- let stdinRidOffset = 0;
- let stdoutRidOffset = 0;
- let stderrRidOffset = 0;
+ let stdin = stdioMap("inherit");
+ let stdout = stdioMap("inherit");
+ let stderr = stdioMap("inherit");
+ let stdinRid = 0;
+ let stdoutRid = 0;
+ let stderrRid = 0;
if (opt.stdin) {
if (isRid(opt.stdin)) {
- stdinRidOffset = opt.stdin;
+ stdinRid = opt.stdin;
} else {
- stdInOffset = stdioMap(opt.stdin);
+ stdin = stdioMap(opt.stdin);
}
}
if (opt.stdout) {
if (isRid(opt.stdout)) {
- stdoutRidOffset = opt.stdout;
+ stdoutRid = opt.stdout;
} else {
- stdOutOffset = stdioMap(opt.stdout);
+ stdout = stdioMap(opt.stdout);
}
}
if (opt.stderr) {
if (isRid(opt.stderr)) {
- stderrRidOffset = opt.stderr;
+ stderrRid = opt.stderr;
} else {
- stdErrOffset = stdioMap(opt.stderr);
+ stderr = stdioMap(opt.stderr);
}
}
- const inner = msg.Run.createRun(
- builder,
- argsOffset,
- cwdOffset,
- envOffset,
- stdInOffset,
- stdOutOffset,
- stdErrOffset,
- stdinRidOffset,
- stdoutRidOffset,
- stderrRidOffset
- );
- const baseRes = sendSync(builder, msg.Any.Run, inner);
- assert(baseRes != null);
- assert(msg.Any.RunRes === baseRes!.innerType());
- const res = new msg.RunRes();
- assert(baseRes!.inner(res) != null);
+ const req = {
+ args: opt.args.map(String),
+ cwd: opt.cwd,
+ env,
+ stdin,
+ stdout,
+ stderr,
+ stdinRid,
+ stdoutRid,
+ stderrRid
+ };
+ const res = sendSync(dispatch.OP_RUN, req) as RunResponse;
return new Process(res);
}
diff --git a/js/repl.ts b/js/repl.ts
index c971e4420..ac6700657 100644
--- a/js/repl.ts
+++ b/js/repl.ts
@@ -1,12 +1,12 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { assert } from "./util";
import { close } from "./files";
-import { sendSync, sendAsync, msg, flatbuffers } from "./dispatch_flatbuffers";
import { exit } from "./os";
import { window } from "./window";
import { core } from "./core";
import { formatError } from "./format_error";
import { stringifyArgs } from "./console";
+import * as dispatch from "./dispatch";
+import { sendSync, sendAsync } from "./dispatch_json";
/**
* REPL logging.
@@ -43,34 +43,12 @@ const replCommands = {
};
function startRepl(historyFile: string): number {
- const builder = flatbuffers.createBuilder();
- const historyFile_ = builder.createString(historyFile);
- const inner = msg.ReplStart.createReplStart(builder, historyFile_);
-
- const baseRes = sendSync(builder, msg.Any.ReplStart, inner);
- assert(baseRes != null);
- assert(msg.Any.ReplStartRes === baseRes!.innerType());
- const innerRes = new msg.ReplStartRes();
- assert(baseRes!.inner(innerRes) != null);
- const rid = innerRes.rid();
- return rid;
+ return sendSync(dispatch.OP_REPL_START, { historyFile });
}
// @internal
export async function readline(rid: number, prompt: string): Promise<string> {
- const builder = flatbuffers.createBuilder();
- const prompt_ = builder.createString(prompt);
- const inner = msg.ReplReadline.createReplReadline(builder, rid, prompt_);
-
- const baseRes = await sendAsync(builder, msg.Any.ReplReadline, inner);
-
- assert(baseRes != null);
- assert(msg.Any.ReplReadlineRes === baseRes!.innerType());
- const innerRes = new msg.ReplReadlineRes();
- assert(baseRes!.inner(innerRes) != null);
- const line = innerRes.line();
- assert(line !== null);
- return line || "";
+ return sendAsync(dispatch.OP_REPL_READLINE, { rid, prompt });
}
// Error messages that allow users to continue input
diff --git a/js/resources.ts b/js/resources.ts
index 49093fab1..6e2ec202b 100644
--- a/js/resources.ts
+++ b/js/resources.ts
@@ -1,6 +1,6 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
-import { assert } from "./util";
-import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
+import * as dispatch from "./dispatch";
+import { sendSync } from "./dispatch_json";
export interface ResourceMap {
[rid: number]: string;
@@ -10,20 +10,10 @@ export interface ResourceMap {
* representation.
*/
export function resources(): ResourceMap {
- const builder = flatbuffers.createBuilder();
- const inner = msg.Resource.createResource(builder, 0, 0);
- const baseRes = sendSync(builder, msg.Any.Resources, inner);
- assert(baseRes !== null);
- assert(msg.Any.ResourcesRes === baseRes!.innerType());
- const res = new msg.ResourcesRes();
- assert(baseRes!.inner(res) !== null);
-
+ const res = sendSync(dispatch.OP_RESOURCES) as Array<[number, string]>;
const resources: ResourceMap = {};
-
- for (let i = 0; i < res.resourcesLength(); i++) {
- const item = res.resources(i)!;
- resources[item.rid()!] = item.repr()!;
+ for (const resourceTuple of res) {
+ resources[resourceTuple[0]] = resourceTuple[1];
}
-
return resources;
}
diff --git a/js/timers.ts b/js/timers.ts
index cb0fd531c..079e779c4 100644
--- a/js/timers.ts
+++ b/js/timers.ts
@@ -1,7 +1,8 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
import { assert } from "./util";
-import { sendAsync, sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
import { window } from "./window";
+import * as dispatch from "./dispatch";
+import { sendSync, sendAsync } from "./dispatch_json";
interface Timer {
id: number;
@@ -37,11 +38,8 @@ function getTime(): number {
}
function clearGlobalTimeout(): void {
- const builder = flatbuffers.createBuilder();
- const inner = msg.GlobalTimerStop.createGlobalTimerStop(builder);
globalTimeoutDue = null;
- let res = sendSync(builder, msg.Any.GlobalTimerStop, inner);
- assert(res == null);
+ sendSync(dispatch.OP_GLOBAL_TIMER_STOP);
}
async function setGlobalTimeout(due: number, now: number): Promise<void> {
@@ -52,12 +50,8 @@ async function setGlobalTimeout(due: number, now: number): Promise<void> {
assert(timeout >= 0);
// Send message to the backend.
- const builder = flatbuffers.createBuilder();
- msg.GlobalTimer.startGlobalTimer(builder);
- msg.GlobalTimer.addTimeout(builder, timeout);
- const inner = msg.GlobalTimer.endGlobalTimer(builder);
globalTimeoutDue = due;
- await sendAsync(builder, msg.Any.GlobalTimer, inner);
+ await sendAsync(dispatch.OP_GLOBAL_TIMER, { timeout });
// eslint-disable-next-line @typescript-eslint/no-use-before-define
fireTimers();
}
diff --git a/js/workers.ts b/js/workers.ts
index e59e853c5..7bcbe6279 100644
--- a/js/workers.ts
+++ b/js/workers.ts
@@ -1,7 +1,8 @@
// Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
/* eslint-disable @typescript-eslint/no-explicit-any */
-import { sendAsync, sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
-import { assert, log } from "./util";
+import * as dispatch from "./dispatch";
+import { sendAsync, sendSync } from "./dispatch_json";
+import { log } from "./util";
import { TextDecoder, TextEncoder } from "./text_encoding";
import { window } from "./window";
import { blobURLMap } from "./url";
@@ -26,61 +27,28 @@ function createWorker(
hasSourceCode: boolean,
sourceCode: Uint8Array
): number {
- const builder = flatbuffers.createBuilder();
- const specifier_ = builder.createString(specifier);
- const sourceCode_ = builder.createString(sourceCode);
- const inner = msg.CreateWorker.createCreateWorker(
- builder,
- specifier_,
+ return sendSync(dispatch.OP_CREATE_WORKER, {
+ specifier,
includeDenoNamespace,
hasSourceCode,
- sourceCode_
- );
- const baseRes = sendSync(builder, msg.Any.CreateWorker, inner);
- assert(baseRes != null);
- assert(
- msg.Any.CreateWorkerRes === baseRes!.innerType(),
- `base.innerType() unexpectedly is ${baseRes!.innerType()}`
- );
- const res = new msg.CreateWorkerRes();
- assert(baseRes!.inner(res) != null);
- return res.rid();
+ sourceCode: new TextDecoder().decode(sourceCode)
+ });
}
async function hostGetWorkerClosed(rid: number): Promise<void> {
- const builder = flatbuffers.createBuilder();
- const inner = msg.HostGetWorkerClosed.createHostGetWorkerClosed(builder, rid);
- await sendAsync(builder, msg.Any.HostGetWorkerClosed, inner);
+ await sendAsync(dispatch.OP_HOST_GET_WORKER_CLOSED, { rid });
}
function hostPostMessage(rid: number, data: any): void {
const dataIntArray = encodeMessage(data);
- const builder = flatbuffers.createBuilder();
- const inner = msg.HostPostMessage.createHostPostMessage(builder, rid);
- const baseRes = sendSync(
- builder,
- msg.Any.HostPostMessage,
- inner,
- dataIntArray
- );
- assert(baseRes != null);
+ sendSync(dispatch.OP_HOST_POST_MESSAGE, { rid }, dataIntArray);
}
async function hostGetMessage(rid: number): Promise<any> {
- const builder = flatbuffers.createBuilder();
- const inner = msg.HostGetMessage.createHostGetMessage(builder, rid);
- const baseRes = await sendAsync(builder, msg.Any.HostGetMessage, inner);
- assert(baseRes != null);
- assert(
- msg.Any.HostGetMessageRes === baseRes!.innerType(),
- `base.innerType() unexpectedly is ${baseRes!.innerType()}`
- );
- const res = new msg.HostGetMessageRes();
- assert(baseRes!.inner(res) != null);
-
- const dataArray = res.dataArray();
- if (dataArray != null) {
- return decodeMessage(dataArray);
+ const res = await sendAsync(dispatch.OP_HOST_GET_MESSAGE, { rid });
+
+ if (res.data != null) {
+ return decodeMessage(new Uint8Array(res.data));
} else {
return null;
}
@@ -91,36 +59,15 @@ export let onmessage: (e: { data: any }) => void = (): void => {};
export function postMessage(data: any): void {
const dataIntArray = encodeMessage(data);
- const builder = flatbuffers.createBuilder();
- const inner = msg.WorkerPostMessage.createWorkerPostMessage(builder);
- const baseRes = sendSync(
- builder,
- msg.Any.WorkerPostMessage,
- inner,
- dataIntArray
- );
- assert(baseRes != null);
+ sendSync(dispatch.OP_WORKER_POST_MESSAGE, {}, dataIntArray);
}
export async function getMessage(): Promise<any> {
log("getMessage");
- const builder = flatbuffers.createBuilder();
- const inner = msg.WorkerGetMessage.createWorkerGetMessage(
- builder,
- 0 /* unused */
- );
- const baseRes = await sendAsync(builder, msg.Any.WorkerGetMessage, inner);
- assert(baseRes != null);
- assert(
- msg.Any.WorkerGetMessageRes === baseRes!.innerType(),
- `base.innerType() unexpectedly is ${baseRes!.innerType()}`
- );
- const res = new msg.WorkerGetMessageRes();
- assert(baseRes!.inner(res) != null);
-
- const dataArray = res.dataArray();
- if (dataArray != null) {
- return decodeMessage(dataArray);
+ const res = await sendAsync(dispatch.OP_WORKER_GET_MESSAGE);
+
+ if (res.data != null) {
+ return decodeMessage(new Uint8Array(res.data));
} else {
return null;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 20:47:44 +0000