Android 7.0 and later doesn't do the line transform anymore. Auto detect that where required. Fixed ##59. Fixes #68. Closes #60.

Author: sorccu

src/adb/command/host-transport/getproperties.coffee

@@ -1,6 +1,5 @@
 Command = require '../../command'
 Protocol = require '../../protocol'
-LineTransform = require '../../linetransform'
 
 class GetPropertiesCommand extends Command
   RE_KEYVAL = /^\[([\s\S]*?)\]: \[([\s\S]*?)\]\r?$/gm

src/adb/command/host-transport/logcat.coffee

@@ -9,12 +9,12 @@ class LogcatCommand extends Command
     # all events on all devices.
     cmd = 'logcat -B *:I 2>/dev/null'
     cmd = "logcat -c 2>/dev/null && #{cmd}" if options.clear
-    this._send "shell:#{cmd}"
+    this._send "shell:echo && #{cmd}"
     @parser.readAscii 4
       .then (reply) =>
         switch reply
           when Protocol.OKAY
-            @parser.raw().pipe new LineTransform
+            @parser.raw().pipe new LineTransform autoDetect: true
           when Protocol.FAIL
             @parser.readError()
           else

src/adb/command/host-transport/screencap.coffee

@@ -7,15 +7,15 @@ LineTransform = require '../../linetransform'
 
 class ScreencapCommand extends Command
   execute: ->
-    this._send 'shell:screencap -p 2>/dev/null'
+    this._send 'shell:echo && screencap -p 2>/dev/null'
     @parser.readAscii 4
       .then (reply) =>
         switch reply
           when Protocol.OKAY
             transform = new LineTransform
             @parser.readBytes 1
               .then (chunk) =>
-                transform = new LineTransform
+                transform = new LineTransform autoDetect: true
                 transform.write chunk
                 @parser.raw().pipe transform
               .catch Parser.PrematureEOFError, ->

src/adb/command/host-transport/tcpip.coffee

@@ -1,6 +1,5 @@
 Command = require '../../command'
 Protocol = require '../../protocol'
-LineTransform = require '../../linetransform'
 
 class TcpIpCommand extends Command
   RE_OK = /restarting in/

src/adb/command/host-transport/usb.coffee

@@ -1,6 +1,5 @@
 Command = require '../../command'
 Protocol = require '../../protocol'
-LineTransform = require '../../linetransform'
 
 class UsbCommand extends Command
   RE_OK = /restarting in/

src/adb/linetransform.coffee

@@ -1,17 +1,30 @@
 Stream = require 'stream'
 
 class LineTransform extends Stream.Transform
-  constructor: (options) ->
+  constructor: (options = {}) ->
     @savedR = null
+    @autoDetect = options.autoDetect or false
+    @checkedFirstByte = false
+    @transformNeeded = true
+    delete options.autoDetect
     super options
 
+  _nullTransform: (chunk, encoding, done) ->
+    this.push chunk
+    done()
+    return
+
   # Sadly, the ADB shell is not very smart. It automatically converts every
   # 0x0a ('\n') it can find to 0x0d 0x0a ('\r\n'). This also applies to binary
   # content. We could get rid of this behavior by setting `stty raw`, but
   # unfortunately it's not available by default (you'd have to install busybox)
   # or something similar. On the up side, it really does do this for all line
   # feeds, so a simple transform works fine.
   _transform: (chunk, encoding, done) ->
+    unless @checkedFirstByte
+      @transformNeeded = false if chunk[0] is 0x0a
+      @checkedFirstByte = true
+    return this._nullTransform(chunk, encoding, done) unless @transformNeeded
     lo = 0
     hi = 0
     if @savedR

test/adb/command/host-transport/logcat.coffee

@@ -12,26 +12,27 @@ LogcatCommand = require '../../../../src/adb/command/host-transport/logcat'
 
 describe 'LogcatCommand', ->
 
-  it "should send 'logcat -B *:I'", (done) ->
+  it "should send 'echo && logcat -B *:I'", (done) ->
     conn = new MockConnection
     cmd = new LogcatCommand conn
     conn.socket.on 'write', (chunk) ->
       expect(chunk.toString()).to.equal \
-        Protocol.encodeData('shell:logcat -B *:I 2>/dev/null').toString()
+        Protocol.encodeData('shell:echo &&
+          logcat -B *:I 2>/dev/null').toString()
     setImmediate ->
       conn.socket.causeRead Protocol.OKAY
       conn.socket.causeEnd()
     cmd.execute()
       .then (stream) ->
         done()
 
-  it "should send 'logcat -c && logcat -B *:I' if options.clear
+  it "should send 'echo && logcat -c && logcat -B *:I' if options.clear
       is set", (done) ->
     conn = new MockConnection
     cmd = new LogcatCommand conn
     conn.socket.on 'write', (chunk) ->
       expect(chunk.toString()).to.equal \
-        Protocol.encodeData('shell:logcat -c 2>/dev/null &&
+        Protocol.encodeData('shell:echo && logcat -c 2>/dev/null &&
           logcat -B *:I 2>/dev/null').toString()
     setImmediate ->
       conn.socket.causeRead Protocol.OKAY
@@ -51,7 +52,7 @@ describe 'LogcatCommand', ->
         expect(stream).to.be.an.instanceof Stream.Readable
         done()
 
-  it "should perform CRLF transformation", (done) ->
+  it "should perform CRLF transformation by default", (done) ->
     conn = new MockConnection
     cmd = new LogcatCommand conn
     setImmediate ->
@@ -64,3 +65,17 @@ describe 'LogcatCommand', ->
       .then (out) ->
         expect(out.toString()).to.equal 'foo\n'
         done()
+
+  it "should not perform CRLF transformation if not needed", (done) ->
+    conn = new MockConnection
+    cmd = new LogcatCommand conn
+    setImmediate ->
+      conn.socket.causeRead Protocol.OKAY
+      conn.socket.causeRead '\nfoo\r\n'
+      conn.socket.causeEnd()
+    cmd.execute()
+      .then (stream) ->
+        new Parser(stream).readAll()
+      .then (out) ->
+        expect(out.toString()).to.equal '\nfoo\r\n'
+        done()

test/adb/command/host-transport/screencap.coffee

@@ -16,7 +16,7 @@ describe 'ScreencapCommand', ->
     cmd = new ScreencapCommand conn
     conn.socket.on 'write', (chunk) ->
       expect(chunk.toString()).to.equal \
-        Protocol.encodeData('shell:screencap -p 2>/dev/null').toString()
+        Protocol.encodeData('shell:echo && screencap -p 2>/dev/null').toString()
     setImmediate ->
       conn.socket.causeRead Protocol.OKAY
       conn.socket.causeRead 'legit image'
@@ -49,7 +49,7 @@ describe 'ScreencapCommand', ->
       .catch (err) ->
         done()
 
-  it "should perform CRLF transformation", (done) ->
+  it "should perform CRLF transformation by default", (done) ->
     conn = new MockConnection
     cmd = new ScreencapCommand conn
     setImmediate ->
@@ -62,3 +62,17 @@ describe 'ScreencapCommand', ->
       .then (out) ->
         expect(out.toString()).to.equal 'foo\n'
         done()
+
+  it "should not perform CRLF transformation if not needed", (done) ->
+    conn = new MockConnection
+    cmd = new ScreencapCommand conn
+    setImmediate ->
+      conn.socket.causeRead Protocol.OKAY
+      conn.socket.causeRead '\nfoo\r\n'
+      conn.socket.causeEnd()
+    cmd.execute()
+      .then (stream) ->
+        new Parser(stream).readAll()
+      .then (out) ->
+        expect(out.toString()).to.equal '\nfoo\r\n'
+        done()

test/adb/linetransform.coffee

@@ -13,6 +13,30 @@ describe 'LineTransform', ->
     expect(new LineTransform).to.be.an.instanceOf Stream.Transform
     done()
 
+  describe 'with autoDetect', ->
+    it "should not modify data if first byte is 0x0a", (done) ->
+      duplex = new MockDuplex
+      transform = new LineTransform
+      transform.on 'data', (data) ->
+        expect(data.toString()).to.equal '\nbar\r\n'
+        done()
+      duplex.pipe transform
+      duplex.causeRead '\nbar\r\n'
+      duplex.causeEnd()
+
+    it "should transform as usual if first byte is not 0x0a", (done) ->
+      duplex = new MockDuplex
+      transform = new LineTransform
+      buffer = new Buffer ''
+      transform.on 'data', (data) ->
+        buffer = Buffer.concat [buffer, data]
+      transform.on 'end', ->
+        expect(buffer.toString()).to.equal '\nbar\nfoo'
+        done()
+      duplex.pipe transform
+      duplex.causeRead '\r\nbar\r\nfoo'
+      duplex.causeEnd()
+
   it "should not modify data that does not have 0x0d 0x0a in it", (done) ->
     duplex = new MockDuplex
     transform = new LineTransform