fix: fix scpCopyFromRemote & scpCopyToRemote

Fixes #178

Author: gregberge

packages/ssh-pool/src/Connection.js

@@ -387,13 +387,13 @@ class Connection {
 
     return results.reduce(
       (aggregate, result) => ({
-        stdout: Buffer.concat([aggregate.stdout, result.stdout]),
-        stderr: Buffer.concat([aggregate.stderr, result.stderr]),
+        stdout: String(aggregate.stdout) + String(result.stdout),
+        stderr: String(aggregate.stderr) + String(result.stderr),
         children: [...aggregate.children, result.child],
       }),
       {
-        stdout: Buffer.from([]),
-        stderr: Buffer.from([]),
+        stdout: '',
+        stderr: '',
         children: [],
       },
     )

packages/ssh-pool/src/Connection.test.js

@@ -11,6 +11,7 @@ jest.mock('tmp')
 
 describe('Connection', () => {
   beforeEach(() => {
+    exec.mockClear()
     util.deprecateV3 = jest.fn()
     __setPaths__({ rsync: '/bin/rsync' })
   })
@@ -48,22 +49,20 @@ describe('Connection', () => {
       await connection.run('my-command -x', { cwd: '/root' })
 
       expect(exec).toHaveBeenCalledWith(
-        'ssh user@host "my-command -x"',
+        'ssh user@host "cd /root > /dev/null; my-command -x; cd - > /dev/null"',
         {
-          cwd: '/root',
           maxBuffer: 1024000,
         },
         expect.any(Function),
       )
     })
 
     it('should escape double quotes', async () => {
-      await connection.run('echo "ok"', { cwd: '/root' })
+      await connection.run('echo "ok"')
 
       expect(exec).toHaveBeenCalledWith(
         'ssh user@host "echo \\"ok\\""',
         {
-          cwd: '/root',
           maxBuffer: 1024000,
         },
         expect.any(Function),
@@ -76,26 +75,12 @@ describe('Connection', () => {
       expect(result.stderr.toString()).toBe('stderr')
     })
 
-    it('should handle sudo', async () => {
-      await connection.run('sudo my-command -x', { cwd: '/root' })
-
-      expect(exec).toHaveBeenCalledWith(
-        'ssh -tt user@host "sudo my-command -x"',
-        {
-          cwd: '/root',
-          maxBuffer: 1024000,
-        },
-        expect.any(Function),
-      )
-    })
-
     it('should handle tty', async () => {
-      await connection.run('sudo my-command -x', { cwd: '/root', tty: true })
+      await connection.run('sudo my-command -x', { tty: true })
 
       expect(exec).toHaveBeenCalledWith(
         'ssh -tt user@host "sudo my-command -x"',
         {
-          cwd: '/root',
           maxBuffer: 1024000,
         },
         expect.any(Function),
@@ -168,7 +153,7 @@ describe('Connection', () => {
       )
     })
 
-    it.only('should log output', async () => {
+    it('should log output', async () => {
       const log = jest.fn()
       connection = new Connection({
         remote: 'user@host',
@@ -209,25 +194,23 @@ describe('Connection', () => {
     })
 
     it('should handle sudo as user correctly', async () => {
-      await connection.run('my-command -x', { cwd: '/root', tty: true })
+      await connection.run('my-command -x', { tty: true })
 
       expect(exec).toHaveBeenCalledWith(
         'ssh -tt user@host "sudo -u test my-command -x"',
         {
-          cwd: '/root',
           maxBuffer: 1000 * 1024,
         },
         expect.any(Function),
       )
     })
 
     it('should handle sudo as user without double sudo', () => {
-      connection.run('sudo my-command -x', { cwd: '/root' })
+      connection.run('sudo my-command -x', { tty: true })
 
       expect(exec).toHaveBeenCalledWith(
         'ssh -tt user@host "sudo -u test my-command -x"',
         {
-          cwd: '/root',
           maxBuffer: 1000 * 1024,
         },
         expect.any(Function),

packages/ssh-pool/tests/__fixtures__/test.txt

@@ -0,0 +1 @@
+Hello

packages/ssh-pool/tests/integration.test.js

@@ -1,3 +1,5 @@
+import path from 'path'
+
 const sshPool = require('../src')
 
 describe('ssh-pool', () => {
@@ -21,4 +23,15 @@ describe('ssh-pool', () => {
     const [{ stdout: second }] = await pool.run("echo '$USER'")
     expect(second).toBe('$USER\n')
   })
+
+  it(
+    'should copy to remote',
+    async () => {
+      await pool.scpCopyToRemote(
+        path.resolve(__dirname, '__fixtures__/test.txt'),
+        './',
+      )
+    },
+    20000,
+  )
 })