@trillboards/edge-sdk 0.2.264 → 0.2.265
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/dist/ConnectorStatusClient.d.ts +10 -0
- package/dist/ConnectorStatusClient.d.ts.map +1 -1
- package/dist/ConnectorStatusClient.js +9 -1
- package/dist/ConnectorStatusClient.js.map +1 -1
- package/dist/DurableVlmCandidateSpool.d.ts +39 -1
- package/dist/DurableVlmCandidateSpool.d.ts.map +1 -1
- package/dist/DurableVlmCandidateSpool.js +116 -23
- package/dist/DurableVlmCandidateSpool.js.map +1 -1
- package/dist/EdgeAgent.js +1 -1
- package/dist/connectorUpdate.d.ts +11 -0
- package/dist/connectorUpdate.d.ts.map +1 -1
- package/dist/connectorUpdate.js +42 -5
- package/dist/connectorUpdate.js.map +1 -1
- package/dist/diagnose.d.ts +1 -1
- package/dist/diagnose.js +1 -1
- package/dist/mainThreadStall.d.ts +91 -0
- package/dist/mainThreadStall.d.ts.map +1 -0
- package/dist/mainThreadStall.js +496 -0
- package/dist/mainThreadStall.js.map +1 -0
- package/dist/pipelineSwitches.d.ts +30 -1
- package/dist/pipelineSwitches.d.ts.map +1 -1
- package/dist/pipelineSwitches.js +33 -9
- package/dist/pipelineSwitches.js.map +1 -1
- package/dist/sensingRunMode.d.ts.map +1 -1
- package/dist/sensingRunMode.js +5 -0
- package/dist/sensingRunMode.js.map +1 -1
- package/package.json +1 -1
- package/retained/RetainedCaptureClient.cjs +19 -3
- package/retained/__tests__/archive-lifecycle.test.cjs +72 -0
- package/retained/__tests__/realtime-schedule.test.cjs +64 -2
- package/retained/__tests__/support/theft-builder.cjs +3 -2
- package/retained/manager.cjs +11 -1
|
@@ -5,6 +5,7 @@ import type { DetectorLauncherDecision } from './detectorLauncher';
|
|
|
5
5
|
import type { VideoBufferReport } from './VideoSegmentUploader';
|
|
6
6
|
import type { MainStreamReport } from './MainStreamRing';
|
|
7
7
|
import type { HostCpuReport } from './hostCpu';
|
|
8
|
+
import type { MainThreadMinutesReport } from './mainThreadStall';
|
|
8
9
|
import type { FaceCaptureReport } from './FaceWatchLane';
|
|
9
10
|
/**
|
|
10
11
|
* ConnectorStatusClient — tell the server which connector version this install
|
|
@@ -213,6 +214,13 @@ export interface ConnectorStatusReport {
|
|
|
213
214
|
* explicitly below. Omitted for a feed with no face lane.
|
|
214
215
|
*/
|
|
215
216
|
faceCapture?: FaceCaptureReport | null;
|
|
217
|
+
/**
|
|
218
|
+
* The box's main-thread minutes the server has not stored yet (`mainThreadStall.ts`: event-loop
|
|
219
|
+
* delay, fsync and other synchronous fs call times, heap, per minute). A box fact carried by ONE
|
|
220
|
+
* accepted report per beacon round; the server answers `mainThread: {received, stored}` once it
|
|
221
|
+
* holds them, and only then are they dropped from the box. Copied explicitly below.
|
|
222
|
+
*/
|
|
223
|
+
mainThread?: MainThreadMinutesReport | null;
|
|
216
224
|
}
|
|
217
225
|
export interface ConnectorStatusResponse {
|
|
218
226
|
statusCode: number;
|
|
@@ -247,6 +255,8 @@ export declare function reportConnectorStatus(opts: {
|
|
|
247
255
|
report: ConnectorStatusReport;
|
|
248
256
|
/** What only this token's feed can say (its own `videoBuffer`, `mainStream` and `faceCapture`), merged over `report`. */
|
|
249
257
|
reportForToken?: (deviceToken: string) => Partial<ConnectorStatusReport> | null;
|
|
258
|
+
/** Called after each token's report with what was sent and the server's answer (never for a thrown send). */
|
|
259
|
+
onReport?: (deviceToken: string, sent: ConnectorStatusReport, res: ConnectorStatusResponse) => void;
|
|
250
260
|
timeoutMs?: number;
|
|
251
261
|
makeClient?: (deviceToken: string) => Pick<ConnectorStatusClient, 'report'>;
|
|
252
262
|
log?: (msg: string) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorStatusClient.d.ts","sourceRoot":"","sources":["../src/ConnectorStatusClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ConnectorStatusClient.d.ts","sourceRoot":"","sources":["../src/ConnectorStatusClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,6 +74,9 @@ class ConnectorStatusClient {
|
|
|
74
74
|
if (report.faceCapture && typeof report.faceCapture === 'object') {
|
|
75
75
|
payload.faceCapture = report.faceCapture;
|
|
76
76
|
}
|
|
77
|
+
if (report.mainThread && typeof report.mainThread === 'object') {
|
|
78
|
+
payload.mainThread = report.mainThread;
|
|
79
|
+
}
|
|
77
80
|
const headers = {
|
|
78
81
|
'Content-Type': 'application/json',
|
|
79
82
|
Accept: 'application/json',
|
|
@@ -129,7 +132,12 @@ async function reportConnectorStatus(opts) {
|
|
|
129
132
|
catch {
|
|
130
133
|
own = null;
|
|
131
134
|
}
|
|
132
|
-
const
|
|
135
|
+
const sent = own ? { ...opts.report, ...own } : opts.report;
|
|
136
|
+
const res = await client.report(sent);
|
|
137
|
+
try {
|
|
138
|
+
opts.onReport?.(deviceToken, sent, res);
|
|
139
|
+
}
|
|
140
|
+
catch { /* a listener never costs the next feed its report */ }
|
|
133
141
|
if (res.ok)
|
|
134
142
|
accepted += 1;
|
|
135
143
|
else
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConnectorStatusClient.js","sourceRoot":"","sources":["../src/ConnectorStatusClient.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ConnectorStatusClient.js","sourceRoot":"","sources":["../src/ConnectorStatusClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,25 @@ export interface DurableVlmCandidateSpoolOptions {
|
|
|
18
18
|
* The existing count/byte limits still apply; this does not enlarge the queue.
|
|
19
19
|
*/
|
|
20
20
|
preserveArchivedPending?: boolean;
|
|
21
|
+
/**
|
|
22
|
+
* Plan v7 W8 (CCTV_CAPTURE_ARCHIVE=lean), asked at every offer; requires
|
|
23
|
+
* `preserveArchivedPending`. While it answers true, an untouched queue copy of
|
|
24
|
+
* a capture archive original (a `retained_single_capture` with no answer and
|
|
25
|
+
* no urgent triage or follow-up) is held in memory, never written, until a
|
|
26
|
+
* review takes it or any of its metadata changes. The shadow profile-work plan
|
|
27
|
+
* every live look carries (the retained manager's frame grouping,
|
|
28
|
+
* `separateProfileWork`) does not stop it: the plan is written with the copy,
|
|
29
|
+
* and it is never another plan's grouping reference, because an archive copy's
|
|
30
|
+
* review context names its own capture, so no other look's context hash
|
|
31
|
+
* matches. The archive holds the original durably and offers it again after a
|
|
32
|
+
* restart, so a copy shed unreviewed (most of them: a newer capture supersedes
|
|
33
|
+
* it half a second later) never costs a flushed JPEG, a flushed record and
|
|
34
|
+
* their deletes.
|
|
35
|
+
* Copies still queued when the run stops are written then. Count and byte
|
|
36
|
+
* limits are unchanged; memory held is at most `heldMaxBytes`.
|
|
37
|
+
*/
|
|
38
|
+
holdArchivedCopies?: () => boolean;
|
|
39
|
+
heldMaxBytes?: number;
|
|
21
40
|
/** Default off. Continuous-review experiments only. */
|
|
22
41
|
priorityScheduling?: boolean;
|
|
23
42
|
/** Validated by the loopback manager. Does not change final field ownership. */
|
|
@@ -38,6 +57,10 @@ export interface DurableVlmCandidateSpoolStats extends VlmCandidateBufferStats {
|
|
|
38
57
|
reusePrepared: number;
|
|
39
58
|
/** Queued copies the capture archive retired unreviewed (superseded or too old). */
|
|
40
59
|
withdrawn: number;
|
|
60
|
+
/** Present only with `holdArchivedCopies`: copies held in memory now, ever, and left unwritten. */
|
|
61
|
+
held?: number;
|
|
62
|
+
heldOffers?: number;
|
|
63
|
+
heldUnwritten?: number;
|
|
41
64
|
}
|
|
42
65
|
/**
|
|
43
66
|
* Disk-backed hold for motion-positive frames waiting on the local VLM.
|
|
@@ -78,6 +101,12 @@ export declare class DurableVlmCandidateSpool {
|
|
|
78
101
|
private readonly recentAnswers;
|
|
79
102
|
private reusePrepared;
|
|
80
103
|
private readonly preserveArchivedPending;
|
|
104
|
+
private readonly holdArchivedCopies;
|
|
105
|
+
private readonly heldMaxBytes;
|
|
106
|
+
private readonly heldCopies;
|
|
107
|
+
private heldBytes;
|
|
108
|
+
private heldOffers;
|
|
109
|
+
private heldUnwritten;
|
|
81
110
|
private capacityRejected;
|
|
82
111
|
private readonly retryInitialMs;
|
|
83
112
|
private readonly retryMaxMs;
|
|
@@ -132,7 +161,7 @@ export declare class DurableVlmCandidateSpool {
|
|
|
132
161
|
/** Rehearsal output is never cachedAnalysis and cannot become a delivery job. */
|
|
133
162
|
checkpointProfileWork(candidate: VlmCandidate, result: ProfileWorkResult): void;
|
|
134
163
|
private resolveProfileWork;
|
|
135
|
-
/** Read-only test/audit surface; no reference is exposed before writePair commits. */
|
|
164
|
+
/** Read-only test/audit surface; no reference is exposed before writePair commits (a held copy has not). */
|
|
136
165
|
inspectProfileWork(name: string, capturedAtMs: number, sha256: string): {
|
|
137
166
|
evidenceId: string;
|
|
138
167
|
work: ProfileReviewWork;
|
|
@@ -238,6 +267,15 @@ export declare class DurableVlmCandidateSpool {
|
|
|
238
267
|
private coalesceEntry;
|
|
239
268
|
private removePersisted;
|
|
240
269
|
private deletePair;
|
|
270
|
+
/**
|
|
271
|
+
* holdArchivedCopies: an untouched, unanswered queue copy of an archive original. Its shadow
|
|
272
|
+
* profile-work plan does not count: the retained manager plans one for every live look.
|
|
273
|
+
*/
|
|
274
|
+
private holdsOffer;
|
|
275
|
+
/** Write one unwritten copy, record and JPEG, exactly as offer() would have; false leaves it unwritten. */
|
|
276
|
+
private writeHeld;
|
|
277
|
+
/** Write every unwritten copy still queued; one that cannot be written is re-offered by its archive. */
|
|
278
|
+
private writeHeldCopies;
|
|
241
279
|
private deletePairById;
|
|
242
280
|
private jpegPath;
|
|
243
281
|
private metadataPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DurableVlmCandidateSpool.d.ts","sourceRoot":"","sources":["../src/DurableVlmCandidateSpool.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EACV,YAAY,EACZ,uBAAuB,EAEvB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAI9B,OAAO,EAAwD,KAAK,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC9I,OAAO,EAAsE,KAAK,iBAAiB,EAAE,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"DurableVlmCandidateSpool.d.ts","sourceRoot":"","sources":["../src/DurableVlmCandidateSpool.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,9 @@ const DEFAULT_MAX_BYTES = 512 * 1024 * 1024;
|
|
|
52
52
|
const DEFAULT_RETENTION_MS = VlmCandidateBuffer_1.DEFAULT_CANDIDATE_TTL_MS;
|
|
53
53
|
const DEFAULT_RETRY_INITIAL_MS = 5000;
|
|
54
54
|
const DEFAULT_RETRY_MAX_MS = 5 * 60 * 1000;
|
|
55
|
+
// Unwritten archive copies held at once (holdArchivedCopies). A live camera holds one or
|
|
56
|
+
// two ~80 KB copies; past this, copies are written exactly as before.
|
|
57
|
+
const DEFAULT_HELD_MAX_BYTES = 32 * 1024 * 1024;
|
|
55
58
|
/**
|
|
56
59
|
* Disk-backed hold for motion-positive frames waiting on the local VLM.
|
|
57
60
|
*
|
|
@@ -81,6 +84,11 @@ class DurableVlmCandidateSpool {
|
|
|
81
84
|
// No JPEGs, no chained reuse, no persistence or TTL renewal for this cache.
|
|
82
85
|
this.recentAnswers = new Map();
|
|
83
86
|
this.reusePrepared = 0;
|
|
87
|
+
// Unwritten queue copies (see holdArchivedCopies): id -> a private copy of the JPEG.
|
|
88
|
+
this.heldCopies = new Map();
|
|
89
|
+
this.heldBytes = 0;
|
|
90
|
+
this.heldOffers = 0;
|
|
91
|
+
this.heldUnwritten = 0;
|
|
84
92
|
this.capacityRejected = 0;
|
|
85
93
|
this.feeds = new Map();
|
|
86
94
|
this.inFlight = new Map();
|
|
@@ -115,6 +123,11 @@ class DurableVlmCandidateSpool {
|
|
|
115
123
|
if (options.preserveArchivedPending && this.reviewWindowMs === null)
|
|
116
124
|
throw Error('Archived pending protection requires continuous review');
|
|
117
125
|
this.preserveArchivedPending = options.preserveArchivedPending === true;
|
|
126
|
+
if (options.holdArchivedCopies !== undefined && (typeof options.holdArchivedCopies !== 'function' || !this.preserveArchivedPending)) {
|
|
127
|
+
throw Error('Held archive copies require archived pending protection');
|
|
128
|
+
}
|
|
129
|
+
this.holdArchivedCopies = options.holdArchivedCopies ?? null;
|
|
130
|
+
this.heldMaxBytes = Math.max(0, Math.trunc(options.heldMaxBytes ?? DEFAULT_HELD_MAX_BYTES));
|
|
118
131
|
if (options.priorityScheduling && this.reviewWindowMs === null) {
|
|
119
132
|
throw Error('Priority scheduling requires continuous review');
|
|
120
133
|
}
|
|
@@ -144,6 +157,7 @@ class DurableVlmCandidateSpool {
|
|
|
144
157
|
/** Start a manager run without deleting evidence left by an earlier run. */
|
|
145
158
|
startRun() {
|
|
146
159
|
this.ensureDirectory();
|
|
160
|
+
this.writeHeldCopies();
|
|
147
161
|
this.clearQueuedState();
|
|
148
162
|
this.recover();
|
|
149
163
|
}
|
|
@@ -151,6 +165,9 @@ class DurableVlmCandidateSpool {
|
|
|
151
165
|
stopRun() {
|
|
152
166
|
// Files and queue metadata deliberately remain intact. An in-process
|
|
153
167
|
// completion may still settle after stop(); a process exit is recovered.
|
|
168
|
+
// Unwritten archive copies are written now, so a restart in this process
|
|
169
|
+
// finds every copy its capture archive still counts as queued.
|
|
170
|
+
this.writeHeldCopies();
|
|
154
171
|
}
|
|
155
172
|
offer(candidate, nowMs) {
|
|
156
173
|
const now = nowMs ?? this.now();
|
|
@@ -281,8 +298,15 @@ class DurableVlmCandidateSpool {
|
|
|
281
298
|
}
|
|
282
299
|
// Persist first. If the disk is unavailable, existing evidence remains
|
|
283
300
|
// untouched and the caller gets a counted rejection instead of a false
|
|
284
|
-
// claim that the event is durable.
|
|
285
|
-
|
|
301
|
+
// claim that the event is durable. An untouched copy of an archived
|
|
302
|
+
// original may wait in memory instead (holdArchivedCopies): its archive
|
|
303
|
+
// already holds it durably. It counts against every limit as if written.
|
|
304
|
+
if (this.holdsOffer(entry)) {
|
|
305
|
+
this.heldCopies.set(entry.id, Buffer.from(candidate.jpeg));
|
|
306
|
+
this.heldBytes += byteLength;
|
|
307
|
+
this.heldOffers++;
|
|
308
|
+
}
|
|
309
|
+
else if (!this.writePair(entry, candidate.jpeg)) {
|
|
286
310
|
feed.evicted++;
|
|
287
311
|
this.evicted++;
|
|
288
312
|
return 'rejected';
|
|
@@ -333,26 +357,39 @@ class DurableVlmCandidateSpool {
|
|
|
333
357
|
feed.items.splice(index, 1);
|
|
334
358
|
this.queued--;
|
|
335
359
|
let jpeg;
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
entry.jpegSha256 = actualSha256;
|
|
346
|
-
this.writeMetadata(entry);
|
|
360
|
+
const held = this.heldCopies.get(entry.id);
|
|
361
|
+
if (held) {
|
|
362
|
+
// Work under review is durable, as before: an unwritten copy is written
|
|
363
|
+
// as it is taken. Its bytes are the private copy made at offer.
|
|
364
|
+
if (!this.writeHeld(entry)) {
|
|
365
|
+
feed.evicted++;
|
|
366
|
+
this.evicted++;
|
|
367
|
+
this.removePersisted(entry);
|
|
368
|
+
continue;
|
|
347
369
|
}
|
|
370
|
+
jpeg = held;
|
|
348
371
|
}
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
372
|
+
else
|
|
373
|
+
try {
|
|
374
|
+
jpeg = fs.readFileSync(this.jpegPath(entry.id));
|
|
375
|
+
if (jpeg.length !== entry.byteLength)
|
|
376
|
+
throw new Error('length mismatch');
|
|
377
|
+
const actualSha256 = crypto.createHash('sha256').update(jpeg).digest('hex');
|
|
378
|
+
if (entry.jpegSha256 && entry.jpegSha256 !== actualSha256) {
|
|
379
|
+
throw new Error('SHA-256 mismatch');
|
|
380
|
+
}
|
|
381
|
+
if (!entry.jpegSha256) {
|
|
382
|
+
entry.jpegSha256 = actualSha256;
|
|
383
|
+
this.writeMetadata(entry);
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
catch {
|
|
387
|
+
this.readFailed++;
|
|
388
|
+
feed.evicted++;
|
|
389
|
+
this.evicted++;
|
|
390
|
+
this.removePersisted(entry);
|
|
391
|
+
continue;
|
|
392
|
+
}
|
|
356
393
|
this.inFlight.set(entry.id, entry);
|
|
357
394
|
feed.served++;
|
|
358
395
|
this.served++;
|
|
@@ -482,9 +519,9 @@ class DurableVlmCandidateSpool {
|
|
|
482
519
|
(0, ProfileReviewWork_1.promoteProfileDependencies)(work);
|
|
483
520
|
return Buffer.byteLength(JSON.stringify(work)) <= 32 * 1024 ? work : undefined;
|
|
484
521
|
}
|
|
485
|
-
/** Read-only test/audit surface; no reference is exposed before writePair commits. */
|
|
522
|
+
/** Read-only test/audit surface; no reference is exposed before writePair commits (a held copy has not). */
|
|
486
523
|
inspectProfileWork(name, capturedAtMs, sha256) {
|
|
487
|
-
const entry = [...(this.feeds.get(name)?.items ?? []), ...this.inFlight.values()].find(e => e.name === name && e.enqueuedAtMs === capturedAtMs && e.jpegSha256 === sha256 && e.profileWork);
|
|
524
|
+
const entry = [...(this.feeds.get(name)?.items ?? []), ...this.inFlight.values()].find(e => e.name === name && e.enqueuedAtMs === capturedAtMs && e.jpegSha256 === sha256 && e.profileWork && !this.heldCopies.has(e.id));
|
|
488
525
|
return entry ? { evidenceId: entry.id, work: JSON.parse(JSON.stringify(entry.profileWork)) } : null;
|
|
489
526
|
}
|
|
490
527
|
/** A raw archive ID names this receipt, not a different visual question.
|
|
@@ -852,6 +889,8 @@ class DurableVlmCandidateSpool {
|
|
|
852
889
|
deleteFailed: this.deleteFailed,
|
|
853
890
|
reusePrepared: this.reusePrepared,
|
|
854
891
|
withdrawn: this.withdrawn,
|
|
892
|
+
...(this.holdArchivedCopies ? { held: this.heldCopies.size, heldOffers: this.heldOffers,
|
|
893
|
+
heldUnwritten: this.heldUnwritten } : {}),
|
|
855
894
|
...(this.reviewWindowMs === null ? {} : {
|
|
856
895
|
reviewWindowMs: this.reviewWindowMs,
|
|
857
896
|
workload: { version: 1, sampledAtMs: now,
|
|
@@ -887,7 +926,7 @@ class DurableVlmCandidateSpool {
|
|
|
887
926
|
return null;
|
|
888
927
|
this.triageOrder.set(selected.name, ++this.triageTick);
|
|
889
928
|
// Corrupt/unreadable bytes are a visible error, never an advisory-negative deletion.
|
|
890
|
-
const jpeg = fs.readFileSync(this.jpegPath(selected.id));
|
|
929
|
+
const jpeg = this.heldCopies.get(selected.id) ?? fs.readFileSync(this.jpegPath(selected.id));
|
|
891
930
|
if (jpeg.length !== selected.byteLength || crypto.createHash('sha256').update(jpeg).digest('hex') !== selected.jpegSha256) {
|
|
892
931
|
throw Error('Urgent triage evidence hash mismatch');
|
|
893
932
|
}
|
|
@@ -956,6 +995,10 @@ class DurableVlmCandidateSpool {
|
|
|
956
995
|
this.deleteFailed = 0;
|
|
957
996
|
this.reusePrepared = 0;
|
|
958
997
|
this.withdrawn = 0;
|
|
998
|
+
this.heldCopies.clear();
|
|
999
|
+
this.heldBytes = 0;
|
|
1000
|
+
this.heldOffers = 0;
|
|
1001
|
+
this.heldUnwritten = 0;
|
|
959
1002
|
}
|
|
960
1003
|
ensureDirectory() {
|
|
961
1004
|
fs.mkdirSync(this.directory, { recursive: true, mode: 0o700 });
|
|
@@ -1103,6 +1146,9 @@ class DurableVlmCandidateSpool {
|
|
|
1103
1146
|
}
|
|
1104
1147
|
}
|
|
1105
1148
|
writeMetadata(entry) {
|
|
1149
|
+
// A copy is only held while untouched: a changed one is written whole.
|
|
1150
|
+
if (this.heldCopies.has(entry.id))
|
|
1151
|
+
return this.writeHeld(entry);
|
|
1106
1152
|
const metadataPath = this.metadataPath(entry.id);
|
|
1107
1153
|
const tmp = `${metadataPath}.tmp`;
|
|
1108
1154
|
try {
|
|
@@ -1356,8 +1402,55 @@ class DurableVlmCandidateSpool {
|
|
|
1356
1402
|
this.persistedBytes = Math.max(0, this.persistedBytes - this.entryBytes(entry));
|
|
1357
1403
|
}
|
|
1358
1404
|
deletePair(entry) {
|
|
1405
|
+
const held = this.heldCopies.get(entry.id);
|
|
1406
|
+
if (held) {
|
|
1407
|
+
this.heldCopies.delete(entry.id);
|
|
1408
|
+
this.heldBytes -= held.length;
|
|
1409
|
+
this.heldUnwritten++;
|
|
1410
|
+
return;
|
|
1411
|
+
}
|
|
1359
1412
|
this.deletePairById(entry.id);
|
|
1360
1413
|
}
|
|
1414
|
+
/**
|
|
1415
|
+
* holdArchivedCopies: an untouched, unanswered queue copy of an archive original. Its shadow
|
|
1416
|
+
* profile-work plan does not count: the retained manager plans one for every live look.
|
|
1417
|
+
*/
|
|
1418
|
+
holdsOffer(entry) {
|
|
1419
|
+
if (!this.holdArchivedCopies || entry.cachedAnalysis || entry.urgentTriagePolicy
|
|
1420
|
+
|| entry.reviewPriority === 'urgent' || this.heldBytes + entry.byteLength > this.heldMaxBytes)
|
|
1421
|
+
return false;
|
|
1422
|
+
const ref = entry.reviewContext?.retainedCapture;
|
|
1423
|
+
if (ref?.version !== 1 || ref.kind !== 'retained_single_capture' || ref.id !== entry.id
|
|
1424
|
+
|| Object.keys(ref).sort().join(',') !== 'id,kind,version')
|
|
1425
|
+
return false;
|
|
1426
|
+
try {
|
|
1427
|
+
return this.holdArchivedCopies() === true;
|
|
1428
|
+
}
|
|
1429
|
+
catch {
|
|
1430
|
+
return false;
|
|
1431
|
+
}
|
|
1432
|
+
}
|
|
1433
|
+
/** Write one unwritten copy, record and JPEG, exactly as offer() would have; false leaves it unwritten. */
|
|
1434
|
+
writeHeld(entry) {
|
|
1435
|
+
const jpeg = this.heldCopies.get(entry.id);
|
|
1436
|
+
if (!jpeg)
|
|
1437
|
+
return true;
|
|
1438
|
+
if (!this.writePair(entry, jpeg))
|
|
1439
|
+
return false;
|
|
1440
|
+
this.heldCopies.delete(entry.id);
|
|
1441
|
+
this.heldBytes -= jpeg.length;
|
|
1442
|
+
return true;
|
|
1443
|
+
}
|
|
1444
|
+
/** Write every unwritten copy still queued; one that cannot be written is re-offered by its archive. */
|
|
1445
|
+
writeHeldCopies() {
|
|
1446
|
+
if (!this.heldCopies.size)
|
|
1447
|
+
return;
|
|
1448
|
+
for (const feed of this.feeds.values()) {
|
|
1449
|
+
for (const entry of feed.items)
|
|
1450
|
+
if (this.heldCopies.has(entry.id))
|
|
1451
|
+
this.writeHeld(entry);
|
|
1452
|
+
}
|
|
1453
|
+
}
|
|
1361
1454
|
deletePairById(id) {
|
|
1362
1455
|
// Metadata is queue visibility. Remove it before the JPEG so an accepted
|
|
1363
1456
|
// frame cannot be recovered and posted twice if Windows temporarily holds
|