refactor InitContext

cli/js/dispatch.ts

@@ -1,7 +1,6 @@
 // Copyright 2018-2019 the Deno authors. All rights reserved. MIT license.
 import * as minimal from "./dispatch_minimal.ts";
 import * as json from "./dispatch_json.ts";
-import { AsyncHandler } from "./native_plugins.ts";
 
 // These consts are shared with Rust. Update with care.
 export let OP_READ: number;
@@ -69,11 +68,11 @@ export let OP_DIAL_TLS: number;
 export let OP_HOSTNAME: number;
 export let OP_OPEN_NATIVE_PLUGIN: number;
 
-const NATIVE_PLUGIN_ASYNC_HANDLER_MAP: Map<number, AsyncHandler> = new Map();
+const NATIVE_PLUGIN_ASYNC_HANDLER_MAP: Map<number, MessageCallback> = new Map();
 
 export function setPluginAsyncHandler(
   opId: number,
-  handler: AsyncHandler
+  handler: MessageCallback
 ): void {
   NATIVE_PLUGIN_ASYNC_HANDLER_MAP.set(opId, handler);
 }

cli/js/native_plugins.ts

@@ -2,16 +2,12 @@ import { sendSync } from "./dispatch_json.ts";
 import { OP_OPEN_NATIVE_PLUGIN, setPluginAsyncHandler } from "./dispatch.ts";
 import { core } from "./core.ts";
 
-export interface AsyncHandler {
-  (opId: number, msg: Uint8Array): void;
-}
-
 interface NativePluginOp {
   dispatch(
     control: Uint8Array,
     zeroCopy?: ArrayBufferView | null
   ): Uint8Array | null;
-  setAsyncHandler(handler: AsyncHandler): void;
+  setAsyncHandler(handler: MessageCallback): void;
 }
 
 class NativePluginOpImpl implements NativePluginOp {
@@ -24,7 +20,7 @@ class NativePluginOpImpl implements NativePluginOp {
     return core.dispatch(this.opId, control, zeroCopy);
   }
 
-  setAsyncHandler(handler: AsyncHandler): void {
+  setAsyncHandler(handler: MessageCallback): void {
     setPluginAsyncHandler(this.opId, handler);
   }
 }

cli/ops/native_plugins.rs

@@ -26,28 +26,22 @@ fn open_plugin<P: AsRef<OsStr>>(lib_path: P) -> Result<Library, ErrBox> {
 
 struct NativePluginResource {
   lib: Library,
-  ops: Vec<(String, OpId)>,
+  ops: HashMap<String, OpId>,
 }
 
 impl Resource for NativePluginResource {}
 
 struct InitContext {
-  registry: Arc<deno::OpRegistry>,
-  plugin_rid: ResourceId,
-  ops: Vec<(String, OpId)>,
+  ops: HashMap<String, Box<OpDispatcher>>,
 }
 
 impl PluginInitContext for InitContext {
-  fn register_op(
-    &mut self,
-    name: &str,
-    op: Box<dyn Fn(&[u8], Option<PinnedBuf>) -> CoreOp + Send + Sync + 'static>,
-  ) -> OpId {
-    let opid = self
-      .registry
-      .register(&format!("{}_{}", self.plugin_rid, name), op);
-    self.ops.push((name.to_string(), opid));
-    opid
+  fn register_op(&mut self, name: &str, op: Box<OpDispatcher>) {
+    let existing = self.ops.insert(name.to_string(), op);
+    assert!(
+      existing.is_none(),
+      format!("Op already registered: {}", name)
+    );
   }
 }
 
@@ -71,7 +65,7 @@ pub fn op_open_native_plugin(
   let lib = open_plugin(filename)?;
   let plugin_resource = NativePluginResource {
     lib,
-    ops: Vec::new(),
+    ops: HashMap::new(),
   };
   let mut table = state.lock_resource_table();
   let rid = table.add("native_plugin", Box::new(plugin_resource));
@@ -83,17 +77,15 @@ pub fn op_open_native_plugin(
       .symbol::<PluginInitFn>("native_plugin_init")
   }?;
   let mut init_context = InitContext {
-    registry: registry.clone(),
-    plugin_rid: rid,
-    ops: Vec::new(),
+    ops: HashMap::new(),
   };
   init_fn(&mut init_context);
-  plugin_resource.ops.append(&mut init_context.ops);
-  let ops: HashMap<String, OpId> = plugin_resource
-    .ops
-    .iter()
-    .map(|record| (record.0.clone(), record.1))
-    .collect();
+  for op in init_context.ops {
+    let op_id = registry.register(&op.0, op.1);
+    plugin_resource.ops.insert(op.0, op_id);
+  }
 
-  Ok(JsonOp::Sync(json!({ "rid": rid, "ops": ops })))
+  Ok(JsonOp::Sync(
+    json!({ "rid": rid, "ops": plugin_resource.ops }),
+  ))
 }

core/ops.rs

@@ -27,7 +27,7 @@ pub type CoreError = ();
 pub type CoreOp = Op<CoreError>;
 
 /// Main type describing op
-type OpDispatcher =
+pub type OpDispatcher =
   dyn Fn(&[u8], Option<PinnedBuf>) -> CoreOp + Send + Sync + 'static;
 
 #[derive(Default)]

core/plugins.rs

@@ -1,4 +1,4 @@
-use crate::libdeno::{OpId, PinnedBuf};
+use crate::libdeno::PinnedBuf;
 use crate::ops::CoreOp;
 
 pub type PluginInitFn = fn(context: &mut dyn PluginInitContext);
@@ -8,7 +8,7 @@ pub trait PluginInitContext {
     &mut self,
     name: &str,
     op: Box<dyn Fn(&[u8], Option<PinnedBuf>) -> CoreOp + Send + Sync + 'static>,
-  ) -> OpId;
+  );
 }
 
 #[macro_export]