jscall 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad6ca4017b93ba7f1675b3d1e3727a143d5e413f86d9f000966f7eae9306d06
-  data.tar.gz: e50ef13d47441f195194e4a36886b506266f87339f9d7bbf7f5b9d79dc500814
+  metadata.gz: ccebaf9700a3adef5c0bba832014a8f29ecfecee4d2e6fd1303c77a986bd6e5a
+  data.tar.gz: ea718525489e87dd340200008540c269b33e5b3432a8b6eb6ddd6103ca53329e
 SHA512:
-  metadata.gz: 16a7885d6e0e5ef993a9f8ea43a6dc2bcfe78624f20cd10517642c00f59525b1edab1a91ab99367f962d3f63ba5a5c6705bf7cad915673613fb9ee805358baeb
-  data.tar.gz: 1f7d95224652882839fd9bce1d4fd539021980018ecc1cca73aed56e598a2c034b8800cdfb88cc6ffd4b09f6488867e33335e8180f7e5e81aa29663ebdc6a5d4
+  metadata.gz: d6852583f9276d903886d9f3ff1dbcf3ca16569844567f43751bee97917715d0014c8bf598e84aae7a2ba4db6145398b397c1b21e59d921755a6c8d3b0f6bee9
+  data.tar.gz: 3fe7e88204d5971a3a425ca3a2329f560a547204e06e009f791017036ef75e2054da4716b2ddc948b8d170d3eaa05845c30551a88e700cda03eee814530f4857

data/README.md

@@ -110,6 +110,11 @@ created in Ruby.
 Note that you must `await` every call to Ruby object since it is
 asynchronous call.
 
+A shorthand for `obj.to_a()` is `obj.to_a` in Ruby.  However,
+this shorthand is not available in JavaScript.
+You must explicitly write `obj.to_a()`
+in JavaScript when `obj` is a Ruby object.
+
 In JavaScript, `Ruby.exec` is available to run a program in Ruby.
 For example,
 
@@ -392,6 +397,22 @@ Jscall.config()
 
 ### Other configurations
 
+To obtain more detailed error messages,
+set a debugging level to 10.
+In Ruby,
+
+```
+Jscall.debug = 10
+```
+
+In JavaScript,
+
+```
+Ruby.setDebugLevel(10)
+```
+
+The default debugging level is 0.
+
 To change the name of the node command,
 
 ```

data/Rakefile

@@ -6,7 +6,11 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/test_*.rb"]
+  files = FileList["test/**/test_*.rb"]
+  unless /linux/ =~ RbConfig::CONFIG['host_os']
+    files.exclude "test/test_sync_io.rb"
+  end
+  t.test_files = files
 end
 
 task default: :test

data/lib/jscall/main.mjs

@@ -1,5 +1,12 @@
 // Copyright (C) 2022- Shigeru Chiba.  All rights reserved.
 
+let debug_level = 0
+
+// debug level is 0 (default) or 10.
+export const setDebugLevel = d => {
+    debug_level = d
+}
+
 export const cmd_eval = 1
 export const cmd_call = 2
 export const cmd_reply = 3
@@ -36,8 +43,8 @@ const exported = new class {
         }
     }
 
-    export_remoteref(prref) {   // proxy for remote reference
-        return prref.__self__.id
+    export_remoteref(rref) {   // proxy for remote reference
+        return rref.id
     }
 
     next_element() {
@@ -54,6 +61,8 @@ const exported = new class {
         const obj = this.objects[idx]
         if (typeof obj === 'number')
             throw `unknown index is given to find(): ${idx}`
+        else if (obj === null)
+            throw `null is exported? ${idx}`
         else
             return obj
     }
@@ -88,12 +97,12 @@ const remoteRefHandler = new class {
         else
             return (...args) => {
                 // this returns Promise
-                return funcall_to_ruby(obj.id, name, args)
+                return funcall_to_ruby(obj, name, args)
             }
     }
     apply(obj, self, args) {
         // this returns Promise
-        return funcall_to_ruby(obj.id, 'call', args)
+        return funcall_to_ruby(obj, 'call', args)
     }
 }
 
@@ -147,11 +156,11 @@ const encode_obj = obj => {
     else if (obj instanceof Map) {
         const hash = {}
         for (const [key, value] of obj.entries())
-            hash[key] = value
+            hash[key] = encode_obj(value)
         return [param_hash, hash]
     }
     else if (obj instanceof RemoteRef)
-        return [param_local_object, exported.export_remoteref(obj)]
+        return [param_local_object, exported.export_remoteref(obj.__self__)]
     else
         return [param_object, exported.export(obj)]
 }
@@ -196,6 +205,9 @@ export const decode_obj_or_error = obj => {
 const js_eval = eval
 
 export const funcall_from_ruby = cmd => {
+    if (debug_level >= 10)
+        console.error(`RubyToJS> ${cmd[3]} ${cmd[1]} ${cmd[2]}`)
+
     const receiver = decode_obj(cmd[2])
     const name = cmd[3]
     const args = cmd[4].map(e => decode_obj(e))
@@ -219,8 +231,8 @@ export const funcall_from_ruby = cmd => {
     }
     else {
         const f = Reflect.get(receiver, name)
-        if (f)
-            if (typeof f === 'function')
+        if (f !== undefined)
+            if (typeof f === 'function' && !(f instanceof RemoteRef))
                 return Reflect.apply(f, receiver, args)
             else if (args.length === 0)
                 return f    // obtain a propety
@@ -252,8 +264,10 @@ export const reply = (message_id, value, sync_mode) => {
     }
 }
 
-export const reply_error = (message_id, e) => {
-    const cmd = reply_with_piggyback([cmd_reply, message_id, encode_error(e)])
+export const reply_error = (message_id, error) => {
+    const msg = typeof error === 'string' ? error : error.toString() +
+                                                            '\n  ---\n' + error.stack
+    const cmd = reply_with_piggyback([cmd_reply, message_id, encode_error(msg)])
     stdout_puts(JSON.stringify(cmd))
 }
 
@@ -299,18 +313,22 @@ export const make_cmd_eval = src => {
     return reply_with_piggyback([cmd_eval, message_id, src])
 }
 
-let funcall_to_ruby = (receiver_id, name, args) => {
+let funcall_to_ruby = (receiver, name, args) => {
     return new Promise((resolve, reject) => {
-        const cmd = make_cmd_call(receiver_id, name, args)
+        const cmd = make_cmd_call(receiver, name, args)
         const message_id = cmd[1]
         callback_stack.push([message_id, resolve, reject])
+        if (debug_level >= 10)
+            console.error(`JStoRuby< ${name} ${message_id} ${cmd[2][1]}`)
+
         stdout_puts(JSON.stringify(cmd))
     })
 }
 
 export const set_funcall_to_ruby = f => { funcall_to_ruby = f }
 
-export const make_cmd_call = (receiver_id, name, args) => {
+export const make_cmd_call = (obj, name, args) => {
+    const receiver_id = exported.export_remoteref(obj)
     const message_id = fresh_id()
     const receiver = [param_local_object, receiver_id]
     const encoded_args = args.map(e => encode_obj(e))
@@ -475,9 +493,7 @@ export const start = async (stdin, use_stdout) => {
             else // cmd_retry and other unknown commands
                 reply_error(cmd[1], `invalid command ${cmd[0]}`)
         } catch (error) {
-            const msg = typeof error === 'string' ? error : error.toString() +
-                                                            '\n  ---\n' + error.stack
-            reply_error(cmd[1], msg)
+            reply_error(cmd[1], error)
         }
     }
 }

data/lib/jscall/synch.mjs

@@ -171,8 +171,8 @@ export const exec = src => {
     return event_loop()
 }
 
-main.set_funcall_to_ruby((receiver_id, name, args) => {
-    const cmd = main.make_cmd_call(receiver_id, name, args)
+main.set_funcall_to_ruby((receiver, name, args) => {
+    const cmd = main.make_cmd_call(receiver, name, args)
     main.stdout_puts(JSON.stringify(cmd))
     return event_loop()
 })

data/lib/jscall/version.rb

@@ -3,5 +3,5 @@
 # Copyright (C) 2022- Shigeru Chiba.  All rights reserved.
 
 module Jscall
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/lib/jscall.rb

@@ -393,13 +393,15 @@ module Jscall
                     if reply[1] != message_id
                         send_reply(reply[1], nil, false, CMD_REJECT)
                     else
-                        result = @pending_replies.delete(message_id)
-                        if result.nil?
-                            raise RuntimeError.new("bad CMD_RETRY: #{reply}")
-                        elsif result.is_a?(JavaScriptError)
-                            raise result
+                        if @pending_replies.key?(message_id)
+                            result = @pending_replies.delete(message_id)
+                            if result.is_a?(JavaScriptError)
+                                raise result
+                            else
+                                return result
+                            end
                         else
-                            return result
+                            raise RuntimeError.new("bad CMD_RETRY: #{reply}")
                         end
                     end
                 else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jscall
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shigeru Chiba
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webrick