@react-native-harness/platform-android 1.1.0-rc.1 → 1.1.0-rc.2

package/dist/__tests__/shared-prefs.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=shared-prefs.test.d.ts.map

package/dist/__tests__/shared-prefs.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-prefs.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/shared-prefs.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/shared-prefs.test.js

@@ -0,0 +1,87 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+import * as tools from '@react-native-harness/tools';
+import { applyHarnessDebugHttpHost, clearHarnessDebugHttpHost, } from '../shared-prefs.js';
+const bundleId = 'com.example.app';
+const adbId = 'emulator-5554';
+const getWrittenContent = (calls) => {
+    const writeCall = calls.find(([, , options]) => {
+        if (!options || typeof options !== 'object' || !('stdin' in options)) {
+            return false;
+        }
+        return Boolean(options.stdin);
+    });
+    const options = writeCall?.[2];
+    if (!options || typeof options !== 'object' || !('stdin' in options)) {
+        throw new Error('Expected write call options.');
+    }
+    const content = options.stdin;
+    if (!content ||
+        typeof content !== 'object' ||
+        !('string' in content) ||
+        typeof content.string !== 'string') {
+        throw new Error('Expected write call with string stdin.');
+    }
+    return content.string;
+};
+const getWrittenContents = (calls) => calls
+    .filter(([, , options]) => {
+    if (!options || typeof options !== 'object' || !('stdin' in options)) {
+        return false;
+    }
+    return Boolean(options.stdin);
+})
+    .map((call) => getWrittenContent([call]));
+describe('Android shared preferences Metro host override', () => {
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    it('handles empty self-closing map files', async () => {
+        const spawnSpy = vi
+            .spyOn(tools, 'spawn')
+            .mockResolvedValueOnce({
+            stdout: '<?xml version="1.0" encoding="utf-8"?>\n<map />\n',
+        })
+            .mockResolvedValueOnce({});
+        await applyHarnessDebugHttpHost(adbId, bundleId, 'localhost:9090');
+        expect(getWrittenContent(spawnSpy.mock.calls)).toContain('<map>');
+        expect(getWrittenContent(spawnSpy.mock.calls)).toContain('</map>');
+        expect(getWrittenContent(spawnSpy.mock.calls)).toContain('<string name="debug_http_host">localhost:9090</string>');
+    });
+    it('restores the previous debug host on cleanup', async () => {
+        const spawnSpy = vi
+            .spyOn(tools, 'spawn')
+            .mockResolvedValueOnce({
+            stdout: [
+                '<?xml version="1.0" encoding="utf-8"?>',
+                '<map>',
+                '  <string name="debug_http_host">10.0.2.2:8081</string>',
+                '</map>',
+            ].join('\n'),
+        })
+            .mockResolvedValueOnce({})
+            .mockResolvedValueOnce({
+            stdout: [
+                '<?xml version="1.0" encoding="utf-8"?>',
+                '<map>',
+                '  <string name="debug_http_host">10.0.2.2:8081</string>',
+                '  <!-- react-native-harness:debug_http_host:start -->',
+                '  <string name="debug_http_host">localhost:9090</string>',
+                '  <!-- react-native-harness:debug_http_host:end -->',
+                '</map>',
+            ].join('\n'),
+        })
+            .mockResolvedValueOnce({});
+        await applyHarnessDebugHttpHost(adbId, bundleId, 'localhost:9090');
+        await clearHarnessDebugHttpHost(adbId, bundleId);
+        const writes = getWrittenContents(spawnSpy.mock.calls);
+        const firstWrite = writes[0];
+        const secondWrite = writes[1];
+        expect(firstWrite).toEqual(expect.stringContaining('<string name="harness_debug_http_host_backup">10.0.2.2:8081</string>'));
+        expect(firstWrite).toEqual(expect.stringContaining('<string name="debug_http_host">localhost:9090</string>'));
+        expect(firstWrite).toEqual(expect.not.stringContaining('<string name="debug_http_host">10.0.2.2:8081</string>'));
+        expect(secondWrite).toEqual(expect.stringContaining('<string name="debug_http_host">10.0.2.2:8081</string>'));
+        expect(secondWrite).toEqual(expect.not.stringContaining('<string name="harness_debug_http_host_backup">10.0.2.2:8081</string>'));
+        expect(secondWrite).toEqual(expect.not.stringContaining('<!-- react-native-harness:debug_http_host:start -->'));
+        expect(secondWrite).toEqual(expect.not.stringContaining('<string name="debug_http_host">localhost:9090</string>'));
+    });
+});

package/dist/app-monitor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-monitor.d.ts","sourceRoot":"","sources":["../src/app-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,eAAe,EAErB,MAAM,iCAAiC,CAAC;AAqRzC,QAAA,MAAM,qBAAqB,GACzB,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,eAAe,GAAG,IAwEpB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,mDAKrC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C,KAAG,iBAmKH,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACjC,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG;IAC3C,eAAe,EAAE,CACf,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;CACtC,CAAC"}
+{"version":3,"file":"app-monitor.d.ts","sourceRoot":"","sources":["../src/app-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,eAAe,EAErB,MAAM,iCAAiC,CAAC;AAuRzC,QAAA,MAAM,qBAAqB,GACzB,MAAM,MAAM,EACZ,UAAU,MAAM,KACf,eAAe,GAAG,IAwEpB,CAAC;AAEF,eAAO,MAAM,uBAAuB,GAAI,mDAKrC;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;CAC3C,KAAG,iBAmKH,CAAC;AAEF,OAAO,EAAE,qBAAqB,EAAE,CAAC;AACjC,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG;IAC3C,eAAe,EAAE,CACf,OAAO,EAAE,yBAAyB,KAC/B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;CACtC,CAAC"}

package/dist/app-monitor.js

@@ -1,6 +1,7 @@
 import { escapeRegExp, getEmitter, logger, spawn, SubprocessError } from '@react-native-harness/tools';
 import * as adb from './adb.js';
 import { androidCrashParser } from './crash-parser.js';
+const androidAppMonitorLogger = logger.child('android-app-monitor');
 const getLogcatArgs = (uid, fromTime) => ['logcat', '-v', 'threadtime', '-b', 'crash', `--uid=${uid}`, '-T', fromTime];
 const MAX_RECENT_LOG_LINES = 200;
 const MAX_RECENT_CRASH_ARTIFACTS = 10;
@@ -285,7 +286,7 @@ export const createAndroidAppMonitor = ({ adbId, bundleId, appUid, crashArtifact
             }
             catch (error) {
                 if (!(error instanceof SubprocessError && error.signalName === 'SIGTERM')) {
-                    logger.debug('Android logcat monitor stopped', error);
+                    androidAppMonitorLogger.debug('Android logcat monitor stopped', error);
                 }
             }
         })();

package/dist/runner.d.ts

@@ -1,6 +1,6 @@
 import { HarnessPlatformRunner } from '@react-native-harness/platforms';
-import { Config } from '@react-native-harness/config';
+import type { Config as HarnessConfig } from '@react-native-harness/config';
 import { type AndroidPlatformConfig } from './config.js';
-declare const getAndroidRunner: (config: AndroidPlatformConfig, harnessConfig: Config) => Promise<HarnessPlatformRunner>;
+declare const getAndroidRunner: (config: AndroidPlatformConfig, harnessConfig: HarnessConfig) => Promise<HarnessPlatformRunner>;
 export default getAndroidRunner;
 //# sourceMappingURL=runner.d.ts.map

package/dist/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,aAAa,CAAC;AAMrB,QAAA,MAAM,gBAAgB,GACpB,QAAQ,qBAAqB,EAC7B,eAAe,MAAM,KACpB,OAAO,CAAC,qBAAqB,CA+D/B,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,aAAa,CAAC;AAUrB,QAAA,MAAM,gBAAgB,GACpB,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,KAC3B,OAAO,CAAC,qBAAqB,CAmE/B,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/runner.js

@@ -2,6 +2,7 @@ import { DeviceNotFoundError, AppNotInstalledError, } from '@react-native-harnes
 import { AndroidPlatformConfigSchema, } from './config.js';
 import { getAdbId } from './adb-id.js';
 import * as adb from './adb.js';
+import { applyHarnessDebugHttpHost, clearHarnessDebugHttpHost, } from './shared-prefs.js';
 import { getDeviceName } from './utils.js';
 import { createAndroidAppMonitor } from './app-monitor.js';
 const getAndroidRunner = async (config, harnessConfig) => {
@@ -14,11 +15,13 @@ const getAndroidRunner = async (config, harnessConfig) => {
     if (!isInstalled) {
         throw new AppNotInstalledError(parsedConfig.bundleId, getDeviceName(parsedConfig.device));
     }
+    const metroPort = harnessConfig.metroPort;
     await Promise.all([
-        adb.reversePort(adbId, 8081),
+        adb.reversePort(adbId, metroPort),
         adb.reversePort(adbId, 8080),
         adb.reversePort(adbId, harnessConfig.webSocketPort),
         adb.setHideErrorDialogs(adbId, true),
+        applyHarnessDebugHttpHost(adbId, parsedConfig.bundleId, `localhost:${metroPort}`),
     ]);
     const appUid = await adb.getAppUid(adbId, parsedConfig.bundleId);
     return {
@@ -36,6 +39,7 @@ const getAndroidRunner = async (config, harnessConfig) => {
         },
         dispose: async () => {
             await adb.stopApp(adbId, parsedConfig.bundleId);
+            await clearHarnessDebugHttpHost(adbId, parsedConfig.bundleId);
             await adb.setHideErrorDialogs(adbId, false);
         },
         isAppRunning: async () => {

package/dist/shared-prefs.d.ts

@@ -0,0 +1,3 @@
+export declare const applyHarnessDebugHttpHost: (adbId: string, bundleId: string, host: string) => Promise<void>;
+export declare const clearHarnessDebugHttpHost: (adbId: string, bundleId: string) => Promise<void>;
+//# sourceMappingURL=shared-prefs.d.ts.map

package/dist/shared-prefs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shared-prefs.d.ts","sourceRoot":"","sources":["../src/shared-prefs.ts"],"names":[],"mappings":"AAsJA,eAAO,MAAM,yBAAyB,GACpC,OAAO,MAAM,EACb,UAAU,MAAM,EAChB,MAAM,MAAM,KACX,OAAO,CAAC,IAAI,CAoBd,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,IAAI,CAyBd,CAAC"}

package/dist/shared-prefs.js

@@ -0,0 +1,92 @@
+import { spawn, SubprocessError } from '@react-native-harness/tools';
+const DEBUG_HTTP_HOST_BLOCK_START = '<!-- react-native-harness:debug_http_host:start -->';
+const DEBUG_HTTP_HOST_BLOCK_END = '<!-- react-native-harness:debug_http_host:end -->';
+const DEBUG_HTTP_HOST_BACKUP_KEY = 'harness_debug_http_host_backup';
+const getSharedPrefsPath = (bundleId) => `shared_prefs/${bundleId}_preferences.xml`;
+const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+const escapeXml = (value) => value
+    .replaceAll('&', '&amp;')
+    .replaceAll('<', '&lt;')
+    .replaceAll('>', '&gt;')
+    .replaceAll('"', '&quot;')
+    .replaceAll("'", '&apos;');
+const unescapeXml = (value) => value
+    .replaceAll('&apos;', "'")
+    .replaceAll('&quot;', '"')
+    .replaceAll('&gt;', '>')
+    .replaceAll('&lt;', '<')
+    .replaceAll('&amp;', '&');
+const getStringPreferenceRegex = (key) => new RegExp(`<string\\s+name="${escapeRegExp(key)}">([\\s\\S]*?)<\\/string>`, 'g');
+const getStringPreferenceValue = (content, key) => {
+    const matches = [...content.matchAll(getStringPreferenceRegex(key))];
+    const value = matches.at(-1)?.[1];
+    return value == null ? null : unescapeXml(value);
+};
+const renameStringPreference = (content, fromKey, toKey) => content.replace(new RegExp(`(<string\\s+name=")${escapeRegExp(fromKey)}(">[\\s\\S]*?<\\/string>)`, 'g'), `$1${toKey}$2`);
+const stripStringPreference = (content, key) => content.replace(new RegExp(`\\s*<string\\s+name="${escapeRegExp(key)}">[\\s\\S]*?<\\/string>\\s*`, 'g'), '\n');
+const normalizeEmptyMap = (content) => content.replace(/<map\s*\/>/g, '<map>\n</map>');
+const getHarnessDebugHttpHostBlock = (host) => [
+    DEBUG_HTTP_HOST_BLOCK_START,
+    `<string name="debug_http_host">${escapeXml(host)}</string>`,
+    DEBUG_HTTP_HOST_BLOCK_END,
+].join('\n');
+const stripHarnessDebugHttpHostBlock = (content) => content.replace(new RegExp(`\\s*${escapeRegExp(DEBUG_HTTP_HOST_BLOCK_START)}\\s*\\n[\\s\\S]*?\\n\\s*${escapeRegExp(DEBUG_HTTP_HOST_BLOCK_END)}\\s*`, 'g'), '\n');
+const normalizeSharedPrefsContent = (content) => {
+    if (!content?.trim()) {
+        return ['<?xml version="1.0" encoding="utf-8"?>', '<map>', '</map>'].join('\n');
+    }
+    return normalizeEmptyMap(stripHarnessDebugHttpHostBlock(content)).trim();
+};
+const insertBeforeClosingMap = (content, block) => {
+    if (!content.includes('</map>')) {
+        throw new Error('Android shared preferences file is missing </map>.');
+    }
+    return content.replace(/<\/map>\s*$/, `  ${block.replace(/\n/g, '\n  ')}\n</map>`);
+};
+const readSharedPrefsFile = async (adbId, bundleId) => {
+    try {
+        const { stdout } = await spawn('adb', [
+            '-s',
+            adbId,
+            'shell',
+            `run-as ${bundleId} cat ${getSharedPrefsPath(bundleId)}`,
+        ]);
+        return stdout;
+    }
+    catch (error) {
+        if (error instanceof SubprocessError && error.exitCode === 1) {
+            return null;
+        }
+        throw error;
+    }
+};
+const writeSharedPrefsFile = async (adbId, bundleId, content) => {
+    await spawn('adb', [
+        '-s',
+        adbId,
+        'shell',
+        `run-as ${bundleId} sh -c 'mkdir -p shared_prefs && cat > ${getSharedPrefsPath(bundleId)}'`,
+    ], { stdin: { string: `${content.trim()}\n` } });
+};
+export const applyHarnessDebugHttpHost = async (adbId, bundleId, host) => {
+    const existingContent = await readSharedPrefsFile(adbId, bundleId);
+    const normalizedContent = normalizeSharedPrefsContent(existingContent);
+    const existingHost = getStringPreferenceValue(normalizedContent, 'debug_http_host');
+    const contentWithBackup = existingHost == null
+        ? normalizedContent
+        : renameStringPreference(stripStringPreference(normalizedContent, DEBUG_HTTP_HOST_BACKUP_KEY), 'debug_http_host', DEBUG_HTTP_HOST_BACKUP_KEY);
+    const nextContent = insertBeforeClosingMap(contentWithBackup, getHarnessDebugHttpHostBlock(host));
+    await writeSharedPrefsFile(adbId, bundleId, nextContent);
+};
+export const clearHarnessDebugHttpHost = async (adbId, bundleId) => {
+    const existingContent = await readSharedPrefsFile(adbId, bundleId);
+    if (!existingContent) {
+        return;
+    }
+    const nextContentWithoutHarnessBlock = stripHarnessDebugHttpHostBlock(existingContent).trim();
+    if (nextContentWithoutHarnessBlock === existingContent.trim()) {
+        return;
+    }
+    const restoredContent = renameStringPreference(nextContentWithoutHarnessBlock, DEBUG_HTTP_HOST_BACKUP_KEY, 'debug_http_host');
+    await writeSharedPrefsFile(adbId, bundleId, normalizeEmptyMap(restoredContent).trim());
+};