Remove callbacks

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
             - name: Install Node, NPM and Yarn
               uses: actions/setup-node@v3
               with:
-                  node-version: 16
+                  node-version: 18
                   registry-url: 'https://registry.npmjs.org'
 
             - name: Install modules
@@ -37,7 +37,9 @@ jobs:
                   yarn test
 
             - name: Git config
-              run: git config --global user.email "[email protected]" && git config --global user.name "bot"
+              run: |
+                  git config --global user.email "[email protected]" && git config --global user.name "bot"
+                  password=${{ secrets.GITHUB_TOKEN }}
 
             - name: Apply version major
               if: contains(github.event.pull_request.labels.*.name, 'major')

.github/workflows/test.yml

@@ -1,8 +1,8 @@
 name: Build and test
 on: push
 jobs:
-    test:
-        name: Test and lint
+    build:
+        name: Build and lint
         runs-on: ubuntu-latest
         steps:
             - name: Checkout repo
@@ -11,7 +11,7 @@ jobs:
             - name: Install Node, NPM and Yarn
               uses: actions/setup-node@v3
               with:
-                  node-version: 16
+                  node-version: 18
 
             - name: Install modules
               run: |
@@ -24,10 +24,39 @@ jobs:
             - name: Lint
               run: |
                   yarn lint
-
-            - name: Test
-              run: |
-                  yarn test
             - name: Test generate docs
               run: |
                   yarn docs
+            - name: Upload lib Artifacts
+              uses: actions/upload-artifact@v2
+              with:
+                  name: lib
+                  path: ./lib
+    test-versions:
+        needs: build
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node-version: [16, 17, 18, 19, 20, 21]
+        steps:
+            - uses: actions/checkout@v2
+
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v2
+              with:
+                  node-version: ${{ matrix.node-version }}
+
+            - name: Setup Yarn
+              run: |
+                  npm install -g yarn
+            - name: Install packages
+              run: |
+                  yarn install --frozen-lockfile --ignore-engines
+
+            - name: Download lib Artifacts
+              uses: actions/download-artifact@v2
+              with:
+                  name: lib
+                  path: ./lib
+            - name: Test
+              run: yarn test

.gitignore

@@ -102,8 +102,10 @@ dist
 
 # TernJS port file
 .tern-port
+.DS_Store
+
+# Custom
 lib
-script.ts
+script.*
 *.apk
 docs/
-.DS_Store

README_DOCS.md

@@ -83,3 +83,9 @@ adb.listDevices((devices) => {
     console.log(devices);
 });
 ```
+
+## Changes from V5
+
+-   `time` option in `touch` method is converted to UTC time.
+-   Tracker `change` event emits the same instance of the device instead of creating a new device object every time.
+-   `install` and `uninstall` commands will fail if any other response than `Success` is received. Until V5 the promise could have resolved even when the operation was not successful.

__tests__/adbClient/connect.ts

@@ -1,6 +1,5 @@
 import { AdbMock } from '../../mockery/mockAdbServer';
 import { Client } from '../../lib/client';
-import { promisify } from 'util';
 
 describe('Connect', () => {
     it('Connect to default port', async () => {
@@ -72,20 +71,4 @@ describe('Connect', () => {
             await adbMock.end();
         }
     });
-
-    it('Connect callback overload', async () => {
-        const adbMock = new AdbMock([
-            { cmd: 'host:connect:127.0.0.1:4444', res: 'connected to' }
-        ]);
-        try {
-            const port = await adbMock.start();
-            const adb = new Client({ noAutoStart: true, port });
-            const result = await promisify<string>((cb) => {
-                adb.connect('127.0.0.1', 4444, cb);
-            })();
-            expect(result).toBe('127.0.0.1:4444');
-        } finally {
-            await adbMock.end();
-        }
-    });
 });

__tests__/adbClient/constructorAndStartServer.ts

@@ -6,7 +6,7 @@ describe('Client constructor tests', () => {
         const client = new Client();
         expect(client['options']).toEqual({
             port: 5037,
-            host: 'localhost',
+            host: '127.0.0.1',
             bin: 'adb',
             noAutoStart: false
         });
@@ -16,7 +16,7 @@ describe('Client constructor tests', () => {
         const client = new Client({ bin: undefined, port: 5036 });
         expect(client['options']).toEqual({
             port: 5036,
-            host: 'localhost',
+            host: '127.0.0.1',
             bin: 'adb',
             noAutoStart: false
         });
@@ -29,30 +29,4 @@ describe('Start server tests', () => {
         const client = new Client();
         await expect(client.startServer()).resolves.toBeUndefined();
     });
-
-    it('Start adb server error', async () => {
-        try {
-            mockExec(new Error('message'));
-            const client = new Client();
-            await client.startServer();
-        } catch (e: unknown) {
-            expect(e).toEqual(new Error('message'));
-        }
-    });
-
-    it('Start adb server callback overload', () => {
-        mockExec(null);
-        const client = new Client();
-        client.startServer((err) => {
-            expect(err).toBeNull();
-        });
-    });
-
-    it('Start adb server callback overload error', () => {
-        mockExec(new Error('message'));
-        const client = new Client();
-        client.startServer((err) => {
-            expect(err).toBeInstanceOf(Error);
-        });
-    });
 });

__tests__/adbClient/cp.ts

@@ -2,7 +2,6 @@ import crypto from 'crypto';
 import { UnexpectedDataError } from '../../lib/util';
 import { Client } from '../../lib/client';
 import { AdbMock } from '../../mockery/mockAdbServer';
-import { promisify } from 'util';
 
 beforeAll(() => {
     jest.spyOn(crypto, 'randomUUID').mockImplementation(() => {
@@ -30,27 +29,6 @@ describe('Cp OKAY tests', () => {
         }
     });
 
-    it('Should execute callback overload without options', async () => {
-        const adbMock = new AdbMock([
-            { cmd: 'host:transport:serial', res: null, rawRes: true },
-            {
-                cmd: `shell:(cp /file /other) || echo '1-2-3-4-5'`,
-                res: null,
-                rawRes: true
-            }
-        ]);
-        try {
-            const port = await adbMock.start();
-            const adb = new Client({ noAutoStart: true, port });
-            const result = await promisify<void>((cb) =>
-                adb.cp('serial', '/file', '/other', cb)
-            )();
-            expect(result).toBeUndefined();
-        } finally {
-            await adbMock.end();
-        }
-    });
-
     it('Should execute with simple parameters without archive', async () => {
         const adbMock = new AdbMock([
             { cmd: 'host:transport:serial', res: null, rawRes: true },
@@ -172,42 +150,6 @@ describe('Cp OKAY tests', () => {
             await adbMock.end();
         }
     });
-
-    it('Should execute callback overload with preserve option with all', async () => {
-        const adbMock = new AdbMock([
-            { cmd: 'host:transport:serial', res: null, rawRes: true },
-            {
-                cmd: `shell:(cp --preserve=a /file /other) || echo '1-2-3-4-5'`,
-                res: 'data',
-                rawRes: true
-            }
-        ]);
-        try {
-            const port = await adbMock.start();
-            const adb = new Client({ noAutoStart: true, port });
-            const result = await promisify<void>((cb) =>
-                adb.cp(
-                    'serial',
-                    '/file',
-                    '/other',
-                    {
-                        preserve: {
-                            all: true,
-                            mode: true,
-                            ownership: true,
-                            timestamps: true,
-                            context: true,
-                            xattr: true
-                        }
-                    },
-                    cb
-                )
-            )();
-            expect(result).toBeUndefined();
-        } finally {
-            await adbMock.end();
-        }
-    });
 });
 
 describe('Cp FAIL tests', () => {

__tests__/adbClient/disconnect.ts

@@ -1,6 +1,5 @@
 import { AdbMock } from '../../mockery/mockAdbServer';
 import { Client } from '../../lib/client';
-import { promisify } from 'util';
 
 describe('Disconnect', () => {
     it('Disconnect from default port', async () => {
@@ -91,23 +90,4 @@ describe('Disconnect', () => {
             await adbMock.end();
         }
     });
-
-    it('Connect callback overload', async () => {
-        const adbMock = new AdbMock([
-            {
-                cmd: 'host:disconnect:127.0.0.1:4444',
-                res: 'disconnected'
-            }
-        ]);
-        try {
-            const port = await adbMock.start();
-            const adb = new Client({ noAutoStart: true, port });
-            const result = await promisify<string>((cb) => {
-                adb.disconnect('127.0.0.1', 4444, cb);
-            })();
-            expect(result).toBe('127.0.0.1:4444');
-        } finally {
-            await adbMock.end();
-        }
-    });
 });