Fix (really unlikely) 'count' bug

index.js

@@ -10,13 +10,15 @@ function get(obj, path) {
   return obj[path]
 }
 
-module.exports = function (obj, raw) {
+module.exports = function (obj, opts) {
+  //backward compatibility
+  if (!(opts instanceof Object)) opts = { isRaw: opts }
   var cbs = {}, count = 1, local = obj || {}
   function flattenError(err) {
     if(!(err instanceof Error)) return err
     var err2 = { message: err.message }
     for(var k in err)
-      err2[k] = err[k] 
+      err2[k] = err[k]
     return err2
   }
   function expandError(err) {
@@ -27,21 +29,24 @@ module.exports = function (obj, raw) {
     return err2
   }
   var s = through(function (data) {
-    //write - on incoming call 
+    //write - on incoming call
     data = data.slice()
     var i = data.pop(), args = data.pop(), name = data.pop()
-    //if(~i) then there was no callback.    
-
-    if (args[0]) args[0] = expandError(args[0])
+    //if(~i) then there was no callback.
 
     if(name != null) {
       var cb = function () {
+        if(!~i) return;
         var args = [].slice.call(arguments)
         args[0] = flattenError(args[0])
-        if(~i) s.emit('data', [args, i]) //responses don't have a name.
+        s.emit('data', [args, i]) //responses don't have a name.
       }
       try {
-        local[name].call(obj, args, cb)
+        if (opts.sameSigs && args instanceof Array) {
+          //use apply to use same signatures
+          args.push(cb);
+          local[name].apply(obj, args);
+        } else local[name].call(obj, args, cb);
       } catch (err) {
         if(~i) s.emit('data', [[flattenError(err)], i])
       }
@@ -54,6 +59,7 @@ module.exports = function (obj, raw) {
 
       return console.error('ERROR: unknown callback id: '+i, data)
     } else {
+      if (args[0]) args[0] = expandError(args[0])
       //call the callback.
       cbs[i].apply(null, args)
       delete cbs[i] //no longer need this
@@ -63,8 +69,8 @@ module.exports = function (obj, raw) {
   var rpc = s.rpc = function (name, args, cb) {
     if(cb) cbs[++count] = cb
     if(count == 9007199254740992) count = 0 //reset if max
-    //that is 900 million million. 
-    //if you reach that, dm me, 
+    //that is 900 million million.
+    //if you reach that, dm me,
     //i'll buy you a beer. @dominictarr
     if('string' !== typeof name)
       throw new Error('name *must* be string')
@@ -102,7 +108,7 @@ module.exports = function (obj, raw) {
     })
     return w
   }
-  if(raw)
+  if(opts.isRaw)
     return s
 
   return serialize(s)

readme.markdown

@@ -1,6 +1,7 @@
 #rpc-stream
 
 `RpcStream` is a dead simple (75 loc) rpc system that works over any full-duplex text/byte/json stream.
+There's also a [Python port](https://github.com/riga/rpyc-stream), e.g. for cross-language RPC-over-SSH.
 
 ## rant