@trillboards/edge-sdk 0.2.160 → 0.2.169
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/TrillboardsSetupApp.m +36 -0
- package/deploy/macos/pair.command +13 -0
- package/deploy/windows/e2e/test-local-sense.ps1 +13 -1
- package/deploy/windows/e2e/test-recorder-family.ps1 +85 -0
- package/deploy/windows/setup-litertlm.ps1 +22 -10
- package/deploy/windows/trillboards-pair.cmd +8 -0
- package/deploy/windows/trillboards-setup.ps1 +68 -17
- package/dist/ChannelProber.d.ts +3 -7
- package/dist/ChannelProber.d.ts.map +1 -1
- package/dist/ChannelProber.js +270 -41
- package/dist/ChannelProber.js.map +1 -1
- package/dist/EdgeAgent.js +1 -1
- package/dist/InstallerOnboardingClient.d.ts +1 -0
- package/dist/InstallerOnboardingClient.d.ts.map +1 -1
- package/dist/InstallerOnboardingClient.js +10 -0
- package/dist/InstallerOnboardingClient.js.map +1 -1
- package/dist/LiteRtVlmProvider.d.ts +2 -1
- package/dist/LiteRtVlmProvider.d.ts.map +1 -1
- package/dist/LiteRtVlmProvider.js +30 -4
- package/dist/LiteRtVlmProvider.js.map +1 -1
- package/dist/SetupSessionClient.d.ts +6 -0
- package/dist/SetupSessionClient.d.ts.map +1 -1
- package/dist/SetupSessionClient.js +1 -0
- package/dist/SetupSessionClient.js.map +1 -1
- package/dist/autoSense.d.ts +10 -1
- package/dist/autoSense.d.ts.map +1 -1
- package/dist/autoSense.js +135 -5
- package/dist/autoSense.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +24 -1
- package/dist/cli.js.map +1 -1
- package/dist/connectorCameraSetup.d.ts +26 -0
- package/dist/connectorCameraSetup.d.ts.map +1 -0
- package/dist/connectorCameraSetup.js +225 -0
- package/dist/connectorCameraSetup.js.map +1 -0
- package/dist/dataDir.d.ts +5 -0
- package/dist/dataDir.d.ts.map +1 -1
- package/dist/dataDir.js +9 -0
- package/dist/dataDir.js.map +1 -1
- package/dist/diagnose.d.ts +1 -1
- package/dist/diagnose.js +1 -1
- package/dist/gemmaModelOta.d.ts.map +1 -1
- package/dist/gemmaModelOta.js +1 -5
- package/dist/gemmaModelOta.js.map +1 -1
- package/dist/installerOnboardingMode.d.ts +1 -0
- package/dist/installerOnboardingMode.d.ts.map +1 -1
- package/dist/installerOnboardingMode.js +25 -5
- package/dist/installerOnboardingMode.js.map +1 -1
- package/dist/setupMode.d.ts +38 -0
- package/dist/setupMode.d.ts.map +1 -1
- package/dist/setupMode.js +218 -49
- package/dist/setupMode.js.map +1 -1
- package/dist/setupProgress.d.ts +1 -0
- package/dist/setupProgress.d.ts.map +1 -1
- package/dist/setupProgress.js +2 -0
- package/dist/setupProgress.js.map +1 -1
- package/package.json +1 -1
|
@@ -99,6 +99,7 @@ static BOOL acquireSetupInstanceLock(void) {
|
|
|
99
99
|
@property(nonatomic, assign) BOOL setupStarted;
|
|
100
100
|
@property(nonatomic, assign) BOOL terminating;
|
|
101
101
|
@property(nonatomic, assign) BOOL signingIn;
|
|
102
|
+
@property(nonatomic, assign) BOOL authorizationOnly;
|
|
102
103
|
@end
|
|
103
104
|
|
|
104
105
|
@implementation TrillboardsSetupDelegate
|
|
@@ -965,6 +966,9 @@ static BOOL acquireSetupInstanceLock(void) {
|
|
|
965
966
|
NSNumber *devices = state[@"devicesFound"];
|
|
966
967
|
NSNumber *rejected = state[@"rejectedFeeds"];
|
|
967
968
|
if ([stage isEqualToString:@"onboarding_account"]) {
|
|
969
|
+
self.authorizationOnly = [state[@"authorizationOnly"] isEqual:@YES];
|
|
970
|
+
if (self.authorizationOnly && !self.signingIn) [self authModePressed];
|
|
971
|
+
self.authModeButton.hidden = self.authorizationOnly;
|
|
968
972
|
[self showOnboardingPanel:self.accountPanel];
|
|
969
973
|
[self updateSteps:1];
|
|
970
974
|
self.accountSubmit.enabled = YES;
|
|
@@ -1148,8 +1152,11 @@ static BOOL acquireSetupInstanceLock(void) {
|
|
|
1148
1152
|
|
|
1149
1153
|
- (void)updateSteps:(NSInteger)active {
|
|
1150
1154
|
NSArray<NSString *> *names = @[@"Welcome", @"Account", @"Account setup", @"Plan & Payment", @"Recorder", @"Cameras", @"Local AI", @"Ready"];
|
|
1155
|
+
if (self.authorizationOnly) { names = @[@"Connected computer", @"Sign in", @"Ready"]; active = [self.lastStage isEqual:@"ready"] ? 2 : 1; }
|
|
1151
1156
|
for (NSInteger index = 0; index < (NSInteger)self.stepLabels.count; index++) {
|
|
1152
1157
|
NSTextField *field = self.stepLabels[(NSUInteger)index];
|
|
1158
|
+
field.hidden = index >= (NSInteger)names.count;
|
|
1159
|
+
if (field.hidden) continue;
|
|
1153
1160
|
NSString *prefix = index < active ? @"OK" : [NSString stringWithFormat:@"%ld", index + 1];
|
|
1154
1161
|
field.stringValue = [NSString stringWithFormat:@"%@ %@", prefix, names[(NSUInteger)index]];
|
|
1155
1162
|
field.font = [NSFont systemFontOfSize:13 weight:index == active ? NSFontWeightSemibold : NSFontWeightRegular];
|
|
@@ -1293,6 +1300,32 @@ static int runGuidanceSmokeTest(void) {
|
|
|
1293
1300
|
return 0;
|
|
1294
1301
|
}
|
|
1295
1302
|
|
|
1303
|
+
static int runAuthorizationRailSmokeTest(void) {
|
|
1304
|
+
[NSApplication sharedApplication];
|
|
1305
|
+
TrillboardsSetupDelegate *delegate = [[TrillboardsSetupDelegate alloc] init];
|
|
1306
|
+
[delegate buildWindow];
|
|
1307
|
+
if (delegate.stepLabels.count != 8 || delegate.stepLabels.lastObject.hidden) return 1;
|
|
1308
|
+
[delegate renderState:@{@"stage": @"onboarding_account", @"authorizationOnly": @YES}];
|
|
1309
|
+
if (!delegate.signingIn || !delegate.authModeButton.hidden) return 2;
|
|
1310
|
+
NSArray<NSString *> *expected = @[@"Connected computer", @"Sign in", @"Ready"];
|
|
1311
|
+
for (NSUInteger index = 0; index < delegate.stepLabels.count; index++) {
|
|
1312
|
+
NSTextField *field = delegate.stepLabels[index];
|
|
1313
|
+
if (index < expected.count) {
|
|
1314
|
+
if (field.hidden || ![field.stringValue hasSuffix:expected[index]]) return 3;
|
|
1315
|
+
} else if (!field.hidden) return 4;
|
|
1316
|
+
}
|
|
1317
|
+
delegate.lastStage = @"ready";
|
|
1318
|
+
[delegate updateSteps:7];
|
|
1319
|
+
if (![delegate.stepLabels[1].stringValue hasPrefix:@"OK"] ||
|
|
1320
|
+
![delegate.stepLabels[2].stringValue isEqual:@"3 Ready"]) return 5;
|
|
1321
|
+
[delegate renderState:@{@"stage": @"onboarding_account", @"authorizationOnly": @NO}];
|
|
1322
|
+
if (delegate.stepLabels.lastObject.hidden || delegate.authModeButton.hidden ||
|
|
1323
|
+
![delegate.stepLabels[4].stringValue hasSuffix:@"Recorder"]) return 6;
|
|
1324
|
+
[delegate.window close];
|
|
1325
|
+
fprintf(stdout, "Native authorization sign-in, three-step rail, completion and onboarding restoration passed.\n");
|
|
1326
|
+
return 0;
|
|
1327
|
+
}
|
|
1328
|
+
|
|
1296
1329
|
static int runCancellationSmokeTest(void) {
|
|
1297
1330
|
NSString *pidPath = [NSTemporaryDirectory()
|
|
1298
1331
|
stringByAppendingPathComponent:[NSString stringWithFormat:@"trillboards-setup-child-%@.pid", NSUUID.UUID.UUIDString]];
|
|
@@ -1416,6 +1449,9 @@ int main(int argc, const char *argv[]) {
|
|
|
1416
1449
|
if (argc == 2 && [[NSString stringWithUTF8String:argv[1]] isEqualToString:@"--smoke-test-guidance"]) {
|
|
1417
1450
|
return runGuidanceSmokeTest();
|
|
1418
1451
|
}
|
|
1452
|
+
if (argc == 2 && [[NSString stringWithUTF8String:argv[1]] isEqualToString:@"--smoke-test-authorization-rail"]) {
|
|
1453
|
+
return runAuthorizationRailSmokeTest();
|
|
1454
|
+
}
|
|
1419
1455
|
if (argc == 2 && [[NSString stringWithUTF8String:argv[1]] isEqualToString:@"--smoke-test-cancel"]) {
|
|
1420
1456
|
return runCancellationSmokeTest();
|
|
1421
1457
|
}
|
|
@@ -308,6 +308,19 @@ if pmset -g batt 2>/dev/null | grep -q "Battery Power"; then
|
|
|
308
308
|
if is_ui; then plog "power: running on battery"; elif is_headless; then echo "[trillboards-pair] $BATT_NOTE"; else dialog_info "$BATT_NOTE"; fi
|
|
309
309
|
fi
|
|
310
310
|
|
|
311
|
+
# An existing-PC sign-in authorizes control only; it never reboots sensing or reruns pairing.
|
|
312
|
+
if is_ui && [ -f "$CONFIG" ]; then
|
|
313
|
+
set +e
|
|
314
|
+
"$LAUNCHER" installer-onboarding --authorize-existing-if-requested --config "$CONFIG" --status-file "$UI_STATUS_FILE" "${NATIVE_UI_ARGS[@]}"
|
|
315
|
+
AUTH_RC=$?
|
|
316
|
+
set -e
|
|
317
|
+
case "$AUTH_RC" in
|
|
318
|
+
0) exit 0 ;;
|
|
319
|
+
10) : ;; # No pending request: retain normal resume/setup.
|
|
320
|
+
*) exit "$AUTH_RC" ;;
|
|
321
|
+
esac
|
|
322
|
+
fi
|
|
323
|
+
|
|
311
324
|
# ─── Resume path: a saved, complete pairing skips the code prompt ─────────────
|
|
312
325
|
# Branch on WHY verification failed: only an auth rejection (3) or a token-less
|
|
313
326
|
# config (4) needs a new code — a network/server failure (2/5) means the saved
|
|
@@ -276,6 +276,8 @@ if ($Mode -eq 'bench') {
|
|
|
276
276
|
# NO real-model coverage on any lane until this ran. A regression that
|
|
277
277
|
# breaks only the operator schema (an enum the model cannot satisfy, a
|
|
278
278
|
# custom field the prompt never mentions) is invisible to the audience arm.
|
|
279
|
+
# Exercise the connector's normal automatic policy. The provider must reuse
|
|
280
|
+
# setup's verified backend itself; pinning CPU here would hide a startup bug.
|
|
279
281
|
$verifyExit = 1
|
|
280
282
|
try {
|
|
281
283
|
$verify = Join-Path $PkgRoot 'scripts\verify-gemma4-vlm.mjs'
|
|
@@ -295,6 +297,16 @@ try {
|
|
|
295
297
|
} finally {
|
|
296
298
|
if ($serveProc) { try { $serveProc.Kill() } catch {} }
|
|
297
299
|
}
|
|
298
|
-
if ($verifyExit -ne 0) {
|
|
300
|
+
if ($verifyExit -ne 0) {
|
|
301
|
+
Log '--- actual installed model service logs ---'
|
|
302
|
+
$productLogs = Join-Path $env:LOCALAPPDATA 'Trillboards\logs'
|
|
303
|
+
if (Test-Path -LiteralPath $productLogs) {
|
|
304
|
+
Get-ChildItem -LiteralPath $productLogs -Filter '*litert*' -File | ForEach-Object {
|
|
305
|
+
Log $_.Name
|
|
306
|
+
Get-Content -LiteralPath $_.FullName -Tail 60 -ErrorAction SilentlyContinue
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
Die "real-model smoke FAILED (verify-gemma4-vlm.mjs exit $verifyExit)"
|
|
310
|
+
}
|
|
299
311
|
Pass "Windows on-device Gemma 4 E2B detected a person on the fixture (REAL inference, BOTH field sets)."
|
|
300
312
|
exit 0
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
[CmdletBinding()]
|
|
2
|
+
param(
|
|
3
|
+
[string]$FfmpegPath,
|
|
4
|
+
[string]$OutputDirectory
|
|
5
|
+
)
|
|
6
|
+
$ErrorActionPreference = 'Stop'
|
|
7
|
+
Set-StrictMode -Version Latest
|
|
8
|
+
$packageRoot = (Resolve-Path (Join-Path $PSScriptRoot '..\..\..')).Path
|
|
9
|
+
$module = Join-Path $packageRoot 'dist\ChannelProber.js'
|
|
10
|
+
if (-not (Test-Path -LiteralPath $module -PathType Leaf)) { throw 'Build the connector before native recorder qualification.' }
|
|
11
|
+
$nodeVersion = (& node -p 'process.versions.node' | Out-String).Trim()
|
|
12
|
+
if ($LASTEXITCODE -ne 0 -or ([Version]$nodeVersion).Major -ne 22) { throw 'Native recorder qualification requires Node 22.' }
|
|
13
|
+
|
|
14
|
+
$tempRoot = [IO.Path]::GetFullPath([IO.Path]::GetTempPath()).TrimEnd('\')
|
|
15
|
+
$scratch = Join-Path $tempRoot ('tb-recorder-protocol-' + [Guid]::NewGuid().ToString('N'))
|
|
16
|
+
New-Item -ItemType Directory -Path $scratch | Out-Null
|
|
17
|
+
if (-not $OutputDirectory) { $OutputDirectory = Join-Path $tempRoot 'recorder-family-native' }
|
|
18
|
+
New-Item -ItemType Directory -Force -Path $OutputDirectory | Out-Null
|
|
19
|
+
$succeeded = $false
|
|
20
|
+
try {
|
|
21
|
+
# Read the product's actual FFmpeg pin. A host binary on PATH cannot qualify
|
|
22
|
+
# a different binary, and an old shared fixture cache must not vouch for it.
|
|
23
|
+
$pin = ((& (Join-Path $packageRoot 'deploy\windows\build-windows.ps1') -PrintFfmpegPin) | Out-String).Trim() -split '\s+'
|
|
24
|
+
if ($LASTEXITCODE -ne 0 -or $pin.Count -ne 2) { throw 'Could not read the shipped FFmpeg pin.' }
|
|
25
|
+
$expected = $pin[1].ToLowerInvariant()
|
|
26
|
+
if (-not $FfmpegPath) {
|
|
27
|
+
$candidates = @(
|
|
28
|
+
(Join-Path $packageRoot 'deploy\windows\dist-installer\stage-x64\Trillboards\edge\bin\ffmpeg.exe'),
|
|
29
|
+
(Join-Path $tempRoot 'tb-e2e-ffmpeg.exe')
|
|
30
|
+
)
|
|
31
|
+
foreach ($candidate in $candidates) {
|
|
32
|
+
if ((Test-Path -LiteralPath $candidate -PathType Leaf) -and
|
|
33
|
+
(Get-FileHash -LiteralPath $candidate -Algorithm SHA256).Hash.ToLowerInvariant() -eq $expected) {
|
|
34
|
+
$FfmpegPath = $candidate
|
|
35
|
+
break
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
if (-not $FfmpegPath) {
|
|
39
|
+
$FfmpegPath = Join-Path $scratch 'ffmpeg.exe'
|
|
40
|
+
Invoke-WebRequest -Uri $pin[0] -OutFile $FfmpegPath -UseBasicParsing
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
if ((Get-FileHash -LiteralPath $FfmpegPath -Algorithm SHA256).Hash.ToLowerInvariant() -ne $expected) {
|
|
44
|
+
throw 'Native protocol FFmpeg differs from the connector release pin.'
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
# Official MediaMTX v1.21.2 checksums.sha256, pinned rather than latest.
|
|
48
|
+
$archive = Join-Path $scratch 'mediamtx.zip'
|
|
49
|
+
Invoke-WebRequest -Uri 'https://github.com/bluenviron/mediamtx/releases/download/v1.21.2/mediamtx_v1.21.2_windows_amd64.zip' -OutFile $archive -UseBasicParsing
|
|
50
|
+
if ((Get-FileHash -LiteralPath $archive -Algorithm SHA256).Hash.ToLowerInvariant() -ne 'a84224f5a490855684e62ba6fb71e80ea2a5e16aed61883bb58380290e93e467') {
|
|
51
|
+
throw 'MediaMTX fixture checksum mismatch.'
|
|
52
|
+
}
|
|
53
|
+
Expand-Archive -LiteralPath $archive -DestinationPath $scratch
|
|
54
|
+
$media = Join-Path $scratch 'mediamtx.exe'
|
|
55
|
+
if (-not (Test-Path -LiteralPath $media -PathType Leaf)) { throw 'Pinned RTSP fixture executable is missing.' }
|
|
56
|
+
$cases = @('alias', 'onvif', 'onvif-sparse', 'onvif-variant', 'hikvision', 'single', 'ambiguous')
|
|
57
|
+
$count = 0
|
|
58
|
+
foreach ($case in $cases) {
|
|
59
|
+
$receipt = Join-Path $OutputDirectory ($case + '.json')
|
|
60
|
+
& node --max-old-space-size=1536 (Join-Path $packageRoot 'scripts\run-recorder-family-native.mjs') --ffmpeg $FfmpegPath --mediamtx $media --case $case --out $receipt
|
|
61
|
+
if ($LASTEXITCODE -ne 0) { throw "Native recorder case '$case' failed. See $receipt" }
|
|
62
|
+
$result = Get-Content -LiteralPath $receipt -Raw | ConvertFrom-Json
|
|
63
|
+
$expectedCases = if ($case -in @('alias', 'onvif-variant')) { 2 } else { 1 }
|
|
64
|
+
if (-not $result.passed -or -not $result.ownedChildrenStopped -or @($result.cases).Count -ne $expectedCases) {
|
|
65
|
+
throw "Native recorder case '$case' did not produce a complete passing receipt."
|
|
66
|
+
}
|
|
67
|
+
$count += @($result.cases).Count
|
|
68
|
+
}
|
|
69
|
+
if ($count -ne 9) { throw 'The Windows recorder qualification did not execute all nine behavioral cases.' }
|
|
70
|
+
$summary = @{ passed = $true; nativeBehaviorCases = $count; compiledProbe = $module; nodeVersion = $nodeVersion;
|
|
71
|
+
ffmpegSha256 = $expected; physicalRecorderQualified = $false; witnessedDesktopAcceptance = $false }
|
|
72
|
+
$summary | ConvertTo-Json | Set-Content -LiteralPath (Join-Path $OutputDirectory 'summary.json') -Encoding UTF8
|
|
73
|
+
$succeeded = $true
|
|
74
|
+
Write-Host 'PASS: nine recorder-family cases through actual RTSP/RTP/H.264 and the compiled Windows connector.'
|
|
75
|
+
} finally {
|
|
76
|
+
# Only this owned temporary directory, after all native children exited.
|
|
77
|
+
if ($succeeded) {
|
|
78
|
+
$resolved = [IO.Path]::GetFullPath($scratch)
|
|
79
|
+
if ((Split-Path -Parent $resolved).TrimEnd('\') -cne $tempRoot -or
|
|
80
|
+
-not (Split-Path -Leaf $resolved).StartsWith('tb-recorder-protocol-')) {
|
|
81
|
+
throw 'Refusing cleanup outside the owned native protocol directory.'
|
|
82
|
+
}
|
|
83
|
+
Remove-Item -LiteralPath $resolved -Recurse -Force
|
|
84
|
+
}
|
|
85
|
+
}
|
|
@@ -111,6 +111,25 @@ function Write-DownloadProgress {
|
|
|
111
111
|
Write-SetupProgress -Stage "local_ai" -Title "Downloading local AI" -Message "Gemma is downloading to this computer. Keep it online; cloud inference remains off." -Phase "downloading_model" -Percent $percent -DownloadedBytes $downloaded -TotalBytes $ExpectedModelBytes
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
+
# Retain the native process handle before polling. Windows PowerShell 5.1 can
|
|
115
|
+
# otherwise return a null ExitCode after Start-Process/Refresh/WaitForExit, so a
|
|
116
|
+
# completed model download is never imported even though curl succeeded.
|
|
117
|
+
function Invoke-ModelDownload {
|
|
118
|
+
param([string]$Url, [string]$Destination, [string]$StdoutPath, [string]$StderrPath)
|
|
119
|
+
$process = Start-Process -FilePath "curl.exe" -ArgumentList @("--fail", "--location", "--output", ('"' + $Destination + '"'), $Url) -WindowStyle Hidden -RedirectStandardOutput $StdoutPath -RedirectStandardError $StderrPath -PassThru -ErrorAction Stop
|
|
120
|
+
try {
|
|
121
|
+
$null = $process.Handle
|
|
122
|
+
while (-not $process.HasExited) {
|
|
123
|
+
Write-DownloadProgress
|
|
124
|
+
Start-Sleep -Seconds 2
|
|
125
|
+
$process.Refresh()
|
|
126
|
+
}
|
|
127
|
+
$process.WaitForExit()
|
|
128
|
+
if ($null -eq $process.ExitCode) { throw 'Model download ended without a trustworthy exit code' }
|
|
129
|
+
return [int]$process.ExitCode
|
|
130
|
+
} finally { $process.Dispose() }
|
|
131
|
+
}
|
|
132
|
+
|
|
114
133
|
function Test-ServeHealthy {
|
|
115
134
|
try {
|
|
116
135
|
$response = Invoke-WebRequest -Uri "http://127.0.0.1:$Port/v1/models" -UseBasicParsing -TimeoutSec 3
|
|
@@ -932,16 +951,9 @@ if ($haveModel) {
|
|
|
932
951
|
$downloadPath = Join-Path $StoreDir "approved-model.tmp"
|
|
933
952
|
New-Item -ItemType Directory -Force -Path $StoreDir | Out-Null
|
|
934
953
|
$modelUrl = "https://huggingface.co/litert-community/gemma-4-E2B-it-litert-lm/resolve/84b6978eff6e4eea02825bc2ee4ea48579f13109/gemma-4-E2B-it.litertlm"
|
|
935
|
-
$
|
|
936
|
-
|
|
937
|
-
|
|
938
|
-
Start-Sleep -Seconds 2
|
|
939
|
-
$process.Refresh()
|
|
940
|
-
}
|
|
941
|
-
$process.WaitForExit()
|
|
942
|
-
Log "model download exited with code $($process.ExitCode)"
|
|
943
|
-
if ($process.ExitCode -eq 0) { $haveModel = Import-VerifiedModel $downloadPath $litertlmPath }
|
|
944
|
-
$process.Dispose()
|
|
954
|
+
$downloadExitCode = Invoke-ModelDownload -Url $modelUrl -Destination $downloadPath -StdoutPath $stdoutPath -StderrPath $stderrPath
|
|
955
|
+
Log "model download exited with code $downloadExitCode"
|
|
956
|
+
if ($downloadExitCode -eq 0) { $haveModel = Import-VerifiedModel $downloadPath $litertlmPath }
|
|
945
957
|
} catch {
|
|
946
958
|
Log "WARN: model import process failed: $_"
|
|
947
959
|
}
|
|
@@ -51,6 +51,14 @@ if not errorlevel 1 (
|
|
|
51
51
|
echo.
|
|
52
52
|
)
|
|
53
53
|
|
|
54
|
+
REM Existing-PC authorization runs before normal resume and never touches service/task/model setup.
|
|
55
|
+
if defined UI_STATUS_FILE if exist "%CFG%" (
|
|
56
|
+
call "%~dp0trillboards-edge.cmd" installer-onboarding --authorize-existing-if-requested --config "%CFG%" --status-file "%UI_STATUS_FILE%"
|
|
57
|
+
if not errorlevel 1 exit /b 0
|
|
58
|
+
if errorlevel 11 goto :done_fail
|
|
59
|
+
if not errorlevel 10 goto :done_fail
|
|
60
|
+
)
|
|
61
|
+
|
|
54
62
|
REM ── Resume path: a saved, complete pairing skips the code prompt. Branch on
|
|
55
63
|
REM WHY verification failed: only an auth rejection (3) or a token-less config
|
|
56
64
|
REM (4) needs a new code — a network/server failure (2/5) means the saved
|
|
@@ -24,6 +24,7 @@ $script:PortalUrl = 'https://app.senseanything.com/sense/cameras'
|
|
|
24
24
|
$script:PairProcess = $null
|
|
25
25
|
$script:SetupInput = $null
|
|
26
26
|
$script:AuthMode = 'signup'
|
|
27
|
+
$script:AuthorizationOnly = $false
|
|
27
28
|
$script:SetupMutex = $null
|
|
28
29
|
$script:UpdateTask = $null
|
|
29
30
|
$script:UpdateClient = $null
|
|
@@ -98,11 +99,15 @@ function Get-ProgressValue([string]$Stage, $State) {
|
|
|
98
99
|
}
|
|
99
100
|
|
|
100
101
|
function Update-Steps([int]$Active, [bool]$CompleteActive = $false) {
|
|
102
|
+
$names = if ($script:AuthorizationOnly) { @('Connected computer', 'Sign in', 'Ready') } else { $StepNames }
|
|
103
|
+
if ($script:AuthorizationOnly) { $Active = if ($script:LastStage -eq 'ready') { 2 } else { 1 } }
|
|
101
104
|
for ($index = 0; $index -lt $StepLabels.Count; $index++) {
|
|
102
105
|
$label = $StepLabels[$index]
|
|
106
|
+
$label.Visible = $index -lt $names.Count
|
|
107
|
+
if ($index -ge $names.Count) { continue }
|
|
103
108
|
$completed = $index -lt $Active -or ($CompleteActive -and $index -eq $Active)
|
|
104
109
|
$prefix = if ($completed) { [string][char]0x2713 } else { [string]($index + 1) }
|
|
105
|
-
$label.Text = "$prefix $($
|
|
110
|
+
$label.Text = "$prefix $($names[$index])"
|
|
106
111
|
$label.ForeColor = if ($index -le $Active) { [System.Drawing.Color]::FromArgb(30, 43, 49) } else { [System.Drawing.Color]::FromArgb(104, 119, 127) }
|
|
107
112
|
$style = if ($index -eq $Active) { [System.Drawing.FontStyle]::Bold } else { [System.Drawing.FontStyle]::Regular }
|
|
108
113
|
$label.Font = New-Object System.Drawing.Font('Segoe UI', 10, $style)
|
|
@@ -349,6 +354,7 @@ function New-PanelButton {
|
|
|
349
354
|
}
|
|
350
355
|
|
|
351
356
|
$AccountPanel = New-OnboardingPanel
|
|
357
|
+
$AccountPanel.Height = 300
|
|
352
358
|
$GoogleButton = New-PanelButton -Parent $AccountPanel -Text 'Continue with Google' -X 0 -Y 0 -Width 465
|
|
353
359
|
$AccountDivider = New-Label -Text 'or use email' -Size 8.5
|
|
354
360
|
$AccountDivider.ForeColor = [System.Drawing.Color]::FromArgb(104, 119, 127)
|
|
@@ -358,25 +364,34 @@ $AccountDivider.Size = New-Object System.Drawing.Size(465, 20)
|
|
|
358
364
|
$AccountPanel.Controls.Add($AccountDivider)
|
|
359
365
|
|
|
360
366
|
$NameLabel = New-Label -Text 'Full name' -Size 8.5
|
|
361
|
-
$NameLabel.Location = New-Object System.Drawing.Point(0,
|
|
362
|
-
$NameLabel.Size = New-Object System.Drawing.Size(
|
|
367
|
+
$NameLabel.Location = New-Object System.Drawing.Point(0, 62)
|
|
368
|
+
$NameLabel.Size = New-Object System.Drawing.Size(465, 18)
|
|
363
369
|
$AccountPanel.Controls.Add($NameLabel)
|
|
364
|
-
$NameInput = New-TextBox -Parent $AccountPanel -X 0 -Y
|
|
370
|
+
$NameInput = New-TextBox -Parent $AccountPanel -X 0 -Y 80 -Width 465
|
|
365
371
|
|
|
366
372
|
$EmailLabel = New-Label -Text 'Work email' -Size 8.5
|
|
367
|
-
$EmailLabel.Location = New-Object System.Drawing.Point(
|
|
368
|
-
$EmailLabel.Size = New-Object System.Drawing.Size(
|
|
373
|
+
$EmailLabel.Location = New-Object System.Drawing.Point(0, 112)
|
|
374
|
+
$EmailLabel.Size = New-Object System.Drawing.Size(465, 18)
|
|
369
375
|
$AccountPanel.Controls.Add($EmailLabel)
|
|
370
|
-
$EmailInput = New-TextBox -Parent $AccountPanel -X
|
|
376
|
+
$EmailInput = New-TextBox -Parent $AccountPanel -X 0 -Y 130 -Width 465
|
|
371
377
|
|
|
372
378
|
$PasswordLabel = New-Label -Text 'Create password' -Size 8.5
|
|
373
|
-
$PasswordLabel.Location = New-Object System.Drawing.Point(0,
|
|
374
|
-
$PasswordLabel.Size = New-Object System.Drawing.Size(
|
|
379
|
+
$PasswordLabel.Location = New-Object System.Drawing.Point(0, 162)
|
|
380
|
+
$PasswordLabel.Size = New-Object System.Drawing.Size(465, 18)
|
|
375
381
|
$AccountPanel.Controls.Add($PasswordLabel)
|
|
376
|
-
$PasswordInput = New-TextBox -Parent $AccountPanel -X 0 -Y
|
|
377
|
-
|
|
378
|
-
$AuthModeButton = New-PanelButton -Parent $AccountPanel -Text 'Already have an account? Sign in' -X
|
|
379
|
-
$
|
|
382
|
+
$PasswordInput = New-TextBox -Parent $AccountPanel -X 0 -Y 180 -Width 465 -Password $true
|
|
383
|
+
|
|
384
|
+
$AuthModeButton = New-PanelButton -Parent $AccountPanel -Text 'Already have an account? Sign in' -X 0 -Y 264 -Width 465
|
|
385
|
+
$AuthModeButton.FlatStyle = [System.Windows.Forms.FlatStyle]::Flat
|
|
386
|
+
$AuthModeButton.FlatAppearance.BorderSize = 0
|
|
387
|
+
$AuthModeButton.ForeColor = [System.Drawing.Color]::FromArgb(15, 107, 90)
|
|
388
|
+
$AccountSubmit = New-PanelButton -Parent $AccountPanel -Text 'Create account' -X 0 -Y 218 -Width 465 -Primary $true
|
|
389
|
+
$GoogleButton.TabIndex = 0
|
|
390
|
+
$NameInput.TabIndex = 1
|
|
391
|
+
$EmailInput.TabIndex = 2
|
|
392
|
+
$PasswordInput.TabIndex = 3
|
|
393
|
+
$AccountSubmit.TabIndex = 4
|
|
394
|
+
$AuthModeButton.TabIndex = 5
|
|
380
395
|
|
|
381
396
|
$TermsPanel = New-OnboardingPanel
|
|
382
397
|
$TermsSummary = New-Label -Text 'Your account must accept the current Sense Anything terms, privacy notice, earner agreement, and data processing addendum.' -Size 10
|
|
@@ -457,6 +472,8 @@ $ChooseAccountSubmit.Add_Click({
|
|
|
457
472
|
function Set-OnboardingPanel($Panel) {
|
|
458
473
|
foreach ($item in $OnboardingPanels) { $item.Visible = ($item -eq $Panel) }
|
|
459
474
|
$showStatus = $null -eq $Panel
|
|
475
|
+
$Detail.Height = if ($Panel -eq $AccountPanel) { 54 } else { 74 }
|
|
476
|
+
$Form.AcceptButton = if ($Panel -eq $AccountPanel) { $AccountSubmit } else { $null }
|
|
460
477
|
$StatusBox.Visible = $showStatus
|
|
461
478
|
$Metric.Visible = $showStatus
|
|
462
479
|
$Progress.Visible = $showStatus
|
|
@@ -479,9 +496,17 @@ function Send-OnboardingCommand($Payload) {
|
|
|
479
496
|
}
|
|
480
497
|
|
|
481
498
|
function Update-AuthMode {
|
|
482
|
-
$signingIn = $script:AuthMode -eq 'signin'
|
|
499
|
+
$signingIn = $script:AuthorizationOnly -or $script:AuthMode -eq 'signin'
|
|
500
|
+
$AuthModeButton.Visible = -not $script:AuthorizationOnly
|
|
483
501
|
$NameLabel.Visible = -not $signingIn
|
|
484
502
|
$NameInput.Visible = -not $signingIn
|
|
503
|
+
$offset = if ($signingIn) { -50 } else { 0 }
|
|
504
|
+
$EmailLabel.Top = 112 + $offset
|
|
505
|
+
$EmailInput.Top = 130 + $offset
|
|
506
|
+
$PasswordLabel.Top = 162 + $offset
|
|
507
|
+
$PasswordInput.Top = 180 + $offset
|
|
508
|
+
$AccountSubmit.Top = 218 + $offset
|
|
509
|
+
$AuthModeButton.Top = 264 + $offset
|
|
485
510
|
$PasswordLabel.Text = if ($signingIn) { 'Password' } else { 'Create password' }
|
|
486
511
|
$AccountSubmit.Text = if ($signingIn) { 'Sign in & continue' } else { 'Create account' }
|
|
487
512
|
$AuthModeButton.Text = if ($signingIn) { 'New here? Create account' } else { 'Already have an account? Sign in' }
|
|
@@ -642,7 +667,7 @@ function Complete-UpdateCheck {
|
|
|
642
667
|
if ($script:SetupStarted) {
|
|
643
668
|
$script:SetupStarted = $false
|
|
644
669
|
Stop-SetupProcess
|
|
645
|
-
Resume-BackgroundSensing
|
|
670
|
+
if (-not $script:AuthorizationOnly) { Resume-BackgroundSensing }
|
|
646
671
|
}
|
|
647
672
|
$script:RequiredUpdateUrl = $downloadUrl
|
|
648
673
|
$script:LastStage = 'update_required'
|
|
@@ -820,6 +845,8 @@ function Render-State($State) {
|
|
|
820
845
|
$localAiTotal = Get-StateValue $State 'localAiTotalBytes'
|
|
821
846
|
|
|
822
847
|
if ($stage -eq 'onboarding_account') {
|
|
848
|
+
$script:AuthorizationOnly = (Get-StateValue $State 'authorizationOnly') -eq $true
|
|
849
|
+
if ($script:AuthorizationOnly) { $script:AuthMode = 'signin'; Update-AuthMode }
|
|
823
850
|
Set-OnboardingPanel $AccountPanel
|
|
824
851
|
Update-Steps 1
|
|
825
852
|
$AccountSubmit.Enabled = $true
|
|
@@ -926,7 +953,7 @@ function Render-State($State) {
|
|
|
926
953
|
} elseif ($stage -eq 'local_ai') {
|
|
927
954
|
$Metric.Text = 'The included model stays on this computer; cloud inference remains off.'
|
|
928
955
|
} elseif ($stage -eq 'ready') {
|
|
929
|
-
$Metric.Text = 'Sense Anything starts automatically when this computer logs in.'
|
|
956
|
+
$Metric.Text = if ($script:AuthorizationOnly) { 'Return to Add cameras in the portal. Your cameras keep running.' } else { 'Sense Anything starts automatically when this computer logs in.' }
|
|
930
957
|
} elseif ($stage -eq 'error') {
|
|
931
958
|
$Metric.Text = 'Details are saved in logs\setup-app.log.'
|
|
932
959
|
} else {
|
|
@@ -934,7 +961,8 @@ function Render-State($State) {
|
|
|
934
961
|
}
|
|
935
962
|
|
|
936
963
|
$Progress.Value = [Math]::Max(0, [Math]::Min(100, (Get-ProgressValue $stage $State)))
|
|
937
|
-
Update-Steps
|
|
964
|
+
if ($script:AuthorizationOnly) { Update-Steps 1 ($stage -eq 'ready') }
|
|
965
|
+
else { Update-Steps (Get-StepIndex $stage) ($stage -eq 'ready') }
|
|
938
966
|
$CloseAction.Visible = $stage -eq 'ready'
|
|
939
967
|
switch ($stage) {
|
|
940
968
|
'onboarding_google' { $Action.Text = 'Use another sign-in'; $Action.Enabled = $true }
|
|
@@ -1017,6 +1045,29 @@ $Timer.Add_Tick({
|
|
|
1017
1045
|
})
|
|
1018
1046
|
Show-Welcome
|
|
1019
1047
|
if ($SmokeTest) {
|
|
1048
|
+
foreach ($mode in @('signup', 'signin')) {
|
|
1049
|
+
$script:AuthMode = $mode
|
|
1050
|
+
Update-AuthMode
|
|
1051
|
+
Set-OnboardingPanel $AccountPanel
|
|
1052
|
+
$fields = if ($mode -eq 'signup') { @($NameInput, $EmailInput, $PasswordInput) } else { @($EmailInput, $PasswordInput) }
|
|
1053
|
+
$previousBottom = $AccountDivider.Bottom
|
|
1054
|
+
foreach ($field in $fields) {
|
|
1055
|
+
if ($field.Left -ne 0 -or $field.Width -ne $AccountPanel.Width -or $field.Top -le $previousBottom) {
|
|
1056
|
+
throw "Registration fields must read top to bottom at full width: $mode"
|
|
1057
|
+
}
|
|
1058
|
+
$previousBottom = $field.Bottom
|
|
1059
|
+
}
|
|
1060
|
+
if ($AccountSubmit.Top -le $previousBottom -or $AuthModeButton.Top -le $AccountSubmit.Bottom -or $AuthModeButton.Bottom -gt $AccountPanel.Height) {
|
|
1061
|
+
throw "Registration actions overlap fields or leave the panel: $mode"
|
|
1062
|
+
}
|
|
1063
|
+
$tabOrder = @($GoogleButton) + $fields + @($AccountSubmit, $AuthModeButton)
|
|
1064
|
+
for ($i = 1; $i -lt $tabOrder.Count; $i++) {
|
|
1065
|
+
if ($tabOrder[$i].TabIndex -le $tabOrder[$i - 1].TabIndex) { throw "Registration keyboard order is incorrect: $mode" }
|
|
1066
|
+
}
|
|
1067
|
+
}
|
|
1068
|
+
$script:AuthMode = 'signup'
|
|
1069
|
+
Update-AuthMode
|
|
1070
|
+
Set-OnboardingPanel $null
|
|
1020
1071
|
if ($null -eq $script:GuidanceCatalog) { throw 'Setup guidance catalog is missing.' }
|
|
1021
1072
|
foreach ($entry in $script:GuidanceCatalog.PSObject.Properties) {
|
|
1022
1073
|
$script:LastStage = $entry.Name
|
package/dist/ChannelProber.d.ts
CHANGED
|
@@ -62,6 +62,8 @@ export interface ProbeTarget {
|
|
|
62
62
|
username: string;
|
|
63
63
|
password: string;
|
|
64
64
|
brandHint?: string;
|
|
65
|
+
/** A discovered family is evidence to verify; an explicit owner choice stays authoritative. */
|
|
66
|
+
brandHintSource?: 'discovery' | 'user';
|
|
65
67
|
channelHint?: number;
|
|
66
68
|
/**
|
|
67
69
|
* An operator-typed RTSP stream path (`/live/ch1`, or the whole URL pasted out
|
|
@@ -111,7 +113,7 @@ export declare function brandPathCandidates(brand: string | undefined, ch: numbe
|
|
|
111
113
|
password: string;
|
|
112
114
|
}): string[];
|
|
113
115
|
/** Remove XM query credentials before a probe result leaves the connector. */
|
|
114
|
-
export declare function credentialFreePathTemplate(pathValue: string,
|
|
116
|
+
export declare function credentialFreePathTemplate(pathValue: string, _brand: string | undefined): string;
|
|
115
117
|
/** Restore a credential-free path recipe while writing the local-only config. */
|
|
116
118
|
export declare function materializeCredentialPathTemplate(pathTemplate: string, username: string, password: string): string;
|
|
117
119
|
/**
|
|
@@ -204,12 +206,6 @@ export declare function classifyFfmpegStderr(stderr: string): {
|
|
|
204
206
|
failureClass: ProbeFailureClass;
|
|
205
207
|
message: string;
|
|
206
208
|
};
|
|
207
|
-
/**
|
|
208
|
-
* Probe one recorder. Streams results via opts.onResult as channels settle and
|
|
209
|
-
* returns the full list. NEVER throws for per-channel problems — only for
|
|
210
|
-
* programmer errors; credential rejection yields a single `rtsp_auth` result
|
|
211
|
-
* for the host (the circuit-breaker contract).
|
|
212
|
-
*/
|
|
213
209
|
export declare function probeHost(target: ProbeTarget, opts?: ProbeOptions): Promise<ChannelProbeResult[]>;
|
|
214
210
|
export {};
|
|
215
211
|
//# sourceMappingURL=ChannelProber.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChannelProber.d.ts","sourceRoot":"","sources":["../src/ChannelProber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"ChannelProber.d.ts","sourceRoot":"","sources":["../src/ChannelProber.ts"],"names":[],"mappings":"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"}
|