summaryrefslogtreecommitdiff
path: root/js/resources.ts
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-08-24 13:20:48 -0700
committerGitHub <noreply@github.com>2019-08-24 13:20:48 -0700
commit2235dd795d3cc6c24ff1bdd1bbdcd110b4b0bdfc (patch)
treea5811adc062cbb1c66f05c863c9be245cf4fd2d2 /js/resources.ts
parentbdc0a13261deaa3748f51d9948b4e7b92864c324 (diff)
Revert json ops (#2814)
* Revert "port more ops to JSON (#2809)" This reverts commit 137f33733d365026903d40e7cde6e34ac6c36dcf. * Revert "port ops to JSON: compiler, errors, fetch, files (#2804)" This reverts commit 79f82cf10ed1dbf91346994250d7311a4d74377a. * Revert "Port rest of os ops to JSON (#2802)" This reverts commit 5b2baa5c990fbeae747e952c5dcd7a5369e950b1.
Diffstat (limited to 'js/resources.ts')
-rw-r--r--js/resources.ts20
1 files changed, 15 insertions, 5 deletions
diff --git a/js/resources.ts b/js/resources.ts
index 6e2ec202b..49093fab1 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 * as dispatch from "./dispatch";
-import { sendSync } from "./dispatch_json";
+import { assert } from "./util";
+import { sendSync, msg, flatbuffers } from "./dispatch_flatbuffers";
export interface ResourceMap {
[rid: number]: string;
@@ -10,10 +10,20 @@ export interface ResourceMap {
* representation.
*/
export function resources(): ResourceMap {
- const res = sendSync(dispatch.OP_RESOURCES) as Array<[number, string]>;
+ 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 resources: ResourceMap = {};
- for (const resourceTuple of res) {
- resources[resourceTuple[0]] = resourceTuple[1];
+
+ for (let i = 0; i < res.resourcesLength(); i++) {
+ const item = res.resources(i)!;
+ resources[item.rid()!] = item.repr()!;
}
+
return resources;
}