@xenon-device-management/xenon 2.0.0 → 2.1.0

package/lib/test/unit/device-sync-lost-update.spec.js

@@ -21,10 +21,12 @@ const prisma_store_1 = require("../../src/data-service/prisma-store");
 const device_store_1 = require("../../src/data-service/device-store");
 const device_service_1 = require("../../src/data-service/device-service");
 const device_utils_1 = require("../../src/device-utils");
+const localDeviceHosts_1 = require("../../src/device-managers/localDeviceHosts");
 const device_managers_1 = require("../../src/device-managers");
 const SocketServer_1 = require("../../src/services/SocketServer");
 const NotificationService_1 = require("../../src/services/NotificationService");
 const container_registration_1 = require("../helpers/container-registration");
+const fake_device_table_1 = require("../helpers/fake-device-table");
 /**
  * The periodic device sync reads every row, runs discovery (seconds of adb or
  * simctl), then writes each phone back. A write that lands in between (a
@@ -38,81 +40,7 @@ const container_registration_1 = require("../helpers/container-registration");
  */
 const HOST = 'http://127.0.0.1:4723';
 const BIND = '127.0.0.1';
-function fakeDeviceTable(seed) {
-    const rows = new Map();
-    const key = (udid, host) => `${udid}|${host}`;
-    const matches = (row, where) => {
-        if (!where)
-            return true;
-        return Object.entries(where).every(([field, cond]) => {
-            var _a;
-            if (field === 'OR')
-                return cond.some((w) => matches(row, w));
-            if (field === 'AND')
-                return cond.every((w) => matches(row, w));
-            if (cond && typeof cond === 'object' && 'in' in cond)
-                return cond.in.includes(row[field]);
-            if (cond && typeof cond === 'object' && 'contains' in cond)
-                return String((_a = row[field]) !== null && _a !== void 0 ? _a : '').includes(cond.contains);
-            return row[field] === cond;
-        });
-    };
-    const write = (row, data) => {
-        for (const [field, value] of Object.entries(data))
-            if (value !== undefined)
-                row[field] = value;
-    };
-    const defaults = () => ({
-        busy: false,
-        userBlocked: false,
-        offline: false,
-        session_id: null,
-        teamId: null,
-        sessionProgress: '',
-        sessionStartTime: 0,
-        totalUtilizationTimeMilliSec: 0,
-    });
-    for (const r of seed)
-        rows.set(key(r.udid, r.host), Object.assign(Object.assign({}, defaults()), r));
-    return {
-        row: (udid) => [...rows.values()].find((r) => r.udid === udid),
-        delegate: {
-            findMany: (...args_1) => __awaiter(this, [...args_1], void 0, function* (args = {}) { return [...rows.values()].filter((r) => matches(r, args.where)).map((r) => (Object.assign({}, r))); }),
-            findUnique: (_a) => __awaiter(this, [_a], void 0, function* ({ where }) {
-                const r = rows.get(key(where.udid_host.udid, where.udid_host.host));
-                return r ? Object.assign({}, r) : null;
-            }),
-            upsert: (_a) => __awaiter(this, [_a], void 0, function* ({ where, create, update, }) {
-                const k = key(where.udid_host.udid, where.udid_host.host);
-                const found = rows.get(k);
-                if (found) {
-                    write(found, update);
-                    return Object.assign({}, found);
-                }
-                const created = defaults();
-                write(created, create);
-                rows.set(k, created);
-                return Object.assign({}, created);
-            }),
-            updateMany: (_a) => __awaiter(this, [_a], void 0, function* ({ where, data }) {
-                let count = 0;
-                for (const r of rows.values()) {
-                    if (matches(r, where)) {
-                        write(r, data);
-                        count++;
-                    }
-                }
-                return { count };
-            }),
-            deleteMany: (_a) => __awaiter(this, [_a], void 0, function* ({ where }) {
-                for (const [k, r] of rows)
-                    if (matches(r, where))
-                        rows.delete(k);
-                return { count: 0 };
-            }),
-        },
-    };
-}
+const LOCAL = (0, localDeviceHosts_1.localDeviceHosts)({ bindHostOrIp: BIND }, 4723);
 /** What AndroidDeviceManager returns for a phone it already knows (~158-166). */
 const androidEcho = (known) => (Object.assign(Object.assign({}, known), { state: 'device', busy: known.busy || false }));
 /** What IOSDiscoveryService.getSimulators returns for every simulator, known or not. */
@@ -136,7 +64,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
     let restoreContainer;
     let savedStore;
     const seed = (rows) => {
-        table = fakeDeviceTable(rows);
+        table = (0, fake_device_table_1.fakeDeviceTable)(rows);
         for (const m of Object.keys(table.delegate)) {
             sinon_1.default.stub(prisma_1.prisma.device, m).callsFake(table.delegate[m]);
         }
@@ -178,7 +106,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
             yield (0, device_service_1.blockDevice)('s9', HOST, 'manual_user-1_s9');
             return known.map(androidEcho);
         });
-        yield (0, device_utils_1.updateDeviceList)(BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOCAL);
         (0, chai_1.expect)(table.row('s9')).to.include({ busy: true, session_id: 'manual_user-1_s9' });
     }));
     it('keeps a session lock taken while discovery ran, so the phone is not handed out twice', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -190,7 +118,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
             (0, chai_1.expect)(locked === null || locked === void 0 ? void 0 : locked.udid).to.equal('s9');
             return known.map(androidEcho);
         });
-        yield (0, device_utils_1.updateDeviceList)(BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOCAL);
         (0, chai_1.expect)(table.row('s9')).to.include({ busy: true });
         const second = yield device_store_1.DeviceStoreFactory.getStore().findAndLockDevice({
             platform: 'android',
@@ -203,7 +131,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
             yield device_store_1.DeviceStoreFactory.getStore().updateDevice('s9', HOST, { teamId: 'team-b' });
             return known.map(androidEcho);
         });
-        yield (0, device_utils_1.updateDeviceList)(BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOCAL);
         (0, chai_1.expect)(table.row('s9')).to.include({ teamId: 'team-b' });
     }));
     it("keeps a stream's port written while discovery ran", () => __awaiter(void 0, void 0, void 0, function* () {
@@ -212,7 +140,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
             yield device_store_1.DeviceStoreFactory.getStore().updateDevice('s9', HOST, { mjpegServerPort: 9200 });
             return known.map(androidEcho);
         });
-        yield (0, device_utils_1.updateDeviceList)(BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOCAL);
         (0, chai_1.expect)(table.row('s9')).to.include({ mjpegServerPort: 9200 });
     }));
     it('leaves a simulator in a session busy, though discovery always reports it free', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -232,7 +160,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
             },
         ]);
         discover = () => __awaiter(void 0, void 0, void 0, function* () { return [simulatorAsDiscovered()]; });
-        yield (0, device_utils_1.updateDeviceList)(BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOCAL);
         (0, chai_1.expect)(table.row('sim-1')).to.include({
             busy: true,
             session_id: 'sess-1',
@@ -268,7 +196,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
                 Object.assign(Object.assign({}, known.find((d) => d.udid === 'iphone')), { ip: '10.0.0.9' }),
             ];
         });
-        yield (0, device_utils_1.updateDeviceList)(BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOCAL);
         (0, chai_1.expect)(table.row('sim-1')).to.include({ state: 'Booted', wdaLocalPort: 8101 });
         (0, chai_1.expect)(table.row('iphone')).to.include({ ip: '10.0.0.9' });
     }));
@@ -276,7 +204,7 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
         seed([S9]);
         const pixel = Object.assign(Object.assign({}, S9), { udid: 'pixel', name: 'Pixel 8' });
         discover = (known) => __awaiter(void 0, void 0, void 0, function* () { return [...known.map(androidEcho), pixel]; });
-        yield (0, device_utils_1.updateDeviceList)(BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOCAL);
         (0, chai_1.expect)(emits.filter(([e]) => e === 'device_added').map(([, d]) => d.udid)).to.deep.equal([
             'pixel',
         ]);
@@ -297,16 +225,16 @@ describe('Device sync keeps writes made while it ran (lost update)', () => {
         });
         (0, chai_1.expect)(emits.filter(([e]) => e === 'device_added')).to.have.length(0);
     }));
-    it("the hub stores a node's own report of its phones as sent", () => __awaiter(void 0, void 0, void 0, function* () {
+    it("the hub takes a node's report of its phone busy as the node's, not a session of its own", () => __awaiter(void 0, void 0, void 0, function* () {
         seed([Object.assign(Object.assign({}, S9), { host: 'http://10.0.0.2:4723' })]);
-        yield (0, device_service_1.addNewDevice)([Object.assign(Object.assign({}, S9), { host: 'http://10.0.0.2:4723', busy: true, session_id: 'node-sess' })], undefined, { mirror: true });
-        (0, chai_1.expect)(table.row('s9')).to.include({ busy: true, session_id: 'node-sess' });
+        yield (0, device_service_1.addNewDevice)([Object.assign(Object.assign({}, S9), { host: 'http://10.0.0.2:4723', busy: true, session_id: 'node-sess' })], undefined, { nodeReport: true });
+        (0, chai_1.expect)(table.row('s9')).to.include({ busy: true, nodeBusy: true, session_id: null });
         (0, chai_1.expect)(emits.filter(([e]) => e === 'device_added')).to.have.length(0);
     }));
 });
 describe('Device sync keeps writes made while it ran, on the Loki test store', () => {
     const LOKI_HOST = 'http://loki-sync-test:4723';
-    const LOKI_BIND = 'loki-sync-test';
+    const LOKI_LOCAL = (0, localDeviceHosts_1.localDeviceHosts)({ bindHostOrIp: 'loki-sync-test' }, 4723);
     const UDIDS = ['loki-s9', 'loki-sim', 'loki-pixel'];
     let emits;
     let discover;
@@ -358,7 +286,7 @@ describe('Device sync keeps writes made while it ran, on the Loki test store', (
             yield (0, device_service_1.blockDevice)('loki-s9', LOKI_HOST, 'manual_user-1_loki-s9');
             return known.filter((d) => d.host === LOKI_HOST).map(androidEcho);
         });
-        yield (0, device_utils_1.updateDeviceList)(LOKI_BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOKI_LOCAL);
         (0, chai_1.expect)(yield row('loki-s9')).to.include({ busy: true, session_id: 'manual_user-1_loki-s9' });
     }));
     it('leaves a simulator in a session busy, and still takes its new state', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -371,7 +299,7 @@ describe('Device sync keeps writes made while it ran, on the Loki test store', (
                 simulatorAsDiscovered({ udid: 'loki-sim', host: LOKI_HOST, state: 'Booted' }),
             ];
         });
-        yield (0, device_utils_1.updateDeviceList)(LOKI_BIND);
+        yield (0, device_utils_1.updateDeviceList)(LOKI_LOCAL);
         (0, chai_1.expect)(yield row('loki-sim')).to.include({
             busy: true,
             session_id: 'sess-1',

package/lib/test/unit/device-team-guard.spec.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const deviceTeamGuard_1 = require("../../src/middleware/deviceTeamGuard");
 const controlDevice_1 = require("../../src/middleware/controlDevice");
 const deviceVisibility_1 = require("../../src/services/device-access/deviceVisibility");
@@ -93,7 +93,7 @@ function appWith(caller, findDevice = (udid) => __awaiter(this, void 0, void 0,
     return { app, seen };
 }
 function call(app, method, path) {
-    return (0, supertest_1.default)(app)[method](path);
+    return (0, loopbackRequest_1.default)(app)[method](path);
 }
 /** What a caller can observe of an answer, with the requested udid masked out. */
 function observed(res, udid) {
@@ -153,7 +153,7 @@ describe('deviceTeamGuard', () => {
     }
     it('hands a hidden phone on as a udid no device has, keeping the original URL', () => __awaiter(void 0, void 0, void 0, function* () {
         const { app, seen } = appWith(ALICE);
-        yield (0, supertest_1.default)(app).get(`/control/${PHONE_B}/screenshot?x=1`);
+        yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_B}/screenshot?x=1`);
         (0, chai_1.expect)(seen).to.deep.equal([controlDevice_1.HIDDEN_DEVICE_UDID]);
         (0, chai_1.expect)(DEVICES[controlDevice_1.HIDDEN_DEVICE_UDID]).to.equal(undefined);
     }));
@@ -171,7 +171,7 @@ describe('deviceTeamGuard', () => {
             res.end();
         });
         app.use('/control', router);
-        yield (0, supertest_1.default)(app).get(`/control/${PHONE_B}/screenshot?x=1`);
+        yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_B}/screenshot?x=1`);
         (0, chai_1.expect)(originalUrl).to.equal(`/control/${PHONE_B}/screenshot?x=1`);
     }));
     describe('restoreHiddenDeviceUrl, mounted after the router at the parent', () => {
@@ -196,7 +196,7 @@ describe('deviceTeamGuard', () => {
             return { app, seenByRoute };
         }
         it('gives a later layer the real req.url after the router falls through', () => __awaiter(void 0, void 0, void 0, function* () {
-            const res = yield (0, supertest_1.default)(parentApp(ALICE).app).get(`/control/${PHONE_B}/bogus?x=1`);
+            const res = yield (0, loopbackRequest_1.default)(parentApp(ALICE).app).get(`/control/${PHONE_B}/bogus?x=1`);
             (0, chai_1.expect)(res.body).to.deep.equal({
                 url: `/control/${PHONE_B}/bogus?x=1`,
                 path: `/control/${PHONE_B}/bogus`,
@@ -204,26 +204,26 @@ describe('deviceTeamGuard', () => {
         }));
         it('answers a hidden phone and an unknown udid alike, even where a layer echoes req.url', () => __awaiter(void 0, void 0, void 0, function* () {
             const { app } = parentApp(ALICE);
-            const hidden = yield (0, supertest_1.default)(app).get(`/control/${PHONE_B}/bogus`);
-            const unknown = yield (0, supertest_1.default)(app).get(`/control/${UNKNOWN}/bogus`);
+            const hidden = yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_B}/bogus`);
+            const unknown = yield (0, loopbackRequest_1.default)(app).get(`/control/${UNKNOWN}/bogus`);
             (0, chai_1.expect)(observed(hidden, PHONE_B)).to.deep.equal(observed(unknown, UNKNOWN));
             (0, chai_1.expect)(hidden.text).to.not.include(controlDevice_1.HIDDEN_DEVICE_UDID);
         }));
         it('still hands a routed request the placeholder, not the real udid', () => __awaiter(void 0, void 0, void 0, function* () {
             const { app, seenByRoute } = parentApp(ALICE);
-            const res = yield (0, supertest_1.default)(app).get(`/control/${PHONE_B}/screenshot`);
+            const res = yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_B}/screenshot`);
             (0, chai_1.expect)(res.text).to.equal('Device not found');
             (0, chai_1.expect)(seenByRoute).to.deep.equal([controlDevice_1.HIDDEN_DEVICE_UDID]);
         }));
         it('leaves a request it did not rewrite alone', () => __awaiter(void 0, void 0, void 0, function* () {
-            const res = yield (0, supertest_1.default)(parentApp(ALICE).app).get(`/control/${PHONE_A}/bogus`);
+            const res = yield (0, loopbackRequest_1.default)(parentApp(ALICE).app).get(`/control/${PHONE_A}/bogus`);
             (0, chai_1.expect)(res.body.url).to.equal(`/control/${PHONE_A}/bogus`);
         }));
     });
     it('gives a member in no team the shared pool only', () => __awaiter(void 0, void 0, void 0, function* () {
         const { app } = appWith(NO_TEAM);
-        (0, chai_1.expect)((yield (0, supertest_1.default)(app).get(`/control/${SHARED}/screenshot`)).status).to.equal(200);
-        const a = yield (0, supertest_1.default)(app).get(`/control/${PHONE_A}/screenshot`);
+        (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(app).get(`/control/${SHARED}/screenshot`)).status).to.equal(200);
+        const a = yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_A}/screenshot`);
         (0, chai_1.expect)(a.status).to.equal(404);
         (0, chai_1.expect)(a.text).to.equal('Device not found');
     }));
@@ -231,16 +231,16 @@ describe('deviceTeamGuard', () => {
     // plain-text default. A hidden phone gets the same body, from the handler.
     for (const action of ['display', 'appium-session']) {
         it(`answers ${action} with that handler's own JSON 404 body`, () => __awaiter(void 0, void 0, void 0, function* () {
-            const res = yield (0, supertest_1.default)(appWith(ALICE).app).get(`/control/${PHONE_B}/${action}`);
+            const res = yield (0, loopbackRequest_1.default)(appWith(ALICE).app).get(`/control/${PHONE_B}/${action}`);
             (0, chai_1.expect)(res.status).to.equal(404);
             (0, chai_1.expect)(res.body).to.deep.equal({ status: 'error', message: 'Device not found' });
         }));
     }
     it('guards an action in any letter case', () => __awaiter(void 0, void 0, void 0, function* () {
         const { app, seen } = appWith(ALICE);
-        const start = yield (0, supertest_1.default)(app).post(`/control/${PHONE_B}/Stream/Start`);
+        const start = yield (0, loopbackRequest_1.default)(app).post(`/control/${PHONE_B}/Stream/Start`);
         (0, chai_1.expect)(start.status).to.equal(404);
-        const display = yield (0, supertest_1.default)(app).get(`/control/${PHONE_B}/Display`);
+        const display = yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_B}/Display`);
         (0, chai_1.expect)(display.status).to.equal(404);
         (0, chai_1.expect)(display.body).to.deep.equal({ status: 'error', message: 'Device not found' });
         (0, chai_1.expect)(seen).to.not.include(PHONE_B);
@@ -272,7 +272,7 @@ describe('deviceTeamGuard', () => {
     // drive a phone the device list hides from them.
     it('ignores an admin scope on a caller whose teams are scoped', () => __awaiter(void 0, void 0, void 0, function* () {
         const scoped = { role: 'MEMBER', scopes: 'admin,devices', teamIds: [TEAM_A] };
-        const res = yield (0, supertest_1.default)(appWith(scoped).app).post(`/control/${PHONE_B}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith(scoped).app).post(`/control/${PHONE_B}/tap`);
         (0, chai_1.expect)(res.status).to.equal(404);
     }));
     it('does not look the device up for an admin', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -282,13 +282,13 @@ describe('deviceTeamGuard', () => {
             lookups += 1;
             return (_a = DEVICES[udid]) !== null && _a !== void 0 ? _a : null;
         }));
-        const res = yield (0, supertest_1.default)(app).get(`/control/${PHONE_B}/screenshot`);
+        const res = yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_B}/screenshot`);
         (0, chai_1.expect)(res.status).to.equal(200);
         (0, chai_1.expect)(lookups).to.equal(0);
     }));
     it('passes an unknown device on untouched, for the handler to answer', () => __awaiter(void 0, void 0, void 0, function* () {
         const { app, seen } = appWith(ALICE);
-        const res = yield (0, supertest_1.default)(app).post(`/control/${UNKNOWN}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(app).post(`/control/${UNKNOWN}/tap`);
         (0, chai_1.expect)(res.status).to.equal(404);
         (0, chai_1.expect)(seen).to.deep.equal([UNKNOWN]);
     }));
@@ -296,7 +296,7 @@ describe('deviceTeamGuard', () => {
         const { app, seen } = appWith(ALICE, () => __awaiter(void 0, void 0, void 0, function* () {
             throw new Error('store hiccup');
         }));
-        const res = yield (0, supertest_1.default)(app).get(`/control/${PHONE_A}/screenshot`);
+        const res = yield (0, loopbackRequest_1.default)(app).get(`/control/${PHONE_A}/screenshot`);
         (0, chai_1.expect)(res.status).to.equal(503);
         (0, chai_1.expect)(res.body).to.deep.equal({
             success: false,
@@ -310,13 +310,13 @@ describe('deviceTeamGuard', () => {
             // An async middleware that throws never answers under Express 4, so keep
             // a short timeout: a regression should fail fast, not after 60s.
             this.timeout(5000);
-            const res = yield (0, supertest_1.default)(appWith(ALICE).app).get('/control/100%/screenshot');
+            const res = yield (0, loopbackRequest_1.default)(appWith(ALICE).app).get('/control/100%/screenshot');
             (0, chai_1.expect)(res.status).to.equal(400);
             (0, chai_1.expect)(res.body).to.deep.equal({ success: false, error: 'invalid_udid' });
         });
     });
     it('401s when there is no caller', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith(null).app).get(`/control/${PHONE_A}/screenshot`);
+        const res = yield (0, loopbackRequest_1.default)(appWith(null).app).get(`/control/${PHONE_A}/screenshot`);
         (0, chai_1.expect)(res.status).to.equal(401);
     }));
 });

package/lib/test/unit/device-utils.spec.js

@@ -57,11 +57,18 @@ const device_service_1 = require("../../src/data-service/device-service");
 const device_utils_1 = require("../../src/device-utils");
 const IPluginArgs_1 = require("../../src/interfaces/IPluginArgs");
 const test_container_1 = require("../helpers/test-container");
+const loki_stores_1 = require("../helpers/loki-stores");
+const scratch_database_1 = require("../helpers/scratch-database");
 chai_1.default.should();
 chai_1.default.use(sinon_chai_1.default);
 const expect = chai_1.default.expect;
 const sandbox = sinon_1.default.createSandbox();
 describe('Device Utils', () => {
+    // The in-memory device store, also when this file runs on its own, and a
+    // database of its own for what allocation reads through Prisma. It passed
+    // only against the developer's ~/.cache/xenon/xenon.db, which has the tables.
+    (0, loki_stores_1.useLokiStores)();
+    (0, scratch_database_1.useScratchDatabase)();
     const hub1Device = {
         systemPort: 56205,
         sdk: '10',
@@ -162,6 +169,7 @@ describe('Device Utils', () => {
         yield (0, test_container_1.resetTestContainer)();
         yield (0, test_container_1.setupTestContainer)();
     }));
+    after(() => (0, test_container_1.resetTestContainer)());
     it('Allocate devices for session with host filter', () => __awaiter(void 0, void 0, void 0, function* () {
         (yield db_1.XenonDatabase.DeviceModel).removeDataOnly();
         const deviceManager = (0, test_container_1.createTestXenonManager)(Object.assign({}, pluginArgs, { maxSessions: 3, platform: 'android' }));

package/lib/test/unit/extract-team-cap.spec.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const XenonCapabilityManager_1 = require("../../src/XenonCapabilityManager");
+// The team a session asks to be placed in. Documented as xe:options.team;
+// xenon:options is read as its alias, through the same precedence helper as
+// every other Xenon option. The flat Xenon-prefixed caps older clients send
+// (xenon:team, xe:teamId, ...) still work, below the options. df: is never
+// read.
+const always = (alwaysMatch) => ({ alwaysMatch, firstMatch: [{}] });
+describe('extractTeamCap', () => {
+    it('reads xe:options.team, the documented form', () => {
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ 'xe:options': { team: 'team_a' } }))).to.equal('team_a');
+    });
+    it('reads xe:options.teamId', () => {
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ 'xe:options': { teamId: 'team_a' } }))).to.equal('team_a');
+    });
+    it('still reads the xenon:options alias alone', () => {
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ 'xenon:options': { team: 'team_a' } }))).to.equal('team_a');
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ 'xenon:options': { teamId: 'team_a' } }))).to.equal('team_a');
+    });
+    it('lets xe:options win over xenon:options', () => {
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ 'xenon:options': { team: 'team_old' }, 'xe:options': { team: 'team_new' } }))).to.equal('team_new');
+        // Across alwaysMatch and firstMatch, as allocation merges them.
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)({
+            alwaysMatch: { 'xenon:options': { teamId: 'team_old' } },
+            firstMatch: [{ 'xe:options': { teamId: 'team_new' } }],
+        })).to.equal('team_new');
+    });
+    it('lets an options field win over a flat cap', () => {
+        for (const flat of ['xenon:team', 'xenon:teamId', 'xe:team', 'xe:teamId', 'appium:team']) {
+            (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ [flat]: 'team_flat', 'xe:options': { team: 'team_opt' } })), flat).to.equal('team_opt');
+            (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ [flat]: 'team_flat', 'xenon:options': { teamId: 'team_opt' } })), flat).to.equal('team_opt');
+        }
+    });
+    it('keeps every flat form working when no option is set', () => {
+        for (const prefix of ['xenon:', 'xe:', 'appium:', '']) {
+            for (const name of ['teamId', 'team_id', 'team']) {
+                const key = `${prefix}${name}`;
+                (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ [key]: 'team_flat' })), key).to.equal('team_flat');
+            }
+        }
+    });
+    it('falls back to a flat cap when the option is empty or not a string', () => {
+        for (const team of ['', 7, null, { id: 'team_x' }]) {
+            (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({ 'xe:options': { team }, 'xenon:team': 'team_flat' })), JSON.stringify(team)).to.equal('team_flat');
+        }
+    });
+    it('never reads df:', () => {
+        for (const caps of [
+            { 'df:options': { team: 'team_df' } },
+            { 'df:options': { teamId: 'team_df' } },
+            { 'xenon:df:options': { team: 'team_df' } },
+            { 'appium:df:options': { team: 'team_df' } },
+            { 'df:team': 'team_df' },
+            { 'df:teamId': 'team_df' },
+        ]) {
+            (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always(caps)), JSON.stringify(caps)).to.equal(undefined);
+        }
+    });
+    it('is undefined when nothing asks for a team', () => {
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)(always({}))).to.equal(undefined);
+        (0, chai_1.expect)((0, XenonCapabilityManager_1.extractTeamCap)({})).to.equal(undefined);
+    });
+});

package/lib/test/unit/grid-admin-only.spec.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("reflect-metadata");
 const chai_1 = require("chai");
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const grid_1 = __importDefault(require("../../src/app/routers/grid"));
 const authMiddleware_1 = require("../../src/middleware/authMiddleware");
 /**
@@ -44,12 +44,12 @@ describe('grid operator reads are admin-only', () => {
     }
     for (const url of ['/logs/requests', '/node/status', '/node/10.0.0.2/status']) {
         it(`a member gets 403 from GET ${url}`, () => __awaiter(void 0, void 0, void 0, function* () {
-            const r = yield (0, supertest_1.default)(app('MEMBER')).get(url);
+            const r = yield (0, loopbackRequest_1.default)(app('MEMBER')).get(url);
             (0, chai_1.expect)(r.status).to.equal(403);
         }));
     }
     it('an admin still reads the request log', () => __awaiter(void 0, void 0, void 0, function* () {
-        const r = yield (0, supertest_1.default)(app('ADMIN')).get('/logs/requests');
+        const r = yield (0, loopbackRequest_1.default)(app('ADMIN')).get('/logs/requests');
         (0, chai_1.expect)(r.status).to.equal(200);
     }));
 });

package/lib/test/unit/healing-tier-gate.spec.js

@@ -9,12 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
 const chai_1 = require("chai");
 const typedi_1 = require("typedi");
 const HealingOrchestrator_1 = require("../../src/services/healing/HealingOrchestrator");
 const HealEtalonService_1 = require("../../src/services/healing/HealEtalonService");
 const HealedLocatorGenerator_1 = require("../../src/services/healing/HealedLocatorGenerator");
 const types_1 = require("../../src/services/healing/types");
+const container_registration_1 = require("../helpers/container-registration");
 // §2.7 healing-tier capability gate: xe:options.healingTiers restricts which
 // self-healing providers may be dispatched. Tier index mapping used by the gate
 // (array-position based, NOT the internal HealingTier enum): 1=Resilio,
@@ -104,8 +106,9 @@ describe('HealingOrchestrator.attemptHealing allowedTiers dispatch gate', () =>
     let orchestrator;
     let mockEtalonService;
     const dispatched = [];
+    let restoreContainer;
     beforeEach(() => {
-        typedi_1.Container.reset();
+        restoreContainer = (0, container_registration_1.saveRegistrations)(HealEtalonService_1.HealEtalonService, HealedLocatorGenerator_1.HealedLocatorGenerator);
         dispatched.length = 0;
         mockEtalonService = {
             getSignature: () => __awaiter(void 0, void 0, void 0, function* () { return null; }),
@@ -123,6 +126,7 @@ describe('HealingOrchestrator.attemptHealing allowedTiers dispatch gate', () =>
             });
         });
     });
+    afterEach(() => restoreContainer());
     const mockDriver = {
         getPageSource: () => __awaiter(void 0, void 0, void 0, function* () { return '<xml/>'; }),
         getScreenshot: () => __awaiter(void 0, void 0, void 0, function* () { return 'fake-screenshot'; }),

package/lib/test/unit/health-monitor-own-phones.spec.js

@@ -0,0 +1,102 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
+const chai_1 = require("chai");
+const sinon_1 = __importDefault(require("sinon"));
+const typedi_1 = require("typedi");
+const HealthMonitorService_1 = require("../../src/device-managers/HealthMonitorService");
+const device_managers_1 = require("../../src/device-managers");
+const device_store_1 = require("../../src/data-service/device-store");
+const PluginContext_1 = require("../../src/PluginContext");
+const IPluginArgs_1 = require("../../src/interfaces/IPluginArgs");
+const SessionManager_1 = require("../../src/sessions/SessionManager");
+const container_registration_1 = require("../helpers/container-registration");
+/**
+ * A hub keeps its nodes' phones in its own Device table. Its health monitor
+ * ran adb (or go-ios) health checks on every row, so it checked node phones it
+ * cannot reach from its own machine: each came back unhealthy, the hub wrote
+ * that over the node's report, started a "recovery" with its own adb, and
+ * reclaimed a busy node phone whose session it didn't hold in memory. Only
+ * this server's own phones are checked (isOwnDevice: by nodeId, else by exact
+ * host).
+ */
+// Named like the real manager: the monitor picks one by constructor.name.
+class AndroidDeviceManager {
+    constructor() {
+        this.checked = [];
+        this.checkHealth = (device) => __awaiter(this, void 0, void 0, function* () {
+            this.checked.push(device.udid);
+            return { healthStatus: 'Healthy' };
+        });
+    }
+}
+describe('HealthMonitorService checks only this server’s own phones', () => {
+    const HUB_NODE_ID = 'hub-node-id';
+    const HUB_HOST = 'http://10.0.0.1:4799';
+    let manager;
+    let updateDevice;
+    let context;
+    let saved;
+    let restore;
+    const devices = [
+        // Found by this hub's own discovery.
+        { udid: 'hub-phone', host: HUB_HOST, nodeId: HUB_NODE_ID },
+        // A node's, reported over /register with the node's id.
+        { udid: 'node-phone', host: 'http://10.0.0.2:4725', nodeId: 'node-peer' },
+        // A node's on the same machine, differing only by port.
+        { udid: 'same-machine-node-phone', host: 'http://10.0.0.1:4725', nodeId: 'node-2' },
+        // A node's busy phone, its session not in this hub's memory.
+        {
+            udid: 'busy-node-phone',
+            host: 'http://10.0.0.2:4725',
+            nodeId: 'node-peer',
+            busy: true,
+            session_id: 'node-session',
+        },
+        // A row from before nodeId, known by its host alone.
+        { udid: 'legacy-hub-phone', host: HUB_HOST, nodeId: null },
+        { udid: 'legacy-node-phone', host: 'http://10.0.0.3:4725', nodeId: null },
+    ].map((d) => (Object.assign({ platform: 'android', busy: false, cloud: null }, d)));
+    beforeEach(() => {
+        sinon_1.default.stub(process, 'kill');
+        manager = new AndroidDeviceManager();
+        restore = (0, container_registration_1.saveRegistrations)(device_managers_1.XenonManager);
+        typedi_1.Container.set(device_managers_1.XenonManager, { deviceInstances: () => __awaiter(void 0, void 0, void 0, function* () { return [manager]; }) });
+        updateDevice = sinon_1.default.spy(() => __awaiter(void 0, void 0, void 0, function* () { return undefined; }));
+        sinon_1.default.stub(device_store_1.DeviceStoreFactory, 'getStore').returns({
+            getAllDevices: () => __awaiter(void 0, void 0, void 0, function* () { return devices; }),
+            updateDevice,
+        });
+        sinon_1.default.stub(SessionManager_1.SESSION_MANAGER, 'isValidSession').returns(false);
+        context = typedi_1.Container.get(PluginContext_1.PluginContext);
+        saved = Object.assign({}, context);
+        context.setContext(Object.assign(Object.assign({}, IPluginArgs_1.DefaultPluginArgs), { bindHostOrIp: '10.0.0.1' }), 4799, HUB_NODE_ID, '');
+    });
+    afterEach(() => {
+        Object.assign(context, saved);
+        sinon_1.default.restore();
+        restore();
+    });
+    const run = () => new HealthMonitorService_1.HealthMonitorService({}).checkAllDevices();
+    it('checks the hub’s own phones and none of its nodes’', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield run();
+        (0, chai_1.expect)(manager.checked.sort()).to.deep.equal(['hub-phone', 'legacy-hub-phone']);
+    }));
+    it('never writes to a node’s phone, nor reclaims a busy one', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield run();
+        const written = updateDevice.getCalls().map((c) => c.args[0]);
+        (0, chai_1.expect)(written.sort()).to.deep.equal(['hub-phone', 'legacy-hub-phone']);
+    }));
+});