@xenon-device-management/xenon 2.0.0 → 2.1.0

package/lib/test/unit/queue-team-scope-routes.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 sinon_1 = __importDefault(require("sinon"));
 const grid_1 = __importDefault(require("../../src/app/routers/grid"));
 const authMiddleware_1 = require("../../src/middleware/authMiddleware");
@@ -120,24 +120,24 @@ describe('the session queue is team-scoped: own teams + a count', () => {
     afterEach(() => sinon_1.default.restore());
     describe('a member in team A', () => {
         it("GET /queue shows the request for her team's phone and her teammate's, nothing else", () => __awaiter(void 0, void 0, void 0, function* () {
-            const r = yield (0, supertest_1.default)(alice()).get('/queue');
+            const r = yield (0, loopbackRequest_1.default)(alice()).get('/queue');
             (0, chai_1.expect)(r.status).to.equal(200);
             (0, chai_1.expect)(ids(r.body)).to.deep.equal(['targets-a', 'untargeted-a']);
             (0, chai_1.expect)(JSON.stringify(r.body)).to.not.include('bob-secret-release');
             (0, chai_1.expect)(JSON.stringify(r.body)).to.not.include('bob-targeted');
         }));
         it('GET /queue never returns who asked', () => __awaiter(void 0, void 0, void 0, function* () {
-            const r = yield (0, supertest_1.default)(alice()).get('/queue');
+            const r = yield (0, loopbackRequest_1.default)(alice()).get('/queue');
             for (const shown of r.body)
                 (0, chai_1.expect)(shown).to.not.have.property(REQUESTER);
         }));
         it('GET /queue/length is the whole queue, the number every caller gets', () => __awaiter(void 0, void 0, void 0, function* () {
-            const r = yield (0, supertest_1.default)(alice()).get('/queue/length');
+            const r = yield (0, loopbackRequest_1.default)(alice()).get('/queue/length');
             (0, chai_1.expect)(r.status).to.equal(200);
             (0, chai_1.expect)(r.body).to.equal(4);
         }));
         it('GET /queue/summary agrees with /queue/length, and counts what she cannot see', () => __awaiter(void 0, void 0, void 0, function* () {
-            const r = yield (0, supertest_1.default)(alice()).get('/queue/summary');
+            const r = yield (0, loopbackRequest_1.default)(alice()).get('/queue/summary');
             (0, chai_1.expect)(r.status).to.equal(200);
             (0, chai_1.expect)(r.body.total).to.equal(4);
             (0, chai_1.expect)(r.body.otherCount).to.equal(2);
@@ -145,17 +145,17 @@ describe('the session queue is team-scoped: own teams + a count', () => {
             (0, chai_1.expect)(byPlatform.reduce((n, p) => n + p.count, 0)).to.equal(4);
         }));
         it("GET /queue/status answers for another team's request exactly as for an unknown id", () => __awaiter(void 0, void 0, void 0, function* () {
-            const unknown = yield (0, supertest_1.default)(alice()).get('/queue/status/no-such-request');
+            const unknown = yield (0, loopbackRequest_1.default)(alice()).get('/queue/status/no-such-request');
             (0, chai_1.expect)(unknown.status).to.equal(404);
             for (const hidden of ['targets-b', 'untargeted-b']) {
-                const r = yield (0, supertest_1.default)(alice()).get(`/queue/status/${hidden}`);
+                const r = yield (0, loopbackRequest_1.default)(alice()).get(`/queue/status/${hidden}`);
                 (0, chai_1.expect)(r.status, hidden).to.equal(404);
                 (0, chai_1.expect)(r.body, hidden).to.deep.equal(unknown.body);
             }
         }));
         it('GET /queue/status still answers for the requests she can see', () => __awaiter(void 0, void 0, void 0, function* () {
             for (const shown of ['targets-a', 'untargeted-a']) {
-                const r = yield (0, supertest_1.default)(alice()).get(`/queue/status/${shown}`);
+                const r = yield (0, loopbackRequest_1.default)(alice()).get(`/queue/status/${shown}`);
                 (0, chai_1.expect)(r.status, shown).to.equal(200);
                 (0, chai_1.expect)(r.body.platform, shown).to.equal('android');
             }
@@ -163,25 +163,25 @@ describe('the session queue is team-scoped: own teams + a count', () => {
     });
     describe('an admin', () => {
         it('GET /queue shows all four', () => __awaiter(void 0, void 0, void 0, function* () {
-            const r = yield (0, supertest_1.default)(admin()).get('/queue');
+            const r = yield (0, loopbackRequest_1.default)(admin()).get('/queue');
             (0, chai_1.expect)(r.status).to.equal(200);
             (0, chai_1.expect)(ids(r.body)).to.deep.equal(['targets-a', 'targets-b', 'untargeted-a', 'untargeted-b']);
             for (const shown of r.body)
                 (0, chai_1.expect)(shown).to.not.have.property(REQUESTER);
         }));
         it('with no lookup of phones or teams', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield (0, supertest_1.default)(admin()).get('/queue');
+            yield (0, loopbackRequest_1.default)(admin()).get('/queue');
             (0, chai_1.expect)(prisma_1.prisma.device.findMany.called).to.equal(false);
             (0, chai_1.expect)(prisma_1.prisma.teamMember.findMany.called).to.equal(false);
         }));
         it('GET /queue/summary counts nothing as hidden', () => __awaiter(void 0, void 0, void 0, function* () {
-            const r = yield (0, supertest_1.default)(admin()).get('/queue/summary');
+            const r = yield (0, loopbackRequest_1.default)(admin()).get('/queue/summary');
             (0, chai_1.expect)(r.body.total).to.equal(4);
             (0, chai_1.expect)(r.body.otherCount).to.equal(0);
         }));
         it('GET /queue/length and /queue/status answer as before', () => __awaiter(void 0, void 0, void 0, function* () {
-            (0, chai_1.expect)((yield (0, supertest_1.default)(admin()).get('/queue/length')).body).to.equal(4);
-            const r = yield (0, supertest_1.default)(admin()).get('/queue/status/untargeted-b');
+            (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(admin()).get('/queue/length')).body).to.equal(4);
+            const r = yield (0, loopbackRequest_1.default)(admin()).get('/queue/status/untargeted-b');
             (0, chai_1.expect)(r.status).to.equal(200);
         }));
     });
@@ -195,13 +195,14 @@ describe('the session queue is team-scoped: own teams + a count', () => {
             ['an admin', admin],
         ]) {
             it(`are never returned to ${who}`, () => __awaiter(void 0, void 0, void 0, function* () {
-                const r = yield (0, supertest_1.default)(caller()).get('/queue');
+                const r = yield (0, loopbackRequest_1.default)(caller()).get('/queue');
                 const shown = r.body.find((x) => x.capability_id === 'untargeted-a');
                 (0, chai_1.expect)(shown, 'the request itself is shown').to.not.equal(undefined);
                 (0, chai_1.expect)(JSON.stringify(r.body)).to.not.include('amy-api-token');
                 (0, chai_1.expect)(JSON.stringify(r.body)).to.not.include('amy.session.jwt');
-                // What isn't a secret still reads as before.
-                (0, chai_1.expect)(shown['xe:options'].accessKey).to.equal('ak_amy');
+                // Nor the access key: half of the pair, and it names Amy's key.
+                (0, chai_1.expect)(JSON.stringify(r.body)).to.not.include('ak_amy');
+                // What isn't a credential still reads as before.
                 (0, chai_1.expect)(shown['xenon:options'].sessionName).to.equal('amy-login');
             }));
         }

package/lib/test/unit/queue-visibility.spec.js

@@ -102,7 +102,7 @@ describe('queue visibility', () => {
             (0, chai_1.expect)(yield seen([untargeted, targeted], alice)).to.deep.equal([false, false]);
         }));
         it('a credential narrowed to her team, whatever teams its user is in', () => __awaiter(void 0, void 0, void 0, function* () {
-            // A team-bound key, a session token's teamId claim, or xenon:team.
+            // A team-bound key, a session token's teamId claim, or xe:options.team.
             (0, chai_1.expect)(yield seen([req({ userId: 'bob', teamId: 'team-a' })], alice)).to.deep.equal([true]);
         }));
         it("not a teammate's request narrowed to another team", () => __awaiter(void 0, void 0, void 0, function* () {

package/lib/test/unit/recording-downloads-visibility.spec.js

@@ -49,7 +49,7 @@ require("reflect-metadata");
 const chai_1 = require("chai");
 const sinon_1 = __importDefault(require("sinon"));
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
@@ -104,7 +104,7 @@ function binary(res, cb) {
 }
 function get(caller_1, url_1) {
     return __awaiter(this, arguments, void 0, function* (caller, url, headers = {}) {
-        let req = (0, supertest_1.default)(buildApp(caller)).get(`/xenon/api/recordings/${GROUP}/${url}`);
+        let req = (0, loopbackRequest_1.default)(buildApp(caller)).get(`/xenon/api/recordings/${GROUP}/${url}`);
         for (const [k, v] of Object.entries(headers))
             req = req.set(k, v);
         const res = yield req.buffer(true).parse(binary);

package/lib/test/unit/recording-instrumentation.spec.js

@@ -21,6 +21,7 @@ const path_1 = __importDefault(require("path"));
 const api_1 = require("@opentelemetry/api");
 const attributes_1 = require("../../src/services/telemetry/attributes");
 const artifact_store_1 = require("../helpers/artifact-store");
+const loki_stores_1 = require("../helpers/loki-stores");
 // Stub metrics + trace BEFORE the module loads so the module-level
 // ensureOtelInstruments() picks up our mocks. Inline import after stubbing.
 function makeMockMeter() {
@@ -56,6 +57,10 @@ function makeMockSpan() {
     };
 }
 describe('RecordingOrchestrator instrumentation', () => {
+    // The in-memory stores, also when this file runs on its own: without
+    // NODE_ENV=test the factory handed out the Prisma stores, which are the
+    // developer's ~/.cache/xenon/xenon.db.
+    (0, loki_stores_1.useLokiStores)();
     // RecordingOrchestrator resolves ARTIFACT_STORE from the container at runtime.
     (0, artifact_store_1.useArtifactStore)();
     let getMeterStub;

package/lib/test/unit/recording-source-ended.spec.js

@@ -21,6 +21,7 @@ const path_1 = __importDefault(require("path"));
 const RecordingOrchestrator_1 = require("../../src/services/recording/RecordingOrchestrator");
 const concurrency_gate_1 = require("../../src/services/recording/concurrency-gate");
 const artifact_store_1 = require("../helpers/artifact-store");
+const loki_stores_1 = require("../helpers/loki-stores");
 // Issue #203. When the ffmpeg process for a recording exits on its own nothing
 // told the orchestrator, so the row sat at RECORDING — no ended_at, no duration,
 // no size — until a human clicked Stop. Observed live during the #200 cable-pull
@@ -69,6 +70,10 @@ function makeOrch(row, overrides = {}) {
     return { orch, store, gate, videoPipeline, eventMgr, unblockDeviceFn, probeDurationMsFn };
 }
 describe('RecordingOrchestrator: ffmpeg exiting on its own', () => {
+    // The in-memory stores, also when this file runs on its own: without
+    // NODE_ENV=test the factory handed out the Prisma stores, which are the
+    // developer's ~/.cache/xenon/xenon.db.
+    (0, loki_stores_1.useLokiStores)();
     // compositeOutputPath and per-device paths resolve through ArtifactStore.
     (0, artifact_store_1.useArtifactStore)();
     afterEach(() => sinon_1.default.restore());

package/lib/test/unit/recording-store.spec.js

@@ -13,12 +13,18 @@ require("reflect-metadata");
 const chai_1 = require("chai");
 const recording_store_1 = require("../../src/services/recording/recording-store");
 const prisma_1 = require("../../src/prisma");
+const scratch_database_1 = require("../helpers/scratch-database");
 describe('RecordingStore (Prisma round-trip)', () => {
+    // Its own migrated database: the round trip wrote these rows to the
+    // developer's ~/.cache/xenon/xenon.db, and failed where it lacked the tables.
+    const scratch = (0, scratch_database_1.useScratchDatabase)();
     const store = new recording_store_1.RecordingStore();
+    // Through the scratch client itself: the helper's own afterEach, which
+    // runs first, has already put `prisma` back on the server's database.
     afterEach(() => __awaiter(void 0, void 0, void 0, function* () {
-        yield prisma_1.prisma.annotation.deleteMany({ where: { recording_id: { contains: 'test-' } } });
-        yield prisma_1.prisma.bookmark.deleteMany({ where: { recording_id: { contains: 'test-' } } });
-        yield prisma_1.prisma.recording.deleteMany({ where: { group_id: { startsWith: 'test-' } } });
+        yield scratch.db.annotation.deleteMany({ where: { recording_id: { contains: 'test-' } } });
+        yield scratch.db.bookmark.deleteMany({ where: { recording_id: { contains: 'test-' } } });
+        yield scratch.db.recording.deleteMany({ where: { group_id: { startsWith: 'test-' } } });
     }));
     it('creates a recording row with status=RECORDING', () => __awaiter(void 0, void 0, void 0, function* () {
         const rec = yield store.create({

package/lib/test/unit/recordings-library-routes.spec.js

@@ -49,7 +49,7 @@ require("reflect-metadata");
 const chai_1 = require("chai");
 const sinon_1 = __importDefault(require("sinon"));
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
@@ -198,7 +198,7 @@ describe('recordings library routes', () => {
                 rec({ id: 'b', group_id: 'g2', started_at: new Date(T0 + 1000) }),
                 rec({ id: 'c', group_id: 'g3', device_udid: 'HIDDEN', started_by: 'usr_carol' }),
             ];
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
             (0, chai_1.expect)(res.body.recordings.map((s) => s.groupId)).to.deep.equal(['g2', 'g1']);
             (0, chai_1.expect)(res.body.recordings[0].phones[0].name).to.equal('Galaxy S9+');
@@ -211,15 +211,15 @@ describe('recordings library routes', () => {
                 rec({ id: 'a', group_id: 'g1' }),
                 rec({ id: 'b', group_id: 'g2', device_udid: 'U2', started_at: new Date(T0 + 1000) }),
             ];
-            const one = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings?limit=1');
+            const one = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings?limit=1');
             (0, chai_1.expect)(one.body.recordings.map((s) => s.groupId)).to.deep.equal(['g2']);
-            const two = yield (0, supertest_1.default)(buildApp(alice)).get(`/xenon/api/recordings?limit=1&cursor=${encodeURIComponent(one.body.nextCursor)}`);
+            const two = yield (0, loopbackRequest_1.default)(buildApp(alice)).get(`/xenon/api/recordings?limit=1&cursor=${encodeURIComponent(one.body.nextCursor)}`);
             (0, chai_1.expect)(two.body.recordings.map((s) => s.groupId)).to.deep.equal(['g1']);
-            const byPhone = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings?udid=U2');
+            const byPhone = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings?udid=U2');
             (0, chai_1.expect)(byPhone.body.recordings.map((s) => s.groupId)).to.deep.equal(['g2']);
         }));
         it('answers 400 for a bad query', () => __awaiter(void 0, void 0, void 0, function* () {
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings?since=nope');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings?since=nope');
             (0, chai_1.expect)(res.status).to.equal(400);
             (0, chai_1.expect)(res.body.error).to.equal('since must be an ISO time');
         }));
@@ -238,7 +238,7 @@ describe('recordings library routes', () => {
                     started_at: new Date(now - 40 * 24 * 60 * 60 * 1000),
                 }),
             ];
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
             (0, chai_1.expect)(res.body.facets.phones).to.deep.equal([
                 { udid: 'U1', name: 'Galaxy S9+', count: 1 },
@@ -250,7 +250,7 @@ describe('recordings library routes', () => {
         }));
         it('names the synthetic user of an auth-disabled server "Auth disabled"', () => __awaiter(void 0, void 0, void 0, function* () {
             rows = [rec({ started_by: 'auth-disabled' })];
-            const res = yield (0, supertest_1.default)(buildApp(admin)).get('/xenon/api/recordings');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(admin)).get('/xenon/api/recordings');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
             (0, chai_1.expect)(res.body.recordings[0].startedBy).to.deep.equal({
                 id: 'auth-disabled',
@@ -266,7 +266,7 @@ describe('recordings library routes', () => {
             ctx.pluginArgs = Object.assign(Object.assign({}, original), { recordingCleanupDays: 7, recordingCleanupMaxCount: 20 });
             try {
                 rows = [rec()];
-                const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
+                const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
                 (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
                 (0, chai_1.expect)(res.body.retention).to.deep.equal({ days: 7, maxCount: 20 });
             }
@@ -296,7 +296,7 @@ describe('recordings library routes', () => {
                     ],
                 }),
             ];
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(res.status).to.equal(200);
             (0, chai_1.expect)(res.body.summary.groupId).to.equal('g1');
             (0, chai_1.expect)(res.body.recordings).to.have.length(1);
@@ -312,9 +312,9 @@ describe('recordings library routes', () => {
             });
         }));
         it('answers 404 for a group that does not exist or is not visible', () => __awaiter(void 0, void 0, void 0, function* () {
-            (0, chai_1.expect)((yield (0, supertest_1.default)(buildApp(admin)).get('/xenon/api/recordings/nope')).status).to.equal(404);
+            (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(buildApp(admin)).get('/xenon/api/recordings/nope')).status).to.equal(404);
             rows = [rec({ device_udid: 'HIDDEN' })];
-            (0, chai_1.expect)((yield (0, supertest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1')).status).to.equal(404);
+            (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1')).status).to.equal(404);
         }));
         it('sorts bookmarks and marks by timecode across every recording in the group', () => __awaiter(void 0, void 0, void 0, function* () {
             rows = [
@@ -357,7 +357,7 @@ describe('recordings library routes', () => {
                     ],
                 }),
             ];
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
             (0, chai_1.expect)(res.body.bookmarks.map((b) => b.id)).to.deep.equal(['b1', 'b2']);
             (0, chai_1.expect)(res.body.annotations.map((a) => a.id)).to.deep.equal(['a1', 'a2']);
@@ -388,8 +388,8 @@ describe('recordings library routes', () => {
         });
         /** hasComposite as the list, then the detail, reports it. */
         const reported = (who) => __awaiter(void 0, void 0, void 0, function* () {
-            const list = yield (0, supertest_1.default)(buildApp(who)).get('/xenon/api/recordings');
-            const detail = yield (0, supertest_1.default)(buildApp(who)).get('/xenon/api/recordings/g1');
+            const list = yield (0, loopbackRequest_1.default)(buildApp(who)).get('/xenon/api/recordings');
+            const detail = yield (0, loopbackRequest_1.default)(buildApp(who)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(list.status, JSON.stringify(list.body)).to.equal(200);
             (0, chai_1.expect)(detail.status, JSON.stringify(detail.body)).to.equal(200);
             return [list.body.recordings[0].hasComposite, detail.body.summary.hasComposite];
@@ -419,7 +419,7 @@ describe('recordings library routes', () => {
                 });
             });
             const enabled = (who) => __awaiter(void 0, void 0, void 0, function* () {
-                const res = yield (0, supertest_1.default)(buildApp(who)).get('/xenon/api/recordings/active');
+                const res = yield (0, loopbackRequest_1.default)(buildApp(who)).get('/xenon/api/recordings/active');
                 (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
                 return res.body.groups.map((g) => [g.groupId, g.compositeEnabled]);
             });
@@ -435,7 +435,7 @@ describe('recordings library routes', () => {
                 devices.set('U2', { name: 'Team B phone', platform: 'android' });
                 visible = new Set(['U1']);
                 rows = rows.map((r) => (Object.assign(Object.assign({}, r), { annotations: [{ id: `a-${r.id}`, t_ms: 1, kind: 'rect', color: '#f00', payload: '{}' }] })));
-                const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/active');
+                const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/active');
                 (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
                 const [group] = res.body.groups;
                 (0, chai_1.expect)(group.recordings.map((r) => r.udid)).to.deep.equal(['U1']);
@@ -452,14 +452,14 @@ describe('recordings library routes', () => {
                         });
                     }),
                 });
-                const res = yield (0, supertest_1.default)(buildApp(admin)).get('/xenon/api/recordings/active');
+                const res = yield (0, loopbackRequest_1.default)(buildApp(admin)).get('/xenon/api/recordings/active');
                 (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
                 (0, chai_1.expect)(res.body.groups[0].recordings.map((r) => r.udid)).to.deep.equal(['U1', 'U2']);
             }));
         });
     });
     describe('DELETE /recordings/:groupId', () => {
-        const del = (who) => (0, supertest_1.default)(buildApp(who)).delete('/xenon/api/recordings/g1');
+        const del = (who) => (0, loopbackRequest_1.default)(buildApp(who)).delete('/xenon/api/recordings/g1');
         it('lets the person who recorded it delete it: rows, then files', () => __awaiter(void 0, void 0, void 0, function* () {
             rows = [
                 rec(),
@@ -596,20 +596,20 @@ describe('recordings library routes', () => {
         const unplugged = (over = {}) => rec(Object.assign({ id: 'r2', device_udid: 'GONE', started_at: new Date(T0 + 500) }, over));
         it('still lists it, and opens it with every phone', () => __awaiter(void 0, void 0, void 0, function* () {
             rows = [rec({ group_id: 'gone', id: 'solo', device_udid: 'GONE' }), rec(), unplugged()];
-            const list = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
+            const list = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
             (0, chai_1.expect)(list.status, JSON.stringify(list.body)).to.equal(200);
             (0, chai_1.expect)(list.body.recordings.map((s) => s.groupId).sort()).to.deep.equal(['g1', 'gone']);
             const g1 = list.body.recordings.find((s) => s.groupId === 'g1');
             (0, chai_1.expect)(g1.phones.map((p) => p.udid)).to.deep.equal(['U1', 'GONE']);
-            const detail = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/gone');
+            const detail = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/gone');
             (0, chai_1.expect)(detail.status, JSON.stringify(detail.body)).to.equal(200);
             (0, chai_1.expect)(detail.body.summary.phones.map((p) => p.udid)).to.deep.equal(['GONE']);
-            const both = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
+            const both = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(both.body.summary.phones.map((p) => p.udid)).to.deep.equal(['U1', 'GONE']);
         }));
         it('can still delete it', () => __awaiter(void 0, void 0, void 0, function* () {
             rows = [rec({ device_udid: 'GONE' })];
-            const res = yield (0, supertest_1.default)(buildApp(alice)).delete('/xenon/api/recordings/g1');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).delete('/xenon/api/recordings/g1');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(204);
             (0, chai_1.expect)(store.deleteGroupRows.calledOnceWith('g1')).to.equal(true);
         }));
@@ -617,7 +617,7 @@ describe('recordings library routes', () => {
             const file = path.join(dir, 'r2.mp4');
             fs.writeFileSync(file, 'x');
             rows = [rec(), unplugged({ file_path: file })];
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r2');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r2');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
         }));
         it('is the person who started it, not someone who added a phone later', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -630,14 +630,14 @@ describe('recordings library routes', () => {
                 unplugged(),
                 rec({ id: 'r3', started_by: 'usr_bob', started_at: new Date(T0 + 900) }),
             ];
-            const asAlice = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
+            const asAlice = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(asAlice.body.summary.phones.map((p) => p.recordingId).sort()).to.deep.equal([
                 'r0',
                 'r2',
                 'r3',
                 'rn',
             ]);
-            const asBob = yield (0, supertest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1');
+            const asBob = yield (0, loopbackRequest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(asBob.body.summary.phones.map((p) => p.recordingId).sort()).to.deep.equal([
                 'r0',
                 'r3',
@@ -650,9 +650,9 @@ describe('recordings library routes', () => {
             const file = path.join(dir, 'r2.mp4');
             fs.writeFileSync(file, 'x');
             rows = [rec(), unplugged({ started_by: 'usr_bob', file_path: file })];
-            const detail = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
+            const detail = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(detail.body.summary.phones.map((p) => p.recordingId)).to.deep.equal(['r1']);
-            const src = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r2');
+            const src = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r2');
             (0, chai_1.expect)(src.status).to.equal(404);
         }));
         // The exemption is for a phone that is gone, not for one that moved to
@@ -662,13 +662,13 @@ describe('recordings library routes', () => {
             fs.writeFileSync(file, 'x');
             devices.set('OTHER', { name: 'Team B phone', platform: 'android' });
             rows = [rec(), rec({ id: 'r2', device_udid: 'OTHER', file_path: file })];
-            const list = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
+            const list = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings');
             (0, chai_1.expect)(list.status, JSON.stringify(list.body)).to.equal(200);
             (0, chai_1.expect)(list.body.recordings[0].phones.map((p) => p.udid)).to.deep.equal(['U1']);
-            const detail = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
+            const detail = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(detail.body.summary.phones.map((p) => p.udid)).to.deep.equal(['U1']);
             (0, chai_1.expect)(detail.body.recordings.map((r) => r.id)).to.deep.equal(['r1']);
-            const src = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r2');
+            const src = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r2');
             (0, chai_1.expect)(src.status).to.equal(404);
         }));
         // The Delete button shows for the group's owner. A member who only added
@@ -679,23 +679,23 @@ describe('recordings library routes', () => {
                 rec({ device_udid: 'HIDDEN' }),
                 rec({ id: 'r2', started_by: 'usr_bob', started_at: new Date(T0 + 500) }),
             ];
-            const list = yield (0, supertest_1.default)(buildApp(bob)).get('/xenon/api/recordings');
+            const list = yield (0, loopbackRequest_1.default)(buildApp(bob)).get('/xenon/api/recordings');
             (0, chai_1.expect)(list.body.recordings[0].phones.map((p) => p.recordingId)).to.deep.equal(['r2']);
             (0, chai_1.expect)(list.body.recordings[0].startedBy).to.deep.equal({ id: 'usr_alice', name: 'Alice' });
-            const detail = yield (0, supertest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1');
+            const detail = yield (0, loopbackRequest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1');
             (0, chai_1.expect)(detail.body.summary.startedBy).to.deep.equal({ id: 'usr_alice', name: 'Alice' });
-            (0, chai_1.expect)((yield (0, supertest_1.default)(buildApp(bob)).delete('/xenon/api/recordings/g1')).status).to.equal(403);
+            (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(buildApp(bob)).delete('/xenon/api/recordings/g1')).status).to.equal(403);
         }));
         it('does not open it to another member: 404 everywhere', () => __awaiter(void 0, void 0, void 0, function* () {
             const file = path.join(dir, 'r1.mp4');
             fs.writeFileSync(file, 'x');
             rows = [rec({ device_udid: 'GONE', file_path: file })];
-            const list = yield (0, supertest_1.default)(buildApp(bob)).get('/xenon/api/recordings');
+            const list = yield (0, loopbackRequest_1.default)(buildApp(bob)).get('/xenon/api/recordings');
             (0, chai_1.expect)(list.body.recordings).to.deep.equal([]);
-            (0, chai_1.expect)((yield (0, supertest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1')).status).to.equal(404);
-            (0, chai_1.expect)((yield (0, supertest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r1'))
+            (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1')).status).to.equal(404);
+            (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(buildApp(bob)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r1'))
                 .status).to.equal(404);
-            (0, chai_1.expect)((yield (0, supertest_1.default)(buildApp(bob)).delete('/xenon/api/recordings/g1')).status).to.equal(404);
+            (0, chai_1.expect)((yield (0, loopbackRequest_1.default)(buildApp(bob)).delete('/xenon/api/recordings/g1')).status).to.equal(404);
             (0, chai_1.expect)(store.deleteGroupRows.called).to.equal(false);
         }));
     });
@@ -738,7 +738,7 @@ describe('recordings library routes', () => {
                 { id: 'r-a', udid: 'U1', status: 'STOPPED', durationMs: 1000, sizeBytes: 10 },
                 { id: 'r-b', udid: 'U2', status: 'STOPPED', durationMs: 2000, sizeBytes: 20 },
             ]));
-            const res = yield (0, supertest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
             (0, chai_1.expect)(res.body.groupId).to.equal('g1');
             (0, chai_1.expect)(res.body.recordings.map((r) => r.id)).to.deep.equal(['r-a']);
@@ -752,7 +752,7 @@ describe('recordings library routes', () => {
                 { id: 'r-a', udid: 'U1', status: 'STOPPED' },
                 { id: 'r-b', udid: 'U2', status: 'STOPPED' },
             ]));
-            const res = yield (0, supertest_1.default)(buildApp(admin)).post('/xenon/api/recordings/g1/stop');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(admin)).post('/xenon/api/recordings/g1/stop');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
             (0, chai_1.expect)(res.body.recordings.map((r) => r.id).sort()).to.deep.equal(['r-a', 'r-b']);
         }));
@@ -773,7 +773,7 @@ describe('recordings library routes', () => {
                 { id: 'r-a', udid: 'U1', status: 'STOPPED' },
                 { id: 'r-b', udid: 'U2', status: 'STOPPED' },
             ]));
-            const res = yield (0, supertest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(200);
             (0, chai_1.expect)(res.body.recordings.map((r) => r.id).sort()).to.deep.equal(['r-a', 'r-b']);
         }));
@@ -786,21 +786,21 @@ describe('recordings library routes', () => {
                 { id: 'r-a', udid: 'U1', status: 'STOPPED' },
                 { id: 'r-b', udid: 'U2', status: 'STOPPED' },
             ]));
-            const res = yield (0, supertest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
             (0, chai_1.expect)(res.body.recordings.map((r) => r.id)).to.deep.equal(['r-a']);
         }));
         it('still 500s when the orchestrator throws, without ever filtering', () => __awaiter(void 0, void 0, void 0, function* () {
             twoTeamRows();
             visible = new Set(['U1']);
             stop.rejects(new Error('ffmpeg exploded'));
-            const res = yield (0, supertest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
             (0, chai_1.expect)(res.status).to.equal(500);
             (0, chai_1.expect)(res.body).to.deep.equal({ error: 'internal', message: 'ffmpeg exploded' });
         }));
         it('a group with no visible phones is not found, and is not stopped', () => __awaiter(void 0, void 0, void 0, function* () {
             twoTeamRows();
             visible = new Set(); // neither U1 nor U2 is on alice's team
-            const res = yield (0, supertest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).post('/xenon/api/recordings/g1/stop');
             (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(404);
             (0, chai_1.expect)(res.body).to.deep.equal({ error: 'not_found' });
             (0, chai_1.expect)(stop.called).to.equal(false);
@@ -820,7 +820,7 @@ describe('recordings library routes', () => {
             typedi_1.Container.set(annotation_render_1.AnnotationRenderService, { renderForRecording: render });
         });
         afterEach(() => restoreRender());
-        const get = (who, id) => (0, supertest_1.default)(buildApp(who))
+        const get = (who, id) => (0, loopbackRequest_1.default)(buildApp(who))
             .get(`/xenon/api/recordings/g1/exports/annotated.mp4?recordingId=${id}`)
             .buffer(true)
             .parse((r, cb) => {
@@ -865,7 +865,7 @@ describe('recordings library routes', () => {
             const file = path.join(dir, 'r1.mp4');
             fs.writeFileSync(file, Buffer.from('0123456789'));
             rows = [rec({ file_path: file })];
-            const res = yield (0, supertest_1.default)(buildApp(alice))
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice))
                 .get('/xenon/api/recordings/g1/source.mp4?recordingId=r1')
                 .set('Range', 'bytes=2-5')
                 .buffer(true)
@@ -891,7 +891,7 @@ describe('recordings library routes', () => {
                 rec({ file_path: visibleFile }),
                 rec({ id: 'r2', device_udid: 'GONE', file_path: file }),
             ];
-            const get = (who, id) => (0, supertest_1.default)(buildApp(who)).get(`/xenon/api/recordings/g1/source.mp4?recordingId=${id}`);
+            const get = (who, id) => (0, loopbackRequest_1.default)(buildApp(who)).get(`/xenon/api/recordings/g1/source.mp4?recordingId=${id}`);
             (0, chai_1.expect)((yield get(bob, 'r1')).status).to.equal(200);
             (0, chai_1.expect)(store.findVideo.calledWith('r1')).to.equal(true);
             (0, chai_1.expect)(store.listGroupStarts.called, 'a visible phone needs no owner').to.equal(false);
@@ -908,9 +908,9 @@ describe('recordings library routes', () => {
             fs.writeFileSync(file, Buffer.from('0123456789'));
             rows = [rec({ file_path: file })];
             const url = '/xenon/api/recordings/g1/source.mp4?recordingId=r1&download=1';
-            const fileEtag = (yield (0, supertest_1.default)(buildApp(alice)).get(url)).headers.etag;
+            const fileEtag = (yield (0, loopbackRequest_1.default)(buildApp(alice)).get(url)).headers.etag;
             (0, chai_1.expect)(fileEtag, "the file's own ETag").to.be.a('string');
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get(url).set('Range', 'bytes=9999-10000');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get(url).set('Range', 'bytes=9999-10000');
             (0, chai_1.expect)(res.status).to.equal(416);
             (0, chai_1.expect)(res.headers['content-type']).to.match(/^application\/json/);
             (0, chai_1.expect)(res.headers['content-range']).to.equal('bytes */10');
@@ -922,13 +922,13 @@ describe('recordings library routes', () => {
             const file = path.join(dir, 'r1.mp4');
             fs.writeFileSync(file, 'x');
             rows = [rec({ file_path: file })];
-            const res = yield (0, supertest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r1&download=1');
+            const res = yield (0, loopbackRequest_1.default)(buildApp(alice)).get('/xenon/api/recordings/g1/source.mp4?recordingId=r1&download=1');
             (0, chai_1.expect)(res.status).to.equal(200);
             (0, chai_1.expect)(res.headers['content-disposition']).to.match(/attachment; filename="U1\.mp4"/);
         }));
         it('answers 400 without a recording, and 404 for another group, an invisible phone or a missing file', () => __awaiter(void 0, void 0, void 0, function* () {
             rows = [rec(), rec({ id: 'rx', group_id: 'g2' }), rec({ id: 'rh', device_udid: 'HIDDEN' })];
-            const get = (q) => (0, supertest_1.default)(buildApp(bob)).get(`/xenon/api/recordings/g1/source.mp4${q}`);
+            const get = (q) => (0, loopbackRequest_1.default)(buildApp(bob)).get(`/xenon/api/recordings/g1/source.mp4${q}`);
             (0, chai_1.expect)((yield get('')).status).to.equal(400);
             (0, chai_1.expect)((yield get('?recordingId=rx')).status).to.equal(404);
             (0, chai_1.expect)((yield get('?recordingId=rh')).status).to.equal(404);

package/lib/test/unit/recordings-write-visibility.spec.js

@@ -49,7 +49,7 @@ require("reflect-metadata");
 const chai_1 = require("chai");
 const sinon_1 = __importDefault(require("sinon"));
 const express_1 = __importDefault(require("express"));
-const supertest_1 = __importDefault(require("supertest"));
+const loopbackRequest_1 = __importDefault(require("../helpers/loopbackRequest"));
 const typedi_1 = require("typedi");
 const recordings_1 = __importDefault(require("../../src/app/routers/recordings"));
 const RecordingOrchestrator_1 = require("../../src/services/recording/RecordingOrchestrator");
@@ -164,7 +164,7 @@ describe('recording write routes: team visibility', () => {
     const alice = { userId: 'usr_alice', teamIds: ['t1'] };
     const bob = { userId: 'usr_bob', teamIds: ['t1'] };
     const admin = { userId: 'usr_root', role: 'ADMIN' };
-    const post = (who, url, body = {}) => (0, supertest_1.default)(buildApp(who)).post(`/xenon/api/recordings${url}`).send(body);
+    const post = (who, url, body = {}) => (0, loopbackRequest_1.default)(buildApp(who)).post(`/xenon/api/recordings${url}`).send(body);
     const notFound = (res) => {
         (0, chai_1.expect)(res.status, JSON.stringify(res.body)).to.equal(404);
         (0, chai_1.expect)(res.body).to.deep.equal({ error: 'not_found' });