tune

Author: mykola-mokhnach

.github/workflows/pr-title.yml

@@ -3,14 +3,8 @@ on:
   pull_request:
     types: [opened, edited, synchronize, reopened]
 
-
 jobs:
   lint:
-    name: https://www.conventionalcommits.org
-    runs-on: ubuntu-latest
-    steps:
-      - uses: beemojs/conventional-pr-action@v3
-        with:
-          config-preset: angular
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    uses: appium/appium-workflows/.github/workflows/pr-title.yml@main
+    with:
+      config-preset: angular

.github/workflows/publish.js.yml

@@ -20,7 +20,10 @@ jobs:
       uses: actions/setup-node@v3
       with:
         node-version: lts/*
-    - run: npm install --no-package-lock
+    - uses: SocketDev/action@v1
+      with:
+        mode: firewall-free
+    - run: sfw npm install --no-package-lock
       name: Install dependencies
     - run: npm run test
       name: Run NPM Test
@@ -37,4 +40,3 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       name: Release
-

.github/workflows/unit-test.yml

@@ -4,28 +4,25 @@ on: [pull_request, push]
 
 
 jobs:
-  prepare_matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      versions: ${{ steps.generate-matrix.outputs.versions }}
-    steps:
-    - name: Select 3 most recent LTS versions of Node.js
-      id: generate-matrix
-      run: echo "versions=$(curl -s https://endoflife.date/api/nodejs.json | jq -c '[[.[] | select(.lts != false)][:3] | .[].cycle | tonumber]')" >> "$GITHUB_OUTPUT"
+  node_matrix:
+    uses: appium/appium-workflows/.github/workflows/node-lts-matrix.yml@main
 
   test:
     needs:
-    - prepare_matrix
+    - node_matrix
     strategy:
       matrix:
-        node-version: ${{ fromJSON(needs.prepare_matrix.outputs.versions) }}
+        node-version: ${{ fromJSON(needs.node_matrix.outputs.versions) }}
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm install --no-package-lock
+    - uses: SocketDev/action@v1
+      with:
+        mode: firewall-free
+    - run: sfw npm install --no-package-lock
       name: Install dev dependencies
     - run: npm run lint
       name: Run linter

lib/installer.ts

@@ -114,4 +114,3 @@ export async function isAdmin(): Promise<boolean> {
     return false;
   }
 }
-

lib/registry.ts

@@ -4,31 +4,12 @@ import { runElevated } from './utils';
 const REG = 'reg.exe';
 const ENTRY_PATTERN = /^\s+(\w+)\s+([A-Z_]+)\s*(.*)/;
 
-export interface RegEntry {
-  /** Full path to the registry branch, for example
-   * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DirectDrawEx */
-  root: string;
-  /** The registry key name */
-  key: string;
-  /** One of possible registry value types, for example REG_DWORD or REG_SZ */
-  type: string;
-  /** The actual value. Could be empty */
-  value: string;
-}
-
-function parseRegEntries(root: string | undefined, block: string[]): RegEntry[] {
-  if (_.isEmpty(block) || !root || _.isEmpty(root)) {
-    return [];
-  }
-  return block.reduce((acc: RegEntry[], line: string) => {
-    const match = ENTRY_PATTERN.exec(line);
-    if (match) {
-      acc.push({root, key: match[1], type: match[2], value: match[3] || ''});
-    }
-    return acc;
-  }, []);
-}
-
+/**
+ * Parses the output of the reg query command into a list of RegEntry instances
+ *
+ * @param output - The output of the reg query command
+ * @returns List of matched RegEntry instances
+ */
 export function parseRegQueryOutput(output: string): RegEntry[] {
   const result: RegEntry[] = [];
   let root: string | undefined;
@@ -73,3 +54,27 @@ export async function queryRegistry(root: string): Promise<RegEntry[]> {
   return parseRegQueryOutput(stdout);
 }
 
+function parseRegEntries(root: string | undefined, block: string[]): RegEntry[] {
+  if (_.isEmpty(block) || !root || _.isEmpty(root)) {
+    return [];
+  }
+  return block.reduce((acc: RegEntry[], line: string) => {
+    const match = ENTRY_PATTERN.exec(line);
+    if (match) {
+      acc.push({root, key: match[1], type: match[2], value: match[3] || ''});
+    }
+    return acc;
+  }, []);
+}
+
+export interface RegEntry {
+  /** Full path to the registry branch, for example
+   * HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DirectDrawEx */
+  root: string;
+  /** The registry key name */
+  key: string;
+  /** One of possible registry value types, for example REG_DWORD or REG_SZ */
+  type: string;
+  /** The actual value. Could be empty */
+  value: string;
+}

lib/utils.ts

@@ -8,10 +8,6 @@ import { log } from './logger';
 
 const execAsync = promisify(exec);
 
-export interface RunElevatedOptions extends ExecOptions {
-  timeoutMs?: number;
-}
-
 /**
  * This API triggers UAC when necessary
  *
@@ -61,3 +57,6 @@ export async function downloadToFile(srcUrl: string, dstPath: string): Promise<v
   await net.downloadFile(srcUrl, dstPath);
 }
 
+export interface RunElevatedOptions extends ExecOptions {
+  timeoutMs?: number;
+}

test/unit/driver-specs.ts

@@ -32,21 +32,24 @@ describe('driver', function () {
       sinon.mock(driver).expects('startWinAppDriverSession')
         .once()
         .returns(B.resolve());
-      // @ts-ignore
-      await driver.createSession(null as any, null as any, { alwaysMatch: { 'appium:cap': 'foo' }});
+      await driver.createSession(
+        { alwaysMatch: { 'appium:automationName': 'Windows', 'appium:app': 'myapp' }, firstMatch: [] },
+        undefined,
+        undefined
+      );
       expect(driver.sessionId).to.exist;
-      expect((driver.caps as any).cap).to.equal('foo');
+      expect((driver.caps as any).app).to.equal('myapp');
     });
 
     describe('context simulation', function () {
       it('should support context commands', async function () {
-        const driver = new WindowsDriver({ app: 'myapp'} as any, false);
+        const driver = new WindowsDriver({} as any, false);
         expect(await driver.getCurrentContext()).to.equal('NATIVE_APP');
         expect(await driver.getContexts()).to.eql(['NATIVE_APP']);
         await driver.setContext('NATIVE_APP');
       });
       it('should throw an error if invalid context', async function () {
-        const driver = new WindowsDriver({ app: 'myapp'} as any, false);
+        const driver = new WindowsDriver({} as any, false);
         await expect(driver.setContext('INVALID_CONTEXT')).to.be.rejected;
       });
     });
@@ -55,7 +58,7 @@ describe('driver', function () {
   describe('proxying', function () {
     let driver: WindowsDriver;
     before(function () {
-      driver = new WindowsDriver({} as any, false);
+      driver = new WindowsDriver({ address: '127.0.0.1', port: 4723 } as any, false);
       driver.sessionId = 'abc';
     });
     describe('#proxyActive', function () {