@trillboards/edge-sdk 0.2.211 → 0.2.213
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/deploy/windows/ci/test-alert-window-field.ps1 +252 -0
- package/dist/AlertClips.d.ts +131 -0
- package/dist/AlertClips.d.ts.map +1 -0
- package/dist/AlertClips.js +476 -0
- package/dist/AlertClips.js.map +1 -0
- package/dist/ConnectorStatusClient.d.ts +10 -0
- package/dist/ConnectorStatusClient.d.ts.map +1 -1
- package/dist/ConnectorStatusClient.js +11 -1
- package/dist/ConnectorStatusClient.js.map +1 -1
- package/dist/EdgeAgent.js +1 -1
- package/dist/LocalVideoBuffer.d.ts +59 -0
- package/dist/LocalVideoBuffer.d.ts.map +1 -0
- package/dist/LocalVideoBuffer.js +214 -0
- package/dist/LocalVideoBuffer.js.map +1 -0
- package/dist/SensingProfileClient.d.ts +62 -5
- package/dist/SensingProfileClient.d.ts.map +1 -1
- package/dist/SensingProfileClient.js +76 -1
- package/dist/SensingProfileClient.js.map +1 -1
- package/dist/VideoSegmentUploader.d.ts +169 -5
- package/dist/VideoSegmentUploader.d.ts.map +1 -1
- package/dist/VideoSegmentUploader.js +543 -32
- package/dist/VideoSegmentUploader.js.map +1 -1
- package/dist/autoSense.d.ts.map +1 -1
- package/dist/autoSense.js +4 -0
- package/dist/autoSense.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +3 -0
- package/dist/cli.js.map +1 -1
- package/dist/connectorUpdate.d.ts +9 -0
- package/dist/connectorUpdate.d.ts.map +1 -1
- package/dist/connectorUpdate.js +21 -2
- package/dist/connectorUpdate.js.map +1 -1
- package/dist/diagnose.d.ts +1 -1
- package/dist/diagnose.js +1 -1
- package/dist/localSenseE2eHarness.d.ts +1 -1
- package/dist/localSenseE2eHarness.d.ts.map +1 -1
- package/dist/localSenseE2eHarness.js +7 -4
- package/dist/localSenseE2eHarness.js.map +1 -1
- package/dist/localSensing.d.ts +58 -0
- package/dist/localSensing.d.ts.map +1 -1
- package/dist/localSensing.js +115 -10
- package/dist/localSensing.js.map +1 -1
- package/package.json +5 -5
- package/retained/__tests__/evidence-uploads.test.cjs +130 -0
- package/retained/manager.cjs +2 -0
- package/retained/website-api-capability.cjs +7 -1
|
@@ -0,0 +1,130 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
// Evidence-only uploads on the retained website path: a review withholds its
|
|
3
|
+
// photo only against an API that says it takes a review without one.
|
|
4
|
+
const { test } = require('node:test'), assert = require('node:assert/strict');
|
|
5
|
+
const fs = require('node:fs'), path = require('node:path'), http = require('node:http');
|
|
6
|
+
const release = path.join(__dirname, '..');
|
|
7
|
+
|
|
8
|
+
function capabilityServer(body) {
|
|
9
|
+
const server = http.createServer((req, res) => {
|
|
10
|
+
if (!req.url.startsWith('/v2/earner/cctv-retained/capabilities') || req.headers['x-device-token'] !== 'tok-cam') {
|
|
11
|
+
res.writeHead(403).end('{}');
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
res.setHeader('Content-Type', 'application/json');
|
|
15
|
+
res.end(JSON.stringify(body));
|
|
16
|
+
});
|
|
17
|
+
return new Promise(resolve => server.listen(0, '127.0.0.1', () => resolve(server)));
|
|
18
|
+
}
|
|
19
|
+
const capability = { retainedReview: true, protocolVersion: 1, lateEvidenceAccepted: true,
|
|
20
|
+
timedModes: ['any', 'wait_recheck'], cameraId: 'screen1', maxBodyBytes: 2 * 1024 * 1024 };
|
|
21
|
+
|
|
22
|
+
test('the capability check reports an API that takes a review without its photo, and only that', async () => {
|
|
23
|
+
const { checkRetainedApi } = require('../website-api-capability.cjs');
|
|
24
|
+
const feed = { name: 'cam', screenId: 'screen1', deviceToken: 'tok-cam' };
|
|
25
|
+
const optional = { optional: true, sampleIntervalMs: 600000, missingImageReason: 'evidence_image_required' };
|
|
26
|
+
for (const [served, expected] of [[{ ...capability, evidenceImage: optional }, true], [capability, undefined],
|
|
27
|
+
[{ ...capability, evidenceImage: { ...optional, optional: 'yes' } }, undefined],
|
|
28
|
+
[{ ...capability, evidenceImage: true }, undefined], [{ ...capability, imagelessReview: true }, undefined]]) {
|
|
29
|
+
const server = await capabilityServer(served);
|
|
30
|
+
try {
|
|
31
|
+
const result = await checkRetainedApi('http://127.0.0.1:' + server.address().port, feed);
|
|
32
|
+
assert.equal(result.cameraId, 'screen1');
|
|
33
|
+
assert.equal(result.imagelessReview, expected);
|
|
34
|
+
} finally {
|
|
35
|
+
await new Promise(resolve => server.close(resolve));
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
test('the website factory hands each feed its own API answer about image-less reviews', async () => {
|
|
41
|
+
const names = [path.join(release, '../dist/localSensing'), path.join(release, '../dist/CloudSensingManager'),
|
|
42
|
+
path.join(release, 'website-api-capability.cjs')];
|
|
43
|
+
const modules = names.map(name => { const key = require.resolve(name); require(key); return { key, prior: require.cache[key].exports }; });
|
|
44
|
+
const directory = fs.mkdtempSync(path.join(require('node:os').tmpdir(), 'retained-evidence-uploads-'));
|
|
45
|
+
let seen = null;
|
|
46
|
+
try {
|
|
47
|
+
require.cache[modules[0].key].exports = { buildLocalSensingLoops: (config, deps) => {
|
|
48
|
+
seen = deps;
|
|
49
|
+
return config.cameras.map(feed => ({ name: feed.name, client: {
|
|
50
|
+
prepareReview: async () => {}, captureReviewContext: () => ({ profileState: 'inactive' }),
|
|
51
|
+
getEndpoint: () => 'https://example.invalid/v2/earner/audience-analyze' } }));
|
|
52
|
+
} };
|
|
53
|
+
require.cache[modules[1].key].exports = { resolveFeeds: config => config.cameras,
|
|
54
|
+
CloudSensingManager: class {
|
|
55
|
+
constructor(options) { this.options = options; this.candidates = { offer: () => 'buffered', withdraw: () => 'absent' };
|
|
56
|
+
this.frameGroupers = new Map(options.loops.map(loop => [loop.name, {}])); }
|
|
57
|
+
} };
|
|
58
|
+
// camera1's API takes image-less reviews; camera2's predates them.
|
|
59
|
+
require.cache[modules[2].key].exports = { checkRetainedApi: async (_base, feed) => ({ cameraId: feed.screenId,
|
|
60
|
+
...(feed.name === 'camera1' ? { imagelessReview: true } : {}) }) };
|
|
61
|
+
delete require.cache[require.resolve(path.join(release, 'manager.cjs'))];
|
|
62
|
+
const { createWebsiteManager } = require(path.join(release, 'manager.cjs'));
|
|
63
|
+
const config = { apiBaseUrl: 'https://example.invalid', localSensing: { enabled: true, model: 'gemma' },
|
|
64
|
+
cameras: [{ name: 'camera1', screenId: 'screen1' }, { name: 'camera2', screenId: 'screen2' }],
|
|
65
|
+
pilot: { websiteManaged: true, requiresDetector: true, maxCapturesPerCamera: 100, maxBytesPerCamera: 100000 },
|
|
66
|
+
cloudSensing: { candidateBuffer: { continuousReview: { enabled: true, deliveryTarget: 'configured-api',
|
|
67
|
+
independentUploads: true, reviewWindowMs: 150000 } } } };
|
|
68
|
+
await createWebsiteManager(config, path.join(directory, 'state'));
|
|
69
|
+
assert.equal(typeof seen.imagelessReview, 'function');
|
|
70
|
+
assert.equal(seen.imagelessReview({ name: 'camera1' }), true);
|
|
71
|
+
assert.equal(seen.imagelessReview({ name: 'camera2' }), false);
|
|
72
|
+
assert.equal(seen.imagelessReview({ name: 'unknown' }), false);
|
|
73
|
+
} finally {
|
|
74
|
+
for (const module of modules) require.cache[module.key].exports = module.prior;
|
|
75
|
+
delete require.cache[require.resolve(path.join(release, 'manager.cjs'))];
|
|
76
|
+
fs.rmSync(directory, { recursive: true, force: true });
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
test('a feed in alert_windows mode cuts an alert window from its buffer and uploads it first, end to end on the built code', async () => {
|
|
81
|
+
const { CctvVideoRecorder, VideoSegmentUploader } = require(path.join(release, '../dist/VideoSegmentUploader'));
|
|
82
|
+
const { LocalVideoBuffer } = require(path.join(release, '../dist/LocalVideoBuffer'));
|
|
83
|
+
const { EventEmitter } = require('node:events');
|
|
84
|
+
const directory = fs.mkdtempSync(path.join(require('node:os').tmpdir(), 'retained-alert-window-'));
|
|
85
|
+
const calls = [];
|
|
86
|
+
try {
|
|
87
|
+
const provider = new EventEmitter();
|
|
88
|
+
provider.configs = [];
|
|
89
|
+
provider.setSegmentRecording = config => provider.configs.push(config);
|
|
90
|
+
provider.setSessionPriority = () => {};
|
|
91
|
+
const poster = async (url, _options, body) => {
|
|
92
|
+
const parsed = JSON.parse(body);
|
|
93
|
+
calls.push({ url, body: parsed });
|
|
94
|
+
if (url.endsWith('/video-segment-upload-url')) return { statusCode: 200, body: JSON.stringify({ uploadUrl: 'https://blob.example/x?sig=1' }) };
|
|
95
|
+
return { statusCode: 200, body: '{"indexed":true}' };
|
|
96
|
+
};
|
|
97
|
+
const uploader = new VideoSegmentUploader({ apiBaseUrl: 'https://api.example.com', deviceToken: 'tok', agentVersion: '0.2.210',
|
|
98
|
+
poster, putBlob: async () => ({ statusCode: 201, body: '' }), network: () => 'ethernet',
|
|
99
|
+
probe: () => ({ codec: 'h264', sampleEntry: 'avc1', width: 640, height: 360, frames: 300, durationMs: 30000, fps: 10,
|
|
100
|
+
videoBytes: 1000, hasAudio: false, audio: null }), log: () => {} });
|
|
101
|
+
const T = Date.now() - 120000;
|
|
102
|
+
const recorder = new CctvVideoRecorder({ provider, dir: path.join(directory, 'feed'), feedName: 'Register', uploader,
|
|
103
|
+
buffer: new LocalVideoBuffer({ volumeDir: directory, freeBytesFn: () => 1e9 }), log: () => {},
|
|
104
|
+
profileClient: { fetchProfile: async () => ({ video: { dailySeconds: 0, segmentSeconds: 60, ringSeconds: 3600,
|
|
105
|
+
mode: 'alert_windows', alerting: true, alertWindow: { beforeSeconds: 15, afterSeconds: 15 },
|
|
106
|
+
alertClips: [{ alertId: 'a'.repeat(64), triggerId: 'a'.repeat(64), capturedAtMs: T, beforeSeconds: 15, afterSeconds: 15 }] } }) },
|
|
107
|
+
cutWindow: async o => {
|
|
108
|
+
fs.mkdirSync(o.outDir, { recursive: true });
|
|
109
|
+
const file = path.join(o.outDir, o.request.triggerId + '.mp4');
|
|
110
|
+
fs.writeFileSync(file, 'clip');
|
|
111
|
+
return { clip: { file, metaFile: file.replace(/\.mp4$/, '.json'), captureStartMs: T - 15000, captureEndMs: T + 15000, sourceSegments: 3 } };
|
|
112
|
+
} });
|
|
113
|
+
provider.emit('opening');
|
|
114
|
+
for (let i = 0; i < 20 && !calls.some(c => c.url.endsWith('/video-segment-finalize')); i++) {
|
|
115
|
+
await new Promise(resolve => setTimeout(resolve, 20));
|
|
116
|
+
if (i === 2) provider.emit('segment', { file: path.join(directory, 'x.mp4'), startSec: 0, endSec: 10, captureStartMs: T + 10000, captureEndMs: T + 20000 });
|
|
117
|
+
}
|
|
118
|
+
const finalize = calls.find(c => c.url.endsWith('/video-segment-finalize'));
|
|
119
|
+
assert.ok(finalize, 'the alert window was uploaded');
|
|
120
|
+
assert.equal(finalize.body.trigger_kind, 'event');
|
|
121
|
+
assert.equal(finalize.body.trigger_id, 'a'.repeat(64));
|
|
122
|
+
assert.equal(finalize.body.capture_end_ms - finalize.body.capture_start_ms, 30000);
|
|
123
|
+
// No continuous segment ever left the box.
|
|
124
|
+
assert.equal(calls.filter(c => c.url.endsWith('/video-segment-finalize') && c.body.trigger_kind !== 'event').length, 0);
|
|
125
|
+
assert.equal(provider.configs.at(-1).segmentSeconds, 10);
|
|
126
|
+
recorder.stop();
|
|
127
|
+
} finally {
|
|
128
|
+
fs.rmSync(directory, { recursive: true, force: true });
|
|
129
|
+
}
|
|
130
|
+
});
|
package/retained/manager.cjs
CHANGED
|
@@ -73,6 +73,8 @@ async function createWebsiteManager(input, stateDirectory, deps = {}) {
|
|
|
73
73
|
'Stage pipeline is an isolated two-feed mixed-review experiment');
|
|
74
74
|
const stages = pipeline ? new (require('./ModelStageScheduler.cjs').ModelStageScheduler)() : null;
|
|
75
75
|
const loops = buildLocalSensingLoops(config, { ...deps, websiteManagedProfiles: websiteManaged,
|
|
76
|
+
// The paired API takes a review without its photo (capabilities `evidenceImage.optional`).
|
|
77
|
+
imagelessReview: feed => capabilities.get(feed.name)?.imagelessReview === true,
|
|
76
78
|
profileClientFactory: deps.profileClientFactory ?? (feed => require('./pilot-profile-client.cjs').createPilotProfileClient(
|
|
77
79
|
{ apiBaseUrl: config.apiBaseUrl, deviceToken: feed.deviceToken, screenId: feed.screenId,
|
|
78
80
|
connectorModelGrantScreens:feeds.filter(candidate=>candidate.deviceToken&&candidate.screenId).map(candidate=>String(candidate.screenId)) },
|
|
@@ -87,8 +87,14 @@ function requestCapability(url, feed) {
|
|
|
87
87
|
// own review window in force.
|
|
88
88
|
const maxCaptureAgeMs = Number.isSafeInteger(body.maxCaptureAgeMs) && body.maxCaptureAgeMs >= 0
|
|
89
89
|
? body.maxCaptureAgeMs : undefined;
|
|
90
|
+
// An API that takes a review without its photo says so
|
|
91
|
+
// (`evidenceImage.optional`); an older one does not, and every
|
|
92
|
+
// review then keeps its photo.
|
|
93
|
+
const imageOptional = body.evidenceImage !== null && typeof body.evidenceImage === 'object'
|
|
94
|
+
&& body.evidenceImage.optional === true;
|
|
90
95
|
finish(null, { cameraId: body.cameraId, protocolVersion: 1,
|
|
91
|
-
...(maxCaptureAgeMs === undefined ? {} : { maxCaptureAgeMs })
|
|
96
|
+
...(maxCaptureAgeMs === undefined ? {} : { maxCaptureAgeMs }),
|
|
97
|
+
...(imageOptional ? { imagelessReview: true } : {}) });
|
|
92
98
|
} catch (error) { finish(failure(error.message, 'PILOT_CAPABILITY_CONTRACT')); }
|
|
93
99
|
});
|
|
94
100
|
});
|