diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2018-07-06 16:26:34 -0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2018-07-06 18:25:09 -0400 |
commit | a2dde56c5961f451b9042c1f651af372c4984034 (patch) | |
tree | 06aaf64e257d9d6bd1f6f16eca2b02aab971c04b /src/binding.cc | |
parent | 9778eceaf5922b1e051859a68b2e02a2f1b1ee8b (diff) |
Remove channel parameter from deno_send/recv.
Diffstat (limited to 'src/binding.cc')
-rw-r--r-- | src/binding.cc | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/binding.cc b/src/binding.cc index 0bbcf8b94..50b029b90 100644 --- a/src/binding.cc +++ b/src/binding.cc @@ -167,15 +167,9 @@ void Send(const v8::FunctionCallbackInfo<v8::Value>& args) { v8::Locker locker(d->isolate); v8::EscapableHandleScope handle_scope(isolate); - CHECK_EQ(args.Length(), 2); - v8::Local<v8::Value> channel_v = args[0]; - CHECK(channel_v->IsString()); - v8::String::Utf8Value channel_vstr(isolate, channel_v); - const char* channel = *channel_vstr; - - v8::Local<v8::Value> ab_v = args[1]; + CHECK_EQ(args.Length(), 1); + v8::Local<v8::Value> ab_v = args[0]; CHECK(ab_v->IsArrayBuffer()); - auto ab = v8::Local<v8::ArrayBuffer>::Cast(ab_v); auto contents = ab->GetContents(); @@ -187,7 +181,7 @@ void Send(const v8::FunctionCallbackInfo<v8::Value>& args) { DCHECK_EQ(d->currentArgs, nullptr); d->currentArgs = &args; - d->cb(d, channel, buf); + d->cb(d, buf); d->currentArgs = nullptr; } @@ -293,7 +287,7 @@ int deno_execute(Deno* d, const char* js_filename, const char* js_source) { return deno::Execute(context, js_filename, js_source) ? 1 : 0; } -int deno_send(Deno* d, const char* channel, deno_buf buf) { +int deno_send(Deno* d, deno_buf buf) { v8::Locker locker(d->isolate); v8::Isolate::Scope isolate_scope(d->isolate); v8::HandleScope handle_scope(d->isolate); @@ -313,10 +307,8 @@ int deno_send(Deno* d, const char* channel, deno_buf buf) { auto ab = v8::ArrayBuffer::New(d->isolate, buf.len); memcpy(ab->GetContents().Data(), buf.data, buf.len); - v8::Local<v8::Value> args[2]; - args[0] = deno::v8_str(channel); - args[1] = ab; - + v8::Local<v8::Value> args[1]; + args[0] = ab; recv->Call(context->Global(), 1, args); if (try_catch.HasCaught()) { |