Windows support (#6)

* Windows support

* Too many builds...

Author: Ryan Munro

.travis.yml

@@ -3,29 +3,29 @@ os:
     - "linux"
 env:
     - NODE_VERSION="7.5"
-    - NODE_VERSION="7.3"
-    - NODE_VERSION="7.2"
-    - NODE_VERSION="7.1"
-    - NODE_VERSION="7.0"
+    # - 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="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="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"
+    # - NODE_VERSION="4.3"
+    # - NODE_VERSION="4.2"
+    # - NODE_VERSION="4.1"
+    # - NODE_VERSION="4.0"
 python:
     - "nightly"
     - "3.5"
@@ -46,3 +46,6 @@ before_script:
     - node --version
 script:
     npm test
+cache:
+  directories:
+    - node_modules

README.md

@@ -1,6 +1,6 @@
-# python-bridge [![Build Status](https://secure.travis-ci.org/Submersible/node-python-bridge.png?branch=master)](http://travis-ci.org/Submersible/node-python-bridge)
+# python-bridge [![Build Status](https://secure.travis-ci.org/Submersible/node-python-bridge.png?branch=master)](http://travis-ci.org/Submersible/node-python-bridge) [![Build Status](https://ci.appveyor.com/api/projects/status/8h64yyve684nn900/branch/master?svg=true)](https://ci.appveyor.com/project/munro/node-python-bridge/branch/master)
 
-Most robust and simple Python bridge.  [Features](#features), and [comparisons](#comparisons) to other Python bridges below.
+Most robust and simple Python bridge.  [Features](#features), and [comparisons](#comparisons) to other Python bridges below, supports Windows.
 
 ```
 npm install python-bridge
@@ -198,6 +198,7 @@ _Alias to `python.isException`, this is useful if you want to import the functio
 * Does not affect Python's stdin, stdout, or stderr pipes.
 * Exception stack traces forwarded to Node for easy debugging.
 * Python 2 & 3 support, end-to-end tested.
+* Windows support, end-to-end tested.
 * Command queueing, with promises.
 * Long running Python sessions.
 * ES6 template tags for easy interpolation & multiline code.

appveyor.yml

@@ -0,0 +1,31 @@
+environment:
+  matrix:
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python27-x64"
+    - PYTHON: "C:\\Python33"
+    - PYTHON: "C:\\Python33-x64"
+    - PYTHON: "C:\\Python34"
+    - PYTHON: "C:\\Python34-x64"
+    - PYTHON: "C:\\Python35"
+    - PYTHON: "C:\\Python35-x64"
+
+    - nodejs_version: "7"
+    - nodejs_version: "6"
+    - nodejs_version: "5"
+    - nodejs_version: "4"
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+  - "python --version"
+  - "node --version"
+  - "npm --version"
+  - "npm install"
+
+test_script:
+  - "npm test"
+
+build: off
+
+cache:
+  - node_modules

node_python_bridge.py

@@ -4,11 +4,36 @@
 import sys
 import json
 import traceback
+import platform
+import struct
 
 NODE_CHANNEL_FD = int(os.environ['NODE_CHANNEL_FD'])
 UNICODE_TYPE = unicode if sys.version_info[0] == 2 else str
 
 
+if platform.system() == 'Windows':
+    # hacky reimplementation of https://github.com/nodejs/node/blob/master/deps/uv/src/win/pipe.c
+    def read_data(f):
+        header = f.read(16)
+        if not header:
+            return header
+        try:
+            msg_length, = struct.unpack('<Q', header[8:])
+            return f.read(msg_length)
+        except:
+            raise ValueError('Error parsing msg with header: {}'.format(repr(header)))
+    def write_data(f, data):
+        header = struct.pack('<Q', 1) + struct.pack('<Q', len(data))
+        f.write(header + data)
+        f.flush()
+else:
+    def read_data(f):
+        return reader.readline()
+    def write_data(f, data):
+        f.write(data)
+        f.flush()
+
+
 def format_exception(t=None, e=None, tb=None):
     return dict(
         exception=dict(
@@ -30,16 +55,19 @@ def format_exception(t=None, e=None, tb=None):
 
 
 if __name__ == '__main__':
-    writer = os.fdopen(NODE_CHANNEL_FD, 'w')
-    reader = os.fdopen(NODE_CHANNEL_FD, 'r')
+    writer = os.fdopen(NODE_CHANNEL_FD, 'wb')
+    reader = os.fdopen(NODE_CHANNEL_FD, 'rb')
 
     while True:
         try:
             # Read new command
-            line = reader.readline()
+            line = read_data(reader)
             if not line:
                 break
-            data = json.loads(line)
+            try:
+                data = json.loads(line.decode('utf-8'))
+            except ValueError:
+                raise ValueError('Could not decode IPC data:\n{}'.format(repr(line)))
 
             # Assert data saneness
             if data['type'] not in ['execute', 'evaluate']:
@@ -57,8 +85,8 @@ def format_exception(t=None, e=None, tb=None):
             t, e, tb = sys.exc_info()
             response = dict(type='exception', value=format_exception(t, e, tb))
 
-        writer.write(json.dumps(response, separators=(',', ':')) + '\n')
-        writer.flush()
+        data = json.dumps(response, separators=(',', ':')).encode('utf-8') + b'\n'
+        write_data(writer, data)
 
     # Closing is messy
     try:

test.js

@@ -108,7 +108,9 @@ test('readme', t => {
                     sys.stdout.flush()
             `.then(function () {
                 fileWriter.end();
-                fs.readFileAsync(OUTPUT, {encoding: 'utf8'}).then(x => t.equal(x, 'hello\nworld\n'));
+                fs.readFileAsync(OUTPUT, {encoding: 'utf8'}).then(x => {
+                    t.equal(x.replace(/\r/g, ''), 'hello\nworld\n')
+                });
             });
 
             // write to Python process's stdin