@trillboards/edge-sdk 0.2.52 → 0.2.54
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/macos/README.md +22 -7
- package/deploy/macos/apply-update.sh +225 -0
- package/deploy/macos/bench-local-vlm.sh +140 -0
- package/deploy/macos/build-macos-pkg.sh +13 -10
- package/deploy/macos/scripts/postinstall +13 -3
- package/deploy/windows/README.md +7 -5
- package/deploy/windows/bundle-windows-installer.ps1 +1 -3
- package/deploy/windows/e2e/test-local-sense.ps1 +97 -6
- package/dist/EdgeAgent.js +1 -1
- package/dist/connectorUpdate.d.ts +23 -16
- package/dist/connectorUpdate.d.ts.map +1 -1
- package/dist/connectorUpdate.js +37 -10
- package/dist/connectorUpdate.js.map +1 -1
- package/dist/connectorUpdateApply.d.ts +3 -0
- package/dist/connectorUpdateApply.d.ts.map +1 -1
- package/dist/connectorUpdateApply.js +3 -0
- package/dist/connectorUpdateApply.js.map +1 -1
- package/dist/connectorUpdateApplyMac.d.ts +50 -0
- package/dist/connectorUpdateApplyMac.d.ts.map +1 -0
- package/dist/connectorUpdateApplyMac.js +166 -0
- package/dist/connectorUpdateApplyMac.js.map +1 -0
- package/dist/diagnose.d.ts +1 -1
- package/dist/diagnose.js +1 -1
- package/dist/localVlmBench.d.ts +102 -0
- package/dist/localVlmBench.d.ts.map +1 -1
- package/dist/localVlmBench.js +129 -0
- package/dist/localVlmBench.js.map +1 -1
- package/package.json +1 -1
|
@@ -18,6 +18,18 @@
|
|
|
18
18
|
connector → serve → preAnalyzed → assert plumbing WITHOUT the ~2.4 GB model.
|
|
19
19
|
This is a STUB-VLM proof — NOT a real-model proof.
|
|
20
20
|
|
|
21
|
+
bench (workflow_dispatch only):
|
|
22
|
+
Provisions exactly as 'real' does, then runs scripts/bench-local-vlm.mjs
|
|
23
|
+
instead of the pass/fail verification — so the run MEASURES this machine's
|
|
24
|
+
per-frame cost and grades it against the throughput floor, rather than
|
|
25
|
+
asserting a person was seen.
|
|
26
|
+
This is the only way a Windows number exists at all. windows-latest has
|
|
27
|
+
failed -Mode real 8 of 8 times since 2026-06-29 (each attempt: two 360 s
|
|
28
|
+
request timeouts, one per delegate) and therefore produced NO per-frame
|
|
29
|
+
figure, so every latency number in the capacity plan came off one Apple M4
|
|
30
|
+
Max. A bench run bounds itself with -BenchBudgetMinutes and writes its JSON
|
|
31
|
+
after every frame, because a process killed at the job cap writes nothing.
|
|
32
|
+
|
|
21
33
|
real (workflow_dispatch / scheduled only):
|
|
22
34
|
Provisions litert-lm + imports Gemma 4 E2B (setup-litertlm.ps1, model cached),
|
|
23
35
|
waits for the real `litert-lm serve` :9379 to be healthy, then runs the REAL
|
|
@@ -29,20 +41,44 @@
|
|
|
29
41
|
different schema and a different prompt, so the audience arm cannot catch a
|
|
30
42
|
regression in it; it is also the set 166 of the 176 active prod profiles run.
|
|
31
43
|
|
|
32
|
-
.PARAMETER Mode 'wiring' (default) or '
|
|
44
|
+
.PARAMETER Mode 'wiring' (default), 'real' or 'bench'.
|
|
33
45
|
.PARAMETER Frame Person JPEG fixture. Default: e2e/fixtures/person.jpg.
|
|
34
|
-
.PARAMETER Port litert-lm serve port (real mode). Default 9379.
|
|
46
|
+
.PARAMETER Port litert-lm serve port (real/bench mode). Default 9379.
|
|
35
47
|
.PARAMETER FfmpegPath ffmpeg for the connector's RTSP capture (wiring mode).
|
|
36
48
|
Default: the bundled bin\ffmpeg.exe if staged, else 'ffmpeg'.
|
|
49
|
+
.PARAMETER BenchArms bench mode: which arms to run, in priority order — the
|
|
50
|
+
budget cuts from the END, so the shipping config leads.
|
|
51
|
+
.PARAMETER BenchFrames bench mode: which committed CCTV frames to measure.
|
|
52
|
+
.PARAMETER BenchRounds bench mode: interleaved rounds per arm.
|
|
53
|
+
.PARAMETER BenchBudgetMinutes bench mode: wall-clock ceiling, set BELOW the job
|
|
54
|
+
cap so the run stops with results written instead of
|
|
55
|
+
being killed with none.
|
|
56
|
+
.PARAMETER BenchFrameTimeoutMinutes bench mode: per-frame deadline. Generous on
|
|
57
|
+
purpose: a frame that times out records the DEADLINE, not
|
|
58
|
+
the machine's speed, which is exactly how windows-latest
|
|
59
|
+
has produced no number for two months.
|
|
60
|
+
.PARAMETER BenchOut bench mode: where the JSON matrix lands.
|
|
61
|
+
.PARAMETER BenchModel bench mode: a NON-default .litertlm model id, for the
|
|
62
|
+
per-silicon A/B (litert-community ships _intel_LNL /
|
|
63
|
+
_intel_PTL builds alongside the generic file we import
|
|
64
|
+
everywhere). Import it first with
|
|
65
|
+
`litert-lm import --from-huggingface-repo ...`.
|
|
37
66
|
|
|
38
67
|
.OUTPUTS exit 0 = E2E passed; exit 1 = failed.
|
|
39
68
|
#>
|
|
40
69
|
[CmdletBinding()]
|
|
41
70
|
param(
|
|
42
|
-
[ValidateSet('wiring', 'real')][string]$Mode = 'wiring',
|
|
71
|
+
[ValidateSet('wiring', 'real', 'bench')][string]$Mode = 'wiring',
|
|
43
72
|
[string]$Frame,
|
|
44
73
|
[string]$Port = '9379',
|
|
45
|
-
[string]$FfmpegPath
|
|
74
|
+
[string]$FfmpegPath,
|
|
75
|
+
[string]$BenchArms = 'cpu-sop,gpu-sop,cpu-dooh-sop',
|
|
76
|
+
[string]$BenchFrames = 'kitchen-5-people',
|
|
77
|
+
[int]$BenchRounds = 1,
|
|
78
|
+
[int]$BenchBudgetMinutes = 40,
|
|
79
|
+
[int]$BenchFrameTimeoutMinutes = 20,
|
|
80
|
+
[string]$BenchOut,
|
|
81
|
+
[string]$BenchModel
|
|
46
82
|
)
|
|
47
83
|
$ErrorActionPreference = 'Stop'
|
|
48
84
|
Set-StrictMode -Version Latest
|
|
@@ -113,8 +149,15 @@ if ($Mode -eq 'wiring') {
|
|
|
113
149
|
exit 0
|
|
114
150
|
}
|
|
115
151
|
|
|
116
|
-
# ─── Mode: real (actual Gemma 4 E2B via litert-lm serve)
|
|
117
|
-
|
|
152
|
+
# ─── Mode: real / bench (actual Gemma 4 E2B via litert-lm serve) ──────────────
|
|
153
|
+
# Provisioning, serve start-up and health are IDENTICAL for both: 'real' then
|
|
154
|
+
# asserts, 'bench' then measures. One provisioning path, so a Windows number and
|
|
155
|
+
# a Windows pass/fail are statements about the same install.
|
|
156
|
+
if ($Mode -eq 'bench') {
|
|
157
|
+
Log "HARDWARE MATRIX — provisioning litert-lm + Gemma 4 E2B, then MEASURING this machine"
|
|
158
|
+
} else {
|
|
159
|
+
Log "REAL-MODEL SMOKE — provisioning litert-lm + Gemma 4 E2B, then real inference"
|
|
160
|
+
}
|
|
118
161
|
|
|
119
162
|
# 1. Provision litert-lm + import the model (idempotent; model may be cached by
|
|
120
163
|
# the workflow's actions/cache step before this runs).
|
|
@@ -174,6 +217,54 @@ if (-not $healthy) {
|
|
|
174
217
|
}
|
|
175
218
|
Log "litert-lm serve healthy on :$Port"
|
|
176
219
|
|
|
220
|
+
# 3b. BENCH: measure this machine instead of asserting on it.
|
|
221
|
+
if ($Mode -eq 'bench') {
|
|
222
|
+
if (-not $BenchOut) {
|
|
223
|
+
$benchBase = if ([string]::IsNullOrWhiteSpace($env:RUNNER_TEMP)) { $env:TEMP } else { $env:RUNNER_TEMP }
|
|
224
|
+
$BenchOut = Join-Path $benchBase 'bench-local-vlm.json'
|
|
225
|
+
}
|
|
226
|
+
$bench = Join-Path $PkgRoot 'scripts\bench-local-vlm.mjs'
|
|
227
|
+
if (-not (Test-Path $bench)) { Die "bench runner missing: $bench" }
|
|
228
|
+
# The machine itself is read from `os` by the bench; this note only records
|
|
229
|
+
# WHICH instance of that machine class ran, so a CI row is traceable to a run.
|
|
230
|
+
$note = if ($env:GITHUB_ACTIONS -eq 'true') {
|
|
231
|
+
"GitHub-hosted runner, image $($env:ImageOS)/$($env:ImageVersion), run $($env:GITHUB_RUN_ID)"
|
|
232
|
+
} else { 'local Windows machine' }
|
|
233
|
+
Log "running the hardware matrix — arms=$BenchArms frames=$BenchFrames rounds=$BenchRounds budget=${BenchBudgetMinutes}m"
|
|
234
|
+
# Initialised BEFORE the try: if `node` cannot start at all, the failure
|
|
235
|
+
# message below still has a value to report instead of tripping StrictMode.
|
|
236
|
+
$benchExit = -1
|
|
237
|
+
try {
|
|
238
|
+
# Built as an ARRAY and splatted rather than a backticked line ending in a
|
|
239
|
+
# conditional array: an empty @() as the trailing argument to a native
|
|
240
|
+
# command expands to an empty string under Windows PowerShell 5.1, which
|
|
241
|
+
# node would read as a stray positional argument.
|
|
242
|
+
$benchArgs = @(
|
|
243
|
+
$bench,
|
|
244
|
+
'--litert', "http://127.0.0.1:$Port",
|
|
245
|
+
'--arms', $BenchArms,
|
|
246
|
+
'--frames', $BenchFrames,
|
|
247
|
+
'--rounds', [string]$BenchRounds,
|
|
248
|
+
'--budget-ms', [string]($BenchBudgetMinutes * 60000),
|
|
249
|
+
'--timeout-ms', [string]($BenchFrameTimeoutMinutes * 60000),
|
|
250
|
+
'--machine-note', $note,
|
|
251
|
+
'--out', $BenchOut
|
|
252
|
+
)
|
|
253
|
+
if ($BenchModel) { $benchArgs += @('--model', $BenchModel) }
|
|
254
|
+
node @benchArgs
|
|
255
|
+
$benchExit = $LASTEXITCODE
|
|
256
|
+
} finally {
|
|
257
|
+
if ($serveProc) { try { $serveProc.Kill() } catch {} }
|
|
258
|
+
}
|
|
259
|
+
if (Test-Path $BenchOut) { Log "matrix written: $BenchOut" }
|
|
260
|
+
# A bench REPORTS; it does not gate. Exiting non-zero on a slow machine would
|
|
261
|
+
# turn "this box is too slow" into "the lane is broken", which is the confusion
|
|
262
|
+
# that left windows-latest unmeasured. Only a crash (no JSON at all) fails.
|
|
263
|
+
if (-not (Test-Path $BenchOut)) { Die "bench produced no matrix at all (node exit $benchExit)" }
|
|
264
|
+
Pass "hardware matrix measured on this machine (see $BenchOut)."
|
|
265
|
+
exit 0
|
|
266
|
+
}
|
|
267
|
+
|
|
177
268
|
# 4. REAL on-device inference on the person fixture + assert a person was seen.
|
|
178
269
|
# BOTH field sets are exercised, because the connector ships both and they are
|
|
179
270
|
# different prompts against a different schema:
|
package/dist/EdgeAgent.js
CHANGED
|
@@ -44,7 +44,7 @@ const edge_ads_1 = require("@trillboards/edge-ads");
|
|
|
44
44
|
const CommandRouter_1 = require("./CommandRouter");
|
|
45
45
|
const config_1 = require("./config");
|
|
46
46
|
const dataDir_1 = require("./dataDir");
|
|
47
|
-
const SDK_VERSION = '0.2.
|
|
47
|
+
const SDK_VERSION = '0.2.54';
|
|
48
48
|
class EdgeAgent extends events_1.EventEmitter {
|
|
49
49
|
constructor(config, deps) {
|
|
50
50
|
super();
|
|
@@ -12,10 +12,11 @@
|
|
|
12
12
|
* customer happened to re-download 2.6 GB and re-run the installer.
|
|
13
13
|
*
|
|
14
14
|
* THIS FILE ONLY CHECKS AND REPORTS. Applying an update is a separate,
|
|
15
|
-
* platform-specific transaction — see `deploy/windows/apply-update.ps1
|
|
16
|
-
* `
|
|
17
|
-
*
|
|
18
|
-
* running binaries" is
|
|
15
|
+
* platform-specific transaction — see `deploy/windows/apply-update.ps1`,
|
|
16
|
+
* `deploy/macos/apply-update.sh`, and their TypeScript appliers. The split is
|
|
17
|
+
* deliberate: "am I stale?" is a question every packaged platform can answer
|
|
18
|
+
* over one small GET, while "swap the running binaries" is an OS-specific
|
|
19
|
+
* service transaction with a rollback.
|
|
19
20
|
*
|
|
20
21
|
* ── WHY A 200 IS NOT AN ANSWER ──────────────────────────────────────────────
|
|
21
22
|
* The CDN in front of these objects serves the marketing SPA as its default
|
|
@@ -73,11 +74,12 @@ export declare const CONNECTOR_UPDATE_MIN_RELEASE_AGE_MS: number;
|
|
|
73
74
|
/**
|
|
74
75
|
* The published manifest, after strict validation.
|
|
75
76
|
*
|
|
76
|
-
*
|
|
77
|
-
*
|
|
78
|
-
*
|
|
79
|
-
*
|
|
80
|
-
*
|
|
77
|
+
* Update fields are OPTIONAL because manifests published before the appliers
|
|
78
|
+
* shipped carry none. Windows uses `updateUrl` plus an Authenticode-signed
|
|
79
|
+
* `updateCatalogUrl`; macOS uses `updateUrl` plus the code-only package's size
|
|
80
|
+
* and hash, while its Developer ID package signature is the trust anchor. An
|
|
81
|
+
* install that finds a newer version with no usable update payload reports the
|
|
82
|
+
* drift rather than failing.
|
|
81
83
|
*/
|
|
82
84
|
export interface ConnectorVersionManifest {
|
|
83
85
|
schemaVersion: number;
|
|
@@ -90,6 +92,10 @@ export interface ConnectorVersionManifest {
|
|
|
90
92
|
downloadUrl: string;
|
|
91
93
|
updateUrl?: string;
|
|
92
94
|
updateCatalogUrl?: string;
|
|
95
|
+
/** macOS code-only package hash (the package signature is the trust anchor). */
|
|
96
|
+
updateSha256?: string;
|
|
97
|
+
/** macOS code-only package size, checked before its hash and signature. */
|
|
98
|
+
updateSizeBytes?: number;
|
|
93
99
|
}
|
|
94
100
|
/** A parsed `MAJOR.MINOR.PATCH`. */
|
|
95
101
|
export interface ParsedConnectorVersion {
|
|
@@ -244,13 +250,14 @@ export declare function checkForConnectorUpdate(installedVersion: string, client
|
|
|
244
250
|
* 2.4 GB model download. It is wrong here: this GET is 401 bytes, and deferring
|
|
245
251
|
* it six hours would mean a store PC that reboots nightly never reports its
|
|
246
252
|
* version at all — the fleet view would be blind to exactly the machines most
|
|
247
|
-
* likely to be stale.
|
|
248
|
-
*
|
|
253
|
+
* likely to be stale. The check is tiny and non-blocking, so schedule it on the
|
|
254
|
+
* next event-loop turn: every paired connector checks at launch without
|
|
255
|
+
* delaying sensing.
|
|
249
256
|
*
|
|
250
257
|
* A fresh release still cannot be applied on that first check: the bake window
|
|
251
258
|
* is enforced separately, on `publishedAt`.
|
|
252
259
|
*/
|
|
253
|
-
export declare const CONNECTOR_UPDATE_INITIAL_DELAY_MS =
|
|
260
|
+
export declare const CONNECTOR_UPDATE_INITIAL_DELAY_MS = 0;
|
|
254
261
|
/** How often the apply state machine looks at the world while an update is in flight. */
|
|
255
262
|
export declare const CONNECTOR_UPDATE_POLL_INTERVAL_MS = 60000;
|
|
256
263
|
/**
|
|
@@ -288,8 +295,8 @@ export interface ConnectorUpdateServiceDeps {
|
|
|
288
295
|
deviceTokens: string[];
|
|
289
296
|
/**
|
|
290
297
|
* The connector's current irrecoverable-work reading. Omit to CHECK and
|
|
291
|
-
* REPORT without ever applying
|
|
292
|
-
*
|
|
298
|
+
* REPORT without ever applying, which is what a caller with no manager to ask
|
|
299
|
+
* should do.
|
|
293
300
|
*/
|
|
294
301
|
busyness?: () => ConnectorBusyness;
|
|
295
302
|
/**
|
|
@@ -298,7 +305,7 @@ export interface ConnectorUpdateServiceDeps {
|
|
|
298
305
|
* their existing shutdown closure so cameras are closed first.
|
|
299
306
|
*/
|
|
300
307
|
requestExit?: () => void;
|
|
301
|
-
/**
|
|
308
|
+
/** Platform applier. Omit (or pass null) to check and report only. */
|
|
302
309
|
applier?: ConnectorUpdateApplier | null;
|
|
303
310
|
log?: (message: string) => void;
|
|
304
311
|
client?: ConnectorManifestClient;
|
|
@@ -317,7 +324,7 @@ export interface ConnectorUpdateServiceDeps {
|
|
|
317
324
|
}
|
|
318
325
|
/**
|
|
319
326
|
* The whole update loop: check the manifest, tell the server where this install
|
|
320
|
-
* stands, and —
|
|
327
|
+
* stands, and — with a verified payload and a quiet moment — apply.
|
|
321
328
|
*
|
|
322
329
|
* Every branch is best-effort. A failed check, a failed report, an applier that
|
|
323
330
|
* will not launch: each is one log line, and sensing continues. The one thing
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectorUpdate.d.ts","sourceRoot":"","sources":["../src/connectorUpdate.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"connectorUpdate.d.ts","sourceRoot":"","sources":["../src/connectorUpdate.ts"],"names":[],"mappings":"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"}
|
package/dist/connectorUpdate.js
CHANGED
|
@@ -13,10 +13,11 @@
|
|
|
13
13
|
* customer happened to re-download 2.6 GB and re-run the installer.
|
|
14
14
|
*
|
|
15
15
|
* THIS FILE ONLY CHECKS AND REPORTS. Applying an update is a separate,
|
|
16
|
-
* platform-specific transaction — see `deploy/windows/apply-update.ps1
|
|
17
|
-
* `
|
|
18
|
-
*
|
|
19
|
-
* running binaries" is
|
|
16
|
+
* platform-specific transaction — see `deploy/windows/apply-update.ps1`,
|
|
17
|
+
* `deploy/macos/apply-update.sh`, and their TypeScript appliers. The split is
|
|
18
|
+
* deliberate: "am I stale?" is a question every packaged platform can answer
|
|
19
|
+
* over one small GET, while "swap the running binaries" is an OS-specific
|
|
20
|
+
* service transaction with a rollback.
|
|
20
21
|
*
|
|
21
22
|
* ── WHY A 200 IS NOT AN ANSWER ──────────────────────────────────────────────
|
|
22
23
|
* The CDN in front of these objects serves the marketing SPA as its default
|
|
@@ -227,6 +228,19 @@ function parseVersionManifest(body) {
|
|
|
227
228
|
manifest.updateUrl = o.updateUrl;
|
|
228
229
|
if (isNonEmptyString(o.updateCatalogUrl))
|
|
229
230
|
manifest.updateCatalogUrl = o.updateCatalogUrl;
|
|
231
|
+
if ('updateSha256' in o) {
|
|
232
|
+
if (typeof o.updateSha256 !== 'string' || !/^[0-9a-f]{64}$/.test(o.updateSha256))
|
|
233
|
+
return null;
|
|
234
|
+
manifest.updateSha256 = o.updateSha256;
|
|
235
|
+
}
|
|
236
|
+
if ('updateSizeBytes' in o) {
|
|
237
|
+
if (typeof o.updateSizeBytes !== 'number' ||
|
|
238
|
+
!Number.isInteger(o.updateSizeBytes) ||
|
|
239
|
+
o.updateSizeBytes <= 0) {
|
|
240
|
+
return null;
|
|
241
|
+
}
|
|
242
|
+
manifest.updateSizeBytes = o.updateSizeBytes;
|
|
243
|
+
}
|
|
230
244
|
return manifest;
|
|
231
245
|
}
|
|
232
246
|
/**
|
|
@@ -396,13 +410,14 @@ async function checkForConnectorUpdate(installedVersion, client) {
|
|
|
396
410
|
* 2.4 GB model download. It is wrong here: this GET is 401 bytes, and deferring
|
|
397
411
|
* it six hours would mean a store PC that reboots nightly never reports its
|
|
398
412
|
* version at all — the fleet view would be blind to exactly the machines most
|
|
399
|
-
* likely to be stale.
|
|
400
|
-
*
|
|
413
|
+
* likely to be stale. The check is tiny and non-blocking, so schedule it on the
|
|
414
|
+
* next event-loop turn: every paired connector checks at launch without
|
|
415
|
+
* delaying sensing.
|
|
401
416
|
*
|
|
402
417
|
* A fresh release still cannot be applied on that first check: the bake window
|
|
403
418
|
* is enforced separately, on `publishedAt`.
|
|
404
419
|
*/
|
|
405
|
-
exports.CONNECTOR_UPDATE_INITIAL_DELAY_MS =
|
|
420
|
+
exports.CONNECTOR_UPDATE_INITIAL_DELAY_MS = 0;
|
|
406
421
|
/** How often the apply state machine looks at the world while an update is in flight. */
|
|
407
422
|
exports.CONNECTOR_UPDATE_POLL_INTERVAL_MS = 60000;
|
|
408
423
|
/**
|
|
@@ -427,7 +442,7 @@ exports.CONNECTOR_UPDATE_STAGE_DEADLINE_MS = 60 * 60 * 1000;
|
|
|
427
442
|
exports.CONNECTOR_UPDATE_SAFE_POINT_DEADLINE_MS = 2 * 60 * 60 * 1000;
|
|
428
443
|
/**
|
|
429
444
|
* The whole update loop: check the manifest, tell the server where this install
|
|
430
|
-
* stands, and —
|
|
445
|
+
* stands, and — with a verified payload and a quiet moment — apply.
|
|
431
446
|
*
|
|
432
447
|
* Every branch is best-effort. A failed check, a failed report, an applier that
|
|
433
448
|
* will not launch: each is one log line, and sensing continues. The one thing
|
|
@@ -591,8 +606,8 @@ function startConnectorUpdateService(deps) {
|
|
|
591
606
|
return;
|
|
592
607
|
if (phase !== 'idle')
|
|
593
608
|
return;
|
|
594
|
-
if (!
|
|
595
|
-
log('[update] the published manifest carries no update payload — reported only');
|
|
609
|
+
if (!applier.canStage(check.manifest)) {
|
|
610
|
+
log('[update] the published manifest carries no usable update payload — reported only');
|
|
596
611
|
return;
|
|
597
612
|
}
|
|
598
613
|
if (!isReleaseBakedEnough(check.manifest, now(), deps.minReleaseAgeMs)) {
|
|
@@ -681,6 +696,18 @@ function startConnectorUpdates(opts) {
|
|
|
681
696
|
applier = null;
|
|
682
697
|
}
|
|
683
698
|
}
|
|
699
|
+
else if (platform === 'darwin') {
|
|
700
|
+
try {
|
|
701
|
+
// macOS uses a signed-pkg transaction and LaunchAgent handoff.
|
|
702
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
703
|
+
const mod = require('./connectorUpdateApplyMac');
|
|
704
|
+
const candidate = new mod.MacConnectorUpdateApplier({ log: opts.log });
|
|
705
|
+
applier = candidate.installRoot() ? candidate : null;
|
|
706
|
+
}
|
|
707
|
+
catch {
|
|
708
|
+
applier = null;
|
|
709
|
+
}
|
|
710
|
+
}
|
|
684
711
|
try {
|
|
685
712
|
return startConnectorUpdateService({
|
|
686
713
|
installedVersion: opts.installedVersion,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectorUpdate.js","sourceRoot":"","sources":["../src/connectorUpdate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connectorUpdate.js","sourceRoot":"","sources":["../src/connectorUpdate.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,8 @@ export declare const OUTCOME_FILE_NAME = "outcome.json";
|
|
|
40
40
|
export interface ConnectorUpdateApplier {
|
|
41
41
|
/** The packaged install root, or null when this is not a packaged install. */
|
|
42
42
|
installRoot(): string | null;
|
|
43
|
+
/** Whether this platform has every manifest field required to stage safely. */
|
|
44
|
+
canStage(manifest: ConnectorVersionManifest): boolean;
|
|
43
45
|
/** Start the download+verify phase, detached. Returns false if it could not start. */
|
|
44
46
|
stage(opts: {
|
|
45
47
|
manifest: ConnectorVersionManifest;
|
|
@@ -96,6 +98,7 @@ export declare class WindowsConnectorUpdateApplier implements ConnectorUpdateApp
|
|
|
96
98
|
private readonly log;
|
|
97
99
|
constructor(deps?: WindowsApplierDeps);
|
|
98
100
|
installRoot(): string | null;
|
|
101
|
+
canStage(manifest: ConnectorVersionManifest): boolean;
|
|
99
102
|
private updateDir;
|
|
100
103
|
/**
|
|
101
104
|
* Launch `apply-update.ps1` and forget about it.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectorUpdateApply.d.ts","sourceRoot":"","sources":["../src/connectorUpdateApply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAGtC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,yEAAyE;AACzE,eAAO,MAAM,eAAe,iBAAiB,CAAC;AAE9C,qEAAqE;AACrE,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAEhD,wEAAwE;AACxE,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD,8EAA8E;AAC9E,MAAM,WAAW,sBAAsB;IACrC,8EAA8E;IAC9E,WAAW,IAAI,MAAM,GAAG,IAAI,CAAC;IAC7B,sFAAsF;IACtF,KAAK,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,wBAAwB,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;IACrF,wEAAwE;IACxE,aAAa,IAAI,MAAM,GAAG,IAAI,CAAC;IAC/B,qEAAqE;IACrE,MAAM,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;IACnE,iDAAiD;IACjD,WAAW,IAAI,sBAAsB,GAAG,IAAI,CAAC;IAC7C,+EAA+E;IAC/E,YAAY,IAAI,IAAI,CAAC;CACtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,GAAE,MAAyB,EACnC,MAAM,GAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAiC,GACvD,MAAM,GAAG,IAAI,CAMf;AAQD,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,IAAI,CAc7E;AAED,gCAAgC;AAChC,qBAAa,6BAA8B,YAAW,sBAAsB;IAC1E,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwB;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwB;gBAEhC,IAAI,GAAE,kBAAuB;IASzC,WAAW,IAAI,MAAM,GAAG,IAAI;IAI5B,OAAO,CAAC,SAAS;IAIjB;;;;;;;OAOG;IACH,OAAO,CAAC,MAAM;IAmBd,KAAK,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,wBAAwB,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAcpF,MAAM,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAUlE,aAAa,IAAI,MAAM,GAAG,IAAI;IAa9B,WAAW,IAAI,sBAAsB,GAAG,IAAI;IAY5C,YAAY,IAAI,IAAI;CASrB"}
|
|
1
|
+
{"version":3,"file":"connectorUpdateApply.d.ts","sourceRoot":"","sources":["../src/connectorUpdateApply.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,6 +139,9 @@ class WindowsConnectorUpdateApplier {
|
|
|
139
139
|
installRoot() {
|
|
140
140
|
return this.root;
|
|
141
141
|
}
|
|
142
|
+
canStage(manifest) {
|
|
143
|
+
return Boolean(manifest.updateUrl && manifest.updateCatalogUrl);
|
|
144
|
+
}
|
|
142
145
|
updateDir() {
|
|
143
146
|
return this.root ? path.join(this.root, exports.UPDATE_DIR_NAME) : null;
|
|
144
147
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectorUpdateApply.js","sourceRoot":"","sources":["../src/connectorUpdateApply.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"connectorUpdateApply.js","sourceRoot":"","sources":["../src/connectorUpdateApply.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* macOS connector updater handoff.
|
|
3
|
+
*
|
|
4
|
+
* The connector owns the safe-point decision. The shipped shell helper owns
|
|
5
|
+
* the signed-pkg transaction because it must use macOS trust, Installer, and
|
|
6
|
+
* launchd. Both stage and commit are detached so a download never blocks
|
|
7
|
+
* sensing and the commit helper survives the connector process it replaces.
|
|
8
|
+
*/
|
|
9
|
+
import { spawn } from 'child_process';
|
|
10
|
+
import type { ConnectorVersionManifest } from './connectorUpdate';
|
|
11
|
+
import { type ConnectorUpdateApplier } from './connectorUpdateApply';
|
|
12
|
+
import type { ConnectorUpdateOutcome } from './ConnectorStatusClient';
|
|
13
|
+
export declare const MAC_UPDATE_DIR_NAME = ".edge-auto-update";
|
|
14
|
+
/** A packaged macOS install has node in <root>/bin and the helper in share/. */
|
|
15
|
+
export declare function resolveMacInstallRoot(execPath?: string, exists?: (p: string) => boolean): string | null;
|
|
16
|
+
export interface MacApplierDeps {
|
|
17
|
+
installRoot?: string | null;
|
|
18
|
+
spawnFn?: typeof spawn;
|
|
19
|
+
readFileFn?: (p: string) => string;
|
|
20
|
+
existsFn?: (p: string) => boolean;
|
|
21
|
+
unlinkFn?: (p: string) => void;
|
|
22
|
+
pid?: number;
|
|
23
|
+
log?: (msg: string) => void;
|
|
24
|
+
}
|
|
25
|
+
export declare class MacConnectorUpdateApplier implements ConnectorUpdateApplier {
|
|
26
|
+
private readonly root;
|
|
27
|
+
private readonly spawnFn;
|
|
28
|
+
private readonly readFileFn;
|
|
29
|
+
private readonly existsFn;
|
|
30
|
+
private readonly unlinkFn;
|
|
31
|
+
private readonly pid;
|
|
32
|
+
private readonly log;
|
|
33
|
+
constructor(deps?: MacApplierDeps);
|
|
34
|
+
installRoot(): string | null;
|
|
35
|
+
canStage(manifest: ConnectorVersionManifest): boolean;
|
|
36
|
+
private updateDir;
|
|
37
|
+
private launch;
|
|
38
|
+
stage(opts: {
|
|
39
|
+
manifest: ConnectorVersionManifest;
|
|
40
|
+
currentVersion: string;
|
|
41
|
+
}): boolean;
|
|
42
|
+
commit(opts: {
|
|
43
|
+
version: string;
|
|
44
|
+
currentVersion: string;
|
|
45
|
+
}): boolean;
|
|
46
|
+
stagedVersion(): string | null;
|
|
47
|
+
readOutcome(): ConnectorUpdateOutcome | null;
|
|
48
|
+
clearOutcome(): void;
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=connectorUpdateApplyMac.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connectorUpdateApplyMac.d.ts","sourceRoot":"","sources":["../src/connectorUpdateApplyMac.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAGtC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAIL,KAAK,sBAAsB,EAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE,eAAO,MAAM,mBAAmB,sBAAsB,CAAC;AAEvD,gFAAgF;AAChF,wBAAgB,qBAAqB,CACnC,QAAQ,GAAE,MAAyB,EACnC,MAAM,GAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAiC,GACvD,MAAM,GAAG,IAAI,CAMf;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;IACvB,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IAClC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC7B;AAED,qBAAa,yBAA0B,YAAW,sBAAsB;IACtE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAwB;IACnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwB;gBAEhC,IAAI,GAAE,cAAmB;IAUrC,WAAW,IAAI,MAAM,GAAG,IAAI;IAI5B,QAAQ,CAAC,QAAQ,EAAE,wBAAwB,GAAG,OAAO;IAIrD,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,MAAM;IAoBd,KAAK,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,wBAAwB,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAapF,MAAM,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAWlE,aAAa,IAAI,MAAM,GAAG,IAAI;IAa9B,WAAW,IAAI,sBAAsB,GAAG,IAAI;IAY5C,YAAY,IAAI,IAAI;CASrB"}
|