@xenon-device-management/xenon 2.0.0 → 2.2.0

package/lib/test/unit/device-access-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 deviceAccessGuard_1 = require("../../src/middleware/deviceAccessGuard");
 const UDID = 'DEV-1';
 const ALICE = 'usr_alice';
@@ -66,19 +66,19 @@ function appWith(opts) {
 }
 describe('deviceAccessGuard', () => {
     it('lets the lock owner through', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: ALICE })).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: ALICE })).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(200);
         (0, chai_1.expect)(res.body.reached).to.equal(true);
     }));
     it('denies a foreign holder with 409 and names them', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB })).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB })).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(409);
         (0, chai_1.expect)(res.body.error).to.equal('device_held_by_another_user');
         (0, chai_1.expect)(res.body.message).to.contain('alice@example.com');
         (0, chai_1.expect)(res.body.holder).to.deep.equal({ userId: ALICE, name: 'alice@example.com' });
     }));
     it('never blocks a GET', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/screenshot`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/screenshot`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     // The clipboard is the one read that is credential-shaped: it routinely holds
@@ -88,26 +88,26 @@ describe('deviceAccessGuard', () => {
     // reading a stranger's clipboard, so it takes the ownership check despite
     // being a GET.
     it('blocks reading the clipboard of a device another user holds', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/clipboard`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/clipboard`);
         (0, chai_1.expect)(res.status).to.equal(409);
         (0, chai_1.expect)(res.body.error).to.equal('device_held_by_another_user');
         (0, chai_1.expect)(JSON.stringify(res.body)).to.not.contain('hunter2');
     }));
     it('lets the holder read their own clipboard', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: ALICE })).get(`/control/${UDID}/clipboard`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: ALICE })).get(`/control/${UDID}/clipboard`);
         (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
         (0, chai_1.expect)(res.body.content).to.equal('hunter2');
     }));
     it('lets an admin read the clipboard', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, scopes: 'admin' })).get(`/control/${UDID}/clipboard`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, scopes: 'admin' })).get(`/control/${UDID}/clipboard`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     it('allows the clipboard read when the device is free', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, busy: false })).get(`/control/${UDID}/clipboard`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, busy: false })).get(`/control/${UDID}/clipboard`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     it('blocks the clipboard of a device running another user’s Appium session', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, sessionId: 'appium-1', sessionOwner: ALICE })).get(`/control/${UDID}/clipboard`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, sessionId: 'appium-1', sessionOwner: ALICE })).get(`/control/${UDID}/clipboard`);
         (0, chai_1.expect)(res.status).to.equal(409);
         (0, chai_1.expect)(res.body.error).to.equal('device_in_use_by_session');
     }));
@@ -118,28 +118,28 @@ describe('deviceAccessGuard', () => {
     // made that check decorative, since a reader refused at the socket could GET
     // the identical bytes here.
     it('blocks reading the logs of a device another user holds', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/logs`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/logs`);
         (0, chai_1.expect)(res.status).to.equal(409);
         (0, chai_1.expect)(res.body.error).to.equal('device_held_by_another_user');
         (0, chai_1.expect)(JSON.stringify(res.body)).to.not.contain('SECRETLOGLINE');
     }));
     it('blocks the logs of a device running another user’s Appium session', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, sessionId: 'appium-1', sessionOwner: ALICE })).get(`/control/${UDID}/logs`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, sessionId: 'appium-1', sessionOwner: ALICE })).get(`/control/${UDID}/logs`);
         (0, chai_1.expect)(res.status).to.equal(409);
         (0, chai_1.expect)(res.body.error).to.equal('device_in_use_by_session');
         (0, chai_1.expect)(JSON.stringify(res.body)).to.not.contain('SECRETLOGLINE');
     }));
     it('lets the holder read their own logs', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: ALICE })).get(`/control/${UDID}/logs`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: ALICE })).get(`/control/${UDID}/logs`);
         (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
         (0, chai_1.expect)(res.body.logs[0]).to.contain('SECRETLOGLINE');
     }));
     it('lets an admin read the logs', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, scopes: 'admin' })).get(`/control/${UDID}/logs`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, scopes: 'admin' })).get(`/control/${UDID}/logs`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     it('allows the logs read when the device is free', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, busy: false })).get(`/control/${UDID}/logs`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, busy: false })).get(`/control/${UDID}/logs`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     // Deliberately NOT extended to the other reads: screenshot and the MJPEG
@@ -147,39 +147,39 @@ describe('deviceAccessGuard', () => {
     // decision for this guard was mutations-only. Clipboard and logs are the
     // documented exceptions, so this pins the boundary.
     it('does not extend the ownership check to other reads', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/screenshot`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB })).get(`/control/${UDID}/screenshot`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     it('skips stream/start, stream/stop, stream/leave and stream/ticket', () => __awaiter(void 0, void 0, void 0, function* () {
         const app = appWith({ actorUserId: BOB });
         for (const p of ['stream/start', 'stream/stop', 'stream/leave', 'stream/ticket']) {
-            const res = yield (0, supertest_1.default)(app).post(`/control/${UDID}/${p}`);
+            const res = yield (0, loopbackRequest_1.default)(app).post(`/control/${UDID}/${p}`);
             (0, chai_1.expect)(res.status, p).to.equal(200);
         }
     }));
     it('lets an admin-scoped key through', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, scopes: 'admin' })).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, scopes: 'admin' })).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     it('lets a SUPER_ADMIN through', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, role: 'SUPER_ADMIN' })).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, role: 'SUPER_ADMIN' })).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     it('does not treat a scope merely containing "admin" as admin', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, scopes: 'nonadmin,devices' })).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, scopes: 'nonadmin,devices' })).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(409);
     }));
     it('401s when there is no actor', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({})).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({})).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(401);
     }));
     it('denies a foreign Appium session', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB, sessionId: 'appium-1', sessionOwner: ALICE })).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB, sessionId: 'appium-1', sessionOwner: ALICE })).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(409);
         (0, chai_1.expect)(res.body.error).to.equal('device_in_use_by_session');
     }));
     it('allows the owner of the running Appium session', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: ALICE, sessionId: 'appium-1', sessionOwner: ALICE })).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: ALICE, sessionId: 'appium-1', sessionOwner: ALICE })).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(200);
     }));
     it('falls through to the handler when the device is unknown', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -198,7 +198,7 @@ describe('deviceAccessGuard', () => {
         router.use((0, deviceAccessGuard_1.deviceAccessGuard)({ findDevice: () => __awaiter(void 0, void 0, void 0, function* () { return null; }) }));
         router.post('/:udid/tap', (_req, res) => res.status(404).send('Device not found'));
         app.use('/control', router);
-        const res = yield (0, supertest_1.default)(app).post(`/control/${UDID}/tap`);
+        const res = yield (0, loopbackRequest_1.default)(app).post(`/control/${UDID}/tap`);
         (0, chai_1.expect)(res.status).to.equal(404);
     }));
     it('responds instead of hanging on a malformed-percent udid', function () {
@@ -209,13 +209,13 @@ describe('deviceAccessGuard', () => {
             // this test's timeout well under the file default so a regression fails
             // fast instead of silently eating the full 60s.
             this.timeout(5000);
-            const res = yield (0, supertest_1.default)(appWith({ actorUserId: ALICE })).post('/control/100%/tap');
+            const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: ALICE })).post('/control/100%/tap');
             (0, chai_1.expect)(res.status).to.equal(400);
             (0, chai_1.expect)(res.body.success).to.equal(false);
         });
     });
     it('fails closed with 503 when the device lookup throws, never reaching the handler', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({
+        const res = yield (0, loopbackRequest_1.default)(appWith({
             actorUserId: ALICE,
             findDeviceImpl: () => __awaiter(void 0, void 0, void 0, function* () {
                 throw new Error('store hiccup');
@@ -230,7 +230,7 @@ describe('deviceAccessGuard', () => {
         (0, chai_1.expect)(res.body.reached).to.equal(undefined);
     }));
     it('fails closed with 503 when resolveSessionOwner throws, never reaching the handler', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({
+        const res = yield (0, loopbackRequest_1.default)(appWith({
             actorUserId: BOB,
             sessionId: 'appium-1',
             resolveSessionOwnerImpl: () => __awaiter(void 0, void 0, void 0, function* () {
@@ -242,7 +242,7 @@ describe('deviceAccessGuard', () => {
         (0, chai_1.expect)(res.body.reached).to.equal(undefined);
     }));
     it('still denies with 409 (no holder name) when describeHolder throws', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({
+        const res = yield (0, loopbackRequest_1.default)(appWith({
             actorUserId: BOB,
             describeHolderImpl: () => __awaiter(void 0, void 0, void 0, function* () {
                 throw new Error('lookup hiccup');
@@ -256,8 +256,46 @@ describe('deviceAccessGuard', () => {
         (0, chai_1.expect)(res.body.holder.name).to.equal(undefined);
     }));
     it('skips a mixed-case allowlisted action like Stream/Start', () => __awaiter(void 0, void 0, void 0, function* () {
-        const res = yield (0, supertest_1.default)(appWith({ actorUserId: BOB })).post(`/control/${UDID}/Stream/Start`);
+        const res = yield (0, loopbackRequest_1.default)(appWith({ actorUserId: BOB })).post(`/control/${UDID}/Stream/Start`);
         (0, chai_1.expect)(res.status).to.equal(200);
         (0, chai_1.expect)(res.body.reached).to.equal(true);
     }));
 });
+/**
+ * On a hub, a node's phone is busy when its node reports it busy (nodeBusy):
+ * a preview the node holds, say. The hub has no holder on record for that:
+ * no session and no hold of its own. Failing closed on "busy, owner unknown"
+ * refused every non-admin, the preview's own holder included, so the hub
+ * leaves that decision to the node, whose own guard knows the holder and
+ * judges every call the hub forwards. What the hub holds itself (a claim, a
+ * session, a hold) it still judges.
+ */
+describe('deviceAccessGuard on a node’s phone', () => {
+    const nodePhone = (row) => appWith({ actorUserId: BOB, findDeviceImpl: () => __awaiter(void 0, void 0, void 0, function* () { return row; }), sessionOwner: ALICE });
+    it('leaves a phone busy only by its node’s report to the node', () => __awaiter(void 0, void 0, void 0, function* () {
+        const app = nodePhone({ busy: true, nodeBusy: true, session_id: null });
+        const tap = yield (0, loopbackRequest_1.default)(app).post(`/control/${UDID}/tap`);
+        (0, chai_1.expect)(tap.status).to.equal(200);
+        (0, chai_1.expect)(tap.body.reached).to.equal(true);
+        const logs = yield (0, loopbackRequest_1.default)(app).get(`/control/${UDID}/logs`);
+        (0, chai_1.expect)(logs.status).to.equal(200);
+    }));
+    it('still judges a session this server routed to the node', () => __awaiter(void 0, void 0, void 0, function* () {
+        const tap = yield (0, loopbackRequest_1.default)(nodePhone({
+            busy: true,
+            nodeBusy: true,
+            session_id: 'appium-1',
+            claimSessionId: 'appium-1',
+        })).post(`/control/${UDID}/tap`);
+        (0, chai_1.expect)(tap.status).to.equal(409);
+        (0, chai_1.expect)(tap.body.error).to.equal('device_in_use_by_session');
+    }));
+    it('still refuses while this server’s own create for the phone is pending', () => __awaiter(void 0, void 0, void 0, function* () {
+        const tap = yield (0, loopbackRequest_1.default)(nodePhone({ busy: true, nodeBusy: true, session_id: null, claimedAt: 1790000000000 })).post(`/control/${UDID}/tap`);
+        (0, chai_1.expect)(tap.status).to.equal(409);
+    }));
+    it('still refuses this server’s own phone busy with no holder on record', () => __awaiter(void 0, void 0, void 0, function* () {
+        const tap = yield (0, loopbackRequest_1.default)(nodePhone({ busy: true, session_id: null })).post(`/control/${UDID}/tap`);
+        (0, chai_1.expect)(tap.status).to.equal(409);
+    }));
+});

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

@@ -25,7 +25,10 @@ const db_1 = require("../../src/data-service/db");
 const chai_1 = require("chai");
 const semver_1 = __importDefault(require("semver"));
 const test_container_1 = require("../helpers/test-container");
+const loki_stores_1 = require("../helpers/loki-stores");
 describe('Get device', () => {
+    // The in-memory store, also when this file runs on its own.
+    (0, loki_stores_1.useLokiStores)();
     before('Set devices in memory', () => __awaiter(void 0, void 0, void 0, function* () {
         var _a, e_1, _b, _c;
         yield (0, test_container_1.resetTestContainer)();
@@ -146,6 +149,7 @@ describe('Get device', () => {
             finally { if (e_1) throw e_1.error; }
         }
     }));
+    after(() => (0, test_container_1.resetTestContainer)());
     it('Get android device based on filter with minSDK', () => __awaiter(void 0, void 0, void 0, function* () {
         const filterOptions = {
             platform: 'android',

package/lib/test/unit/device-store-clear-at-boot.spec.js

@@ -0,0 +1,48 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+require("reflect-metadata");
+const chai_1 = require("chai");
+const device_store_1 = require("../../src/data-service/device-store");
+/**
+ * clearStorage(onlyHosts) on the in-memory (Loki) store, the one the unit
+ * suite runs: a hub starting up forgets its own phones and keeps its nodes'.
+ * The Prisma store's side is in session-recovery-routing.spec.ts.
+ */
+describe('LokiDeviceStore.clearStorage(onlyHosts)', () => {
+    const HUB = 'http://clear-at-boot-hub:4724';
+    const NODE = 'http://clear-at-boot-hub:4725';
+    let savedStore;
+    let store;
+    beforeEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        savedStore = device_store_1.DeviceStoreFactory._deviceStore;
+        device_store_1.DeviceStoreFactory._deviceStore = undefined;
+        const env = process.env.NODE_ENV;
+        process.env.NODE_ENV = 'test';
+        store = device_store_1.DeviceStoreFactory.getStore();
+        process.env.NODE_ENV = env;
+        (0, chai_1.expect)(store.constructor.name).to.equal('LokiDeviceStore');
+        yield store.addDevices([
+            { udid: 'clear-hub-phone', host: HUB, platform: 'android' },
+            { udid: 'clear-node-phone', host: NODE, platform: 'android' },
+        ]);
+    }));
+    afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
+        yield store.removeDevices({ udid: 'clear-hub-phone' });
+        yield store.removeDevices({ udid: 'clear-node-phone' });
+        device_store_1.DeviceStoreFactory._deviceStore = savedStore;
+    }));
+    it('deletes only the phones filed under the given hosts', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield store.clearStorage([HUB]);
+        (0, chai_1.expect)(yield store.findDevice({ udid: 'clear-hub-phone' })).to.equal(null);
+        (0, chai_1.expect)(yield store.findDevice({ udid: 'clear-node-phone' })).to.include({ host: NODE });
+    }));
+});

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',