fix json dispatch

denoland · Apr 15, 2020 · a2c146b · a2c146b
1 parent fdc303a
commit a2c146b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/cli/build.rs b/cli/build.rs
@@ -37,6 +37,7 @@ fn main() {
 
   // Main snapshot
   let bundle_path = PathBuf::from("super_runtime.js");
+  println!("cargo:rerun-if-changed={}", bundle_path.display());
   let snapshot_path = o.join("CLI_SNAPSHOT.bin");
 
   let main_module_name = deno_typescript::compile_bundle(

diff --git a/cli/super_runtime.js b/cli/super_runtime.js
@@ -1071,7 +1071,7 @@
   };
 
   // Using an object without a prototype because `Map` was causing GC problems.
-  const promiseTableMin = Object.create(null);
+  const promiseTable = Object.create(null);
 
   // Note it's important that promiseId starts at 1 instead of 0, because sync
   // messages are indicated with promiseId 0. If we ever add wrap around logic for
@@ -1130,8 +1130,8 @@
   function asyncMsgFromRustMinimal(ui8) {
     const record = recordFromBufMinimal(ui8);
     const { promiseId } = record;
-    const promise = promiseTableMin[promiseId];
-    delete promiseTableMin[promiseId];
+    const promise = promiseTable[promiseId];
+    delete promiseTable[promiseId];
     assert(promise);
     promise.resolve(record);
   }
@@ -1149,7 +1149,7 @@
       promise.resolve(record);
     } else {
       // Async result.
-      promiseTableMin[promiseId] = promise;
+      promiseTable[promiseId] = promise;
     }
 
     const res = await promise;
@@ -1183,7 +1183,7 @@
   }
 
   function asyncMsgFromRustJson(resUi8) {
-    const res = decode(resUi8);
+    const res = jsonDecode(resUi8);
     assert(res.promiseId != null);
 
     const promise = promiseTable[res.promiseId];
@@ -1195,10 +1195,10 @@
   function sendSyncJson(opName, args = {}, zeroCopy) {
     const opId = OPS_CACHE[opName];
     log("sendSync", opName, opId);
-    const argsUi8 = encode(args);
+    const argsUi8 = jsonEncode(args);
     const resUi8 = core.dispatch(opId, argsUi8, zeroCopy);
     assert(resUi8 != null);
-    const res = decode(resUi8);
+    const res = jsonDecode(resUi8);
     assert(res.promiseId == null);
     return unwrapResponseJson(res);
   }
@@ -1210,11 +1210,11 @@
     args = Object.assign(args, { promiseId });
     const promise = createResolvable();
 
-    const argsUi8 = encode(args);
+    const argsUi8 = jsonEncode(args);
     const buf = core.dispatch(opId, argsUi8, zeroCopy);
     if (buf) {
       // Sync result.
-      const res = decode(buf);
+      const res = jsonDecode(buf);
       promise.resolve(res);
     } else {
       // Async result.