fix: block managed ADB server administration and inherited sockets

Author: thymikee

src/platform-runtime-android-adb-host.test.ts

@@ -50,11 +50,13 @@ test.skipIf(process.platform === 'win32')(
     fs.writeFileSync(
       adbPath,
       '#!/usr/bin/env node\n' +
-        'process.stdout.write(JSON.stringify({args: process.argv.slice(2), port: process.env.ANDROID_ADB_SERVER_PORT ?? null, address: process.env.ANDROID_ADB_SERVER_ADDRESS ?? null}));\n',
+        'process.stdout.write(JSON.stringify({args: process.argv.slice(2), port: process.env.ANDROID_ADB_SERVER_PORT ?? null, address: process.env.ANDROID_ADB_SERVER_ADDRESS ?? null, socket: process.env.ADB_SERVER_SOCKET ?? null}));\n',
     );
     fs.chmodSync(adbPath, 0o755);
     const previousPath = process.env.PATH;
     const previousPort = process.env.ANDROID_ADB_SERVER_PORT;
+    const previousSocket = process.env.ADB_SERVER_SOCKET;
+    process.env.ADB_SERVER_SOCKET = 'tcp:inherited.example:9999';
     process.env.PATH = `${tmpDir}${path.delimiter}${previousPath ?? ''}`;
     try {
       const provider = createLocalAndroidAdbProvider(
@@ -101,6 +103,17 @@ test.skipIf(process.platform === 'win32')(
         ['nodaemon', '-H', 'foreign.example'],
         ['server', '-P', '9999'],
         ['fork-server', '-s', 'foreign-device'],
+        ['kill-server'],
+        ['start-server'],
+        ['connect', 'foreign.example'],
+        ['disconnect'],
+        ['reconnect', 'offline'],
+        ['attach', 'foreign-device'],
+        ['detach', 'foreign-device'],
+        ['pair', 'foreign.example', '123456'],
+        ['wait-for-device', 'kill-server'],
+        ['wait-for-device', 'disconnect'],
+        ['wait-for-any-device', 'pair', 'foreign.example', '123456'],
       ]) {
         await assert.rejects(adb([...selector, 'shell', 'id']), {
           details: { reason: 'managed-device-transport-mismatch' },
@@ -114,16 +127,26 @@ test.skipIf(process.platform === 'win32')(
         args: ['-P', '15037', '-s', 'emulator-5554', 'shell', 'id'],
         port: '15037',
         address: '127.0.0.1',
+        socket: null,
       });
       assert.deepEqual(serialWithWrongPort, serial);
       assert.deepEqual(serialWithWrongEnvironment, serial);
+      const waited = JSON.parse((await adb(['wait-for-device', 'shell', 'id'])).stdout);
+      assert.deepEqual(waited, {
+        ...serial,
+        args: ['-P', '15037', '-s', 'emulator-5554', 'wait-for-device', 'shell', 'id'],
+      });
       assert.deepEqual(host, {
         args: ['-P', '15038', 'devices'],
         port: '15038',
         address: '127.0.0.1',
+        socket: null,
       });
       assert.equal(process.env.ANDROID_ADB_SERVER_PORT, previousPort);
+      assert.equal(process.env.ADB_SERVER_SOCKET, 'tcp:inherited.example:9999');
     } finally {
+      if (previousSocket === undefined) delete process.env.ADB_SERVER_SOCKET;
+      else process.env.ADB_SERVER_SOCKET = previousSocket;
       if (previousPath === undefined) delete process.env.PATH;
       else process.env.PATH = previousPath;
     }

src/platform-runtime-android-adb-host.ts

@@ -153,6 +153,7 @@ function adbInvocation<Options extends AndroidAdbExecutorOptions>(
       env: {
         ...environment,
         ...(withoutServerPort.env ?? {}),
+        ADB_SERVER_SOCKET: undefined,
         ANDROID_ADB_SERVER_PORT: String(serverPort),
         ANDROID_ADB_SERVER_ADDRESS: '127.0.0.1',
       },
@@ -177,15 +178,33 @@ function withServerPort(args: string[], serverPort: number): string[] {
       index += 2;
       continue;
     }
-    if (
-      argument?.startsWith('-') ||
-      ['nodaemon', 'server', 'fork-server'].includes(argument ?? '')
-    ) {
-      throw transportMismatch();
-    }
+    if (argument?.startsWith('-')) throw transportMismatch();
     break;
   }
-  return [...normalized, ...args.slice(index)];
+  const command = args.slice(index);
+  assertManagedAdbCommand(command);
+  return [...normalized, ...command];
+}
+
+function assertManagedAdbCommand(args: string[]): void {
+  const command = args.find((argument) => !argument.startsWith('wait-for-'));
+  if (
+    [
+      'nodaemon',
+      'server',
+      'fork-server',
+      'kill-server',
+      'start-server',
+      'connect',
+      'disconnect',
+      'reconnect',
+      'attach',
+      'detach',
+      'pair',
+    ].includes(command ?? '')
+  ) {
+    throw transportMismatch();
+  }
 }
 
 function transportMismatch(): AppError {