Give forward plugin its own folder. Should make it easier to clean it up.

lib/units/device/plugins/forward/index.js

@@ -3,19 +3,21 @@ var net = require('net')
 var Promise = require('bluebird')
 var syrup = require('syrup')
 
-var wire = require('../../../wire')
-var logger = require('../../../util/logger')
-var lifecycle = require('../../../util/lifecycle')
-var streamutil = require('../../../util/streamutil')
-var forwardutil = require('../../../util/forwardutil')
-var wireutil = require('../../../wire/util')
+var wire = require('../../../../wire')
+var logger = require('../../../../util/logger')
+var lifecycle = require('../../../../util/lifecycle')
+var streamutil = require('../../../../util/streamutil')
+var wireutil = require('../../../../wire/util')
+
+var ForwardReader = require('./util/reader')
+var ForwardWriter = require('./util/writer')
 
 module.exports = syrup.serial()
-  .dependency(require('../support/adb'))
-  .dependency(require('../support/router'))
-  .dependency(require('../support/push'))
-  .dependency(require('../resources/minirev'))
-  .dependency(require('./group'))
+  .dependency(require('../../support/adb'))
+  .dependency(require('../../support/router'))
+  .dependency(require('../../support/push'))
+  .dependency(require('../../resources/minirev'))
+  .dependency(require('../group'))
   .define(function(options, adb, router, push, minirev, group) {
     var log = logger.createLogger('device:plugins:forward')
     var plugin = Object.create(null)
@@ -42,7 +44,7 @@ module.exports = syrup.serial()
             conn.removeListener('end', killListeners)
           }
 
-          var src = new forwardutil.ForwardWriter(fd)
+          var src = new ForwardWriter(fd)
             .on('readable', maybeSend)
             .on('error', function(err) {
               log.error('Proxy writer %d had an error', fd, to, err.stack)
@@ -67,7 +69,7 @@ module.exports = syrup.serial()
           }
         }
 
-        conn.pipe(new forwardutil.ForwardParser())
+        conn.pipe(new ForwardReader())
           .on('packet', function(fd, packet) {
             var proxy = proxies[fd]
 

lib/units/device/plugins/forward/util/reader.js

@@ -0,0 +1,75 @@
+var util = require('util')
+var stream = require('stream')
+
+var HEADER_SIZE = 4
+
+function ForwardReader() {
+  stream.Transform.call(this)
+  this._header = new Buffer(HEADER_SIZE)
+  this._needLength = -HEADER_SIZE
+  this._target = 0
+}
+
+util.inherits(ForwardReader, stream.Transform)
+
+ForwardReader.prototype._transform = function(chunk, encoding, done) {
+  var cursor = 0
+
+  while (cursor < chunk.length) {
+    var diff = chunk.length - cursor
+
+    // Do we need a header?
+    if (this._needLength < 0) {
+      // Still missing a header?
+      if (chunk.length < -this._needLength) {
+        // Save what we're received so far.
+        chunk.copy(
+          this._header
+        , HEADER_SIZE + this._needLength
+        , cursor
+        , cursor + -this._needLength
+        )
+        break
+      }
+
+      // Combine previous and current chunk in case the header was split.
+      chunk.copy(
+        this._header
+      , HEADER_SIZE + this._needLength
+      , cursor
+      , cursor + -this._needLength
+      )
+
+      cursor += -this._needLength
+
+      this._target = this._header.readUInt16LE(0)
+      this._needLength = this._header.readUInt16LE(2)
+
+      if (this._needLength === 0) {
+        // This is a fin packet
+        this.emit('packet', this._target, null)
+        this._needLength = -HEADER_SIZE
+      }
+    }
+    // Do we have a full data packet?
+    else if (diff >= this._needLength) {
+      this.emit(
+        'packet'
+      , this._target
+      , chunk.slice(cursor, cursor + this._needLength)
+      )
+      cursor += this._needLength
+      this._needLength = -HEADER_SIZE
+    }
+    // We have a partial data packet.
+    else {
+      this.emit('packet', this._target, chunk.slice(cursor, cursor + diff))
+      this._needLength -= diff
+      cursor += diff
+    }
+  }
+
+  done()
+}
+
+module.exports = ForwardReader

lib/units/device/plugins/forward/util/writer.js

@@ -0,0 +1,45 @@
+var util = require('util')
+var stream = require('stream')
+
+var HEADER_SIZE = 4
+var MAX_PACKET_SIZE = 0xFFFF
+
+function ForwardWriter(target) {
+  stream.Transform.call(this)
+  this._target = target
+}
+
+util.inherits(ForwardWriter, stream.Transform)
+
+ForwardWriter.prototype._transform = function(chunk, encoding, done) {
+  var header
+    , length
+
+  do {
+    length = Math.min(MAX_PACKET_SIZE, chunk.length)
+
+    header = new Buffer(HEADER_SIZE)
+    header.writeUInt16LE(this._target, 0)
+    header.writeUInt16LE(length, 2)
+
+    this.push(header)
+    this.push(chunk.slice(0, length))
+
+    chunk = chunk.slice(length)
+  }
+  while (chunk.length)
+
+  done()
+}
+
+ForwardWriter.prototype._flush = function(done) {
+  var header = new Buffer(HEADER_SIZE)
+  header.writeUInt16LE(this._target, 0)
+  header.writeUInt16LE(0, 2)
+
+  this.push(header)
+
+  done()
+}
+
+module.exports = ForwardWriter