Add more value serialization between JS & Python bridge (#26)

* Add more complete serde between JS and Python

* Test Node 10 & 11, and Python 3.7

Author: Ryan Munro

.travis.yml

@@ -2,34 +2,16 @@ language: python
 os:
     - "linux"
 env:
+    - NODE_VERSION="11"
+    - NODE_VERSION="10"
     - NODE_VERSION="9"
     - NODE_VERSION="8"
     - NODE_VERSION="7.5"
-    # - NODE_VERSION="7.3"
-    # - NODE_VERSION="7.2"
-    # - NODE_VERSION="7.1"
-    # - NODE_VERSION="7.0"
     - NODE_VERSION="6.1"
-    # - NODE_VERSION="6.0"
     - NODE_VERSION="5.11"
-    # - NODE_VERSION="5.10"
-    # - NODE_VERSION="5.9"
-    # - NODE_VERSION="5.8"
-    # - NODE_VERSION="5.7"
-    # - NODE_VERSION="5.6"
-    # - NODE_VERSION="5.5"
-    # - NODE_VERSION="5.4"
-    # - NODE_VERSION="5.3"
-    # - NODE_VERSION="5.2"
-    # - NODE_VERSION="5.1"
-    # - NODE_VERSION="5.0"
     - NODE_VERSION="4.4"
-    # - NODE_VERSION="4.3"
-    # - NODE_VERSION="4.2"
-    # - NODE_VERSION="4.1"
-    # - NODE_VERSION="4.0"
 python:
-    - "nightly"
+    - "3.7-dev"
     - "3.6"
     - "3.5"
     - "3.4"

index.js

@@ -26,7 +26,6 @@ function pythonBridge(opts) {
         function wrapper() {
             self = self || wrapper;
             let code = json.apply(this, arguments);
-            let on_message, on_close;
 
             if (!(this && this.connected || self.connected)) {
                 return Promise.reject(new PythonBridgeNotConnected());
@@ -40,7 +39,7 @@ function pythonBridge(opts) {
                 function onMessage(data) {
                     ps.removeListener('close', onClose);
                     if (data && data.type && data.type === 'success') {
-                        resolve(data.value);
+                        resolve(eval(`(${data.value})`));
                     } else if (data && data.type && data.type === 'exception') {
                         reject(new PythonException(data.value));
                     } else {
@@ -176,13 +175,45 @@ function dedent(code) {
 
 function json(text_nodes) {
     let values = Array.prototype.slice.call(arguments, 1);
-    return dedent(text_nodes.reduce((cur, acc, i) => cur + JSON.stringify(values[i - 1]) + acc));
+    return dedent(text_nodes.reduce((cur, acc, i) => {
+        return cur + serializePython(values[i - 1]) + acc;
+    }));
+}
+
+function serializePython(value) {
+    if (value === null || typeof value === 'undefined') {
+        return 'None';
+    } else if (value === true) {
+        return 'True';
+    } else if (value === false) {
+        return 'False';
+    } else if (value === Infinity) {
+        return "float('inf')";
+    } else if (value === -Infinity) {
+        return "float('-inf')";
+    } else if (value instanceof Array) {
+        return `[${value.map(serializePython).join(', ')}]`;
+    } else if (typeof value === 'number') {
+        if (isNaN(value)) {
+            return "float('nan')";
+        }
+        return JSON.stringify(value);
+    } else if (typeof value === 'string') {
+        return JSON.stringify(value);
+    } else if (value instanceof Map) {
+        const props = Array.from(value.entries()).map(kv => `${serializePython(kv[0])}: ${serializePython(kv[1])}`);
+        return `{${props.join(', ')}}`;
+    } else {
+        const props = Object.keys(value).map(k => `${serializePython(k)}: ${serializePython(value[k])}`);
+        return `{${props.join(', ')}}`;
+    }
 }
 
 pythonBridge.pythonBridge = pythonBridge;
 pythonBridge.PythonException = PythonException;
 pythonBridge.PythonBridgeNotConnected = PythonBridgeNotConnected;
 pythonBridge.isPythonException = isPythonException;
 pythonBridge.json = json;
+pythonBridge.serializePython = serializePython;
 
 module.exports = pythonBridge.pythonBridge = pythonBridge;

node_python_bridge.py

@@ -7,6 +7,7 @@
 import traceback
 import platform
 import struct
+import math
 
 NODE_CHANNEL_FD = int(os.environ['NODE_CHANNEL_FD'])
 UNICODE_TYPE = unicode if sys.version_info[0] == 2 else str
@@ -65,6 +66,15 @@ def format_exception(t=None, e=None, tb=None):
     )
 
 
+class JavaScriptEncoder(json.JSONEncoder):
+    def default(self, o):
+        if math.isnan(o):
+            return 'NaN'
+        if math.isinf(o):
+            return 'Infinity' if o > 0 else '-Infinity'
+        return o.__dict__
+
+
 if __name__ == '__main__':
     writer = os.fdopen(NODE_CHANNEL_FD, 'wb')
     reader = os.fdopen(NODE_CHANNEL_FD, 'rb')
@@ -92,7 +102,7 @@ def format_exception(t=None, e=None, tb=None):
                 response = dict(type='success')
             else:
                 value = eval(_compile(data['code'], '<input>', 'eval'), _locals)
-                response = dict(type='success', value=value)
+                response = dict(type='success', value=json.dumps(value, separators=(',', ':'), cls=JavaScriptEncoder))
         except:
             t, e, tb = sys.exc_info()
             response = dict(type='exception', value=format_exception(t, e, tb))

test.js

@@ -253,6 +253,24 @@ test('json interpolation', t => {
     `, 'def hello(a, b):\n    return a + b\n');
     t.equal(pythonBridge.json`hello()`, 'hello()');
     t.equal(pythonBridge.json`hello(${'world'})`, 'hello("world")');
-    t.equal(pythonBridge.json`hello(${'world'}, ${[1, 2, 3]})`, 'hello("world", [1,2,3])');
+    t.equal(pythonBridge.json`hello(${'world'}, ${[1, 2, 3]})`, 'hello("world", [1, 2, 3])');
+    t.equal(pythonBridge.json`hello(${new Map([[1, 2], [3, 4]])})`, 'hello({1: 2, 3: 4})');
+    t.equal(pythonBridge.json`hello(${NaN}, ${Infinity}, ${-Infinity})`, "hello(float('nan'), float('inf'), float('-inf'))");
     t.end();
 });
+
+test('bug #22 returning NaN or infinity does not work', t => {
+    t.plan(1);
+    const s = {a: NaN, b: Infinity, c: -Infinity};
+    const python = pythonBridge();
+    python`(lambda x: x)(${s})`.then(x => t.deepEqual(x, s));
+    python.end();
+});
+
+test('bug #24 support more than just numbers and strings', t => {
+    t.plan(1);
+    const s = {a: 'asdf', b: 1, c: true, d: [1, 2, null]};
+    const python = pythonBridge();
+    python`(lambda x: x)(${s})`.then(x => t.deepEqual(x, s));
+    python.end();
+});