@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
|
@@ -74,7 +74,7 @@ async function runInstallerOnboardingMode(opts) {
|
|
|
74
74
|
let googleAuthUrl = null;
|
|
75
75
|
const report = (update) => {
|
|
76
76
|
try {
|
|
77
|
-
opts.progress(update);
|
|
77
|
+
opts.progress({ ...update, ...(opts.authorizeExisting ? { authorizationOnly: true } : {}) });
|
|
78
78
|
}
|
|
79
79
|
catch { /* advisory UI state must not break onboarding */ }
|
|
80
80
|
};
|
|
@@ -151,7 +151,24 @@ async function runInstallerOnboardingMode(opts) {
|
|
|
151
151
|
stopped = true;
|
|
152
152
|
inputInterface?.close();
|
|
153
153
|
};
|
|
154
|
-
const refreshStatus = async () =>
|
|
154
|
+
const refreshStatus = async () => {
|
|
155
|
+
if (!opts.authorizeExisting)
|
|
156
|
+
return reportStatus(await client.getOnboardingStatus());
|
|
157
|
+
try {
|
|
158
|
+
await opts.authorizeExisting(client);
|
|
159
|
+
}
|
|
160
|
+
catch (error) {
|
|
161
|
+
choosingAccount = accountChoices.length > 1;
|
|
162
|
+
throw error;
|
|
163
|
+
}
|
|
164
|
+
onboardingComplete = true;
|
|
165
|
+
stopPolls();
|
|
166
|
+
opts.clearBrowserStep?.();
|
|
167
|
+
report({ stage: 'ready', title: 'This computer is authorized', authorizationOnly: true,
|
|
168
|
+
message: 'Return to Add cameras in the portal. Your existing cameras keep running.' });
|
|
169
|
+
stopped = true;
|
|
170
|
+
inputInterface?.close();
|
|
171
|
+
};
|
|
155
172
|
const fail = (error) => {
|
|
156
173
|
const typed = error instanceof InstallerOnboardingClient_1.InstallerApiError ? error : null;
|
|
157
174
|
report({
|
|
@@ -174,8 +191,9 @@ async function runInstallerOnboardingMode(opts) {
|
|
|
174
191
|
status = null;
|
|
175
192
|
report({
|
|
176
193
|
stage: 'onboarding_account',
|
|
177
|
-
title: 'Create or sign in',
|
|
178
|
-
message,
|
|
194
|
+
title: opts.authorizeExisting ? 'Sign in to add cameras' : 'Create or sign in',
|
|
195
|
+
message: opts.authorizeExisting ? 'Use the account that already owns this computer. Your cameras keep running.' : message,
|
|
196
|
+
...(opts.authorizeExisting ? { authorizationOnly: true } : {}),
|
|
179
197
|
});
|
|
180
198
|
};
|
|
181
199
|
const chooseAccount = async () => {
|
|
@@ -265,6 +283,8 @@ async function runInstallerOnboardingMode(opts) {
|
|
|
265
283
|
await chooseAccount();
|
|
266
284
|
break;
|
|
267
285
|
case 'email_sign_up':
|
|
286
|
+
if (opts.authorizeExisting)
|
|
287
|
+
throw new Error('Sign in to the account that already owns this computer.');
|
|
268
288
|
await client.createAccount(command.name || '', command.email || '', command.password || '');
|
|
269
289
|
await chooseAccount();
|
|
270
290
|
break;
|
|
@@ -367,6 +387,6 @@ async function runInstallerOnboardingMode(opts) {
|
|
|
367
387
|
}
|
|
368
388
|
if (!onboardingComplete)
|
|
369
389
|
return 2;
|
|
370
|
-
return opts.afterComplete ? opts.afterComplete(client) : 0;
|
|
390
|
+
return !opts.authorizeExisting && opts.afterComplete ? opts.afterComplete(client) : 0;
|
|
371
391
|
}
|
|
372
392
|
//# sourceMappingURL=installerOnboardingMode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installerOnboardingMode.js","sourceRoot":"","sources":["../src/installerOnboardingMode.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"installerOnboardingMode.js","sourceRoot":"","sources":["../src/installerOnboardingMode.ts"],"names":[],"mappings":"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"}
|
package/dist/setupMode.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SetupSessionClient } from './SetupSessionClient';
|
|
2
2
|
import { probeHost, grabOneFrameAnyTransport, type ChannelProbeResult } from './ChannelProber';
|
|
3
3
|
import { discoverOnvifHosts, sweepLanForRecorders } from './discovery';
|
|
4
|
+
import type { EdgeAgentConfig } from './config';
|
|
4
5
|
import type { SetupProgressReporter } from './setupProgress';
|
|
5
6
|
/**
|
|
6
7
|
* setupMode — `trillboards-edge setup`: the connector side of the
|
|
@@ -62,6 +63,15 @@ export interface SetupModeOptions {
|
|
|
62
63
|
refreshPortalOnCodeRenewal?: boolean;
|
|
63
64
|
/** Customer-safe structured progress for native installer applications. */
|
|
64
65
|
progress?: SetupProgressReporter;
|
|
66
|
+
/** Already-paired, device-authenticated session. Never mints a code or opens a browser. */
|
|
67
|
+
resumeSession?: {
|
|
68
|
+
sessionId: string;
|
|
69
|
+
sessionSecret: string;
|
|
70
|
+
pollIntervalMs?: number;
|
|
71
|
+
};
|
|
72
|
+
/** Runtime owns additive persistence, activation and rollback as one transition. */
|
|
73
|
+
applyConfig?: (config: Record<string, unknown>, expectedRaw: string) => Promise<void>;
|
|
74
|
+
signal?: AbortSignal;
|
|
65
75
|
/** Stable LAN identity fallback for recorders without ONVIF serials. */
|
|
66
76
|
lookupMac?: (host: string) => Promise<string | null>;
|
|
67
77
|
}
|
|
@@ -105,6 +115,31 @@ export declare function normalizeDirectStreamUrl(input: string): string;
|
|
|
105
115
|
* the list and typed the IP by hand.
|
|
106
116
|
*/
|
|
107
117
|
export declare function mergeDiscoveredHosts(onvifHosts: unknown[], sweptHosts: unknown[]): unknown[];
|
|
118
|
+
/** Sync commit prevents this process's address recovery from interleaving with the rename. */
|
|
119
|
+
export declare function writeSetupConfigAtomic(filePath: string, raw: string, expectedRaw?: string): void;
|
|
120
|
+
export interface SavedSetupRecorder {
|
|
121
|
+
id: string;
|
|
122
|
+
host: string;
|
|
123
|
+
port: number;
|
|
124
|
+
name: string;
|
|
125
|
+
credentials: {
|
|
126
|
+
username: string;
|
|
127
|
+
password: string;
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
/** Local-only credentials. Publish only the explicitly credential-free inventory below. */
|
|
131
|
+
export declare function savedSetupRecorders(config: Pick<EdgeAgentConfig, 'cameras'>): SavedSetupRecorder[];
|
|
132
|
+
export declare function cameraSetupInventory(config: Pick<EdgeAgentConfig, 'cameras'>): {
|
|
133
|
+
recorders: Array<Omit<SavedSetupRecorder, 'credentials'>>;
|
|
134
|
+
cameras: Array<{
|
|
135
|
+
screenId: string;
|
|
136
|
+
channelKey: string;
|
|
137
|
+
recorderId: string;
|
|
138
|
+
host: string;
|
|
139
|
+
port: number;
|
|
140
|
+
name: string;
|
|
141
|
+
}>;
|
|
142
|
+
};
|
|
108
143
|
/**
|
|
109
144
|
* Keep the setup session visibly alive while one command owns the main poll
|
|
110
145
|
* loop. A recorder channel probe can legitimately spend close to a minute on a
|
|
@@ -121,6 +156,9 @@ export declare function withSetupStageHeartbeat<T>(client: Pick<SetupSessionClie
|
|
|
121
156
|
* remain intact.
|
|
122
157
|
*/
|
|
123
158
|
export declare function mergeConfigFile(existingRaw: string | null, incoming: {
|
|
159
|
+
/** Absent preserves the original recorder-replacement contract. */
|
|
160
|
+
operation?: 'replace' | 'add';
|
|
161
|
+
connector?: EdgeAgentConfig['connector'];
|
|
124
162
|
apiBaseUrl: string;
|
|
125
163
|
cloudSensing: {
|
|
126
164
|
enabled: boolean;
|
package/dist/setupMode.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupMode.d.ts","sourceRoot":"","sources":["../src/setupMode.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAA+C,MAAM,sBAAsB,CAAC;AACvG,OAAO,EACL,SAAS,EAGT,wBAAwB,EAGxB,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"setupMode.d.ts","sourceRoot":"","sources":["../src/setupMode.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAA+C,MAAM,sBAAsB,CAAC;AACvG,OAAO,EACL,SAAS,EAGT,wBAAwB,EAGxB,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AAI5F,OAAO,KAAK,EAAoB,eAAe,EAAE,MAAM,UAAU,CAAC;AAElE,OAAO,KAAK,EAAE,qBAAqB,EAAuB,MAAM,iBAAiB,CAAC;AAElF;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAWhE;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,iEAAiE;IACjE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qEAAqE;IACrE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,kBAAkB,CAAC;IAC5B,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,EAAE,OAAO,kBAAkB,CAAC;IACrC,KAAK,CAAC,EAAE,OAAO,oBAAoB,CAAC;IACpC,KAAK,CAAC,EAAE,OAAO,SAAS,CAAC;IACzB,kFAAkF;IAClF,SAAS,CAAC,EAAE,OAAO,wBAAwB,CAAC;IAC5C,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,0EAA0E;IAC1E,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,yFAAyF;IACzF,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,qBAAqB,CAAC;IACjC,2FAA2F;IAC3F,aAAa,CAAC,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtF,oFAAoF;IACpF,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtF,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,wEAAwE;IACxE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACtD;AAED,iFAAiF;AACjF,wBAAgB,oBAAoB,IAAI,MAAM,CAG7C;AAID;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,uBAAuB,kCAAkC,CAAC;AAGvE;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,aAAa,GAAE,MAAgC,GAC9C,MAAM,CAaR;AAED,iFAAiF;AACjF,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,GAAG,OAAO,CAAC,OAAO,CAAC,CA4C3G;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAsB9D;AAeD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CA0B5F;AAiDD,8FAA8F;AAC9F,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAgBhG;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IACrD,WAAW,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;CACrD;AAED,2FAA2F;AAC3F,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,kBAAkB,EAAE,CAsBlG;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG;IAC9E,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC;IAC1D,OAAO,EAAE,KAAK,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACxH,CAWA;AAID;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,CAAC,EAC7C,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,EAC7C,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACtB,UAAU,SAA2B,GACpC,OAAO,CAAC,CAAC,CAAC,CAyBZ;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,EAC1B,QAAQ,EAAE;IACR,mEAAmE;IACnE,SAAS,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC;IAC9B,SAAS,CAAC,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,YAAY,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IACpC,OAAO,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,SAAS,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;QAC1B,UAAU,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;KACxC,CAAC,CAAC;CACJ,EACD,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,EAChE,sBAAsB,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,EACvD,kBAAkB,GAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAa,EAC/D,SAAS,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,GACzC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoJzB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CA4lB1E"}
|
package/dist/setupMode.js
CHANGED
|
@@ -40,6 +40,9 @@ exports.buildSetupPortalUrl = buildSetupPortalUrl;
|
|
|
40
40
|
exports.openSetupPortal = openSetupPortal;
|
|
41
41
|
exports.normalizeDirectStreamUrl = normalizeDirectStreamUrl;
|
|
42
42
|
exports.mergeDiscoveredHosts = mergeDiscoveredHosts;
|
|
43
|
+
exports.writeSetupConfigAtomic = writeSetupConfigAtomic;
|
|
44
|
+
exports.savedSetupRecorders = savedSetupRecorders;
|
|
45
|
+
exports.cameraSetupInventory = cameraSetupInventory;
|
|
43
46
|
exports.withSetupStageHeartbeat = withSetupStageHeartbeat;
|
|
44
47
|
exports.mergeConfigFile = mergeConfigFile;
|
|
45
48
|
exports.runSetupMode = runSetupMode;
|
|
@@ -287,7 +290,7 @@ function recorderIdentityFor(camera, credsByHost, probedByChannelKey, macByHost)
|
|
|
287
290
|
mac,
|
|
288
291
|
};
|
|
289
292
|
}
|
|
290
|
-
const username = credsByHost.get(camera.host)?.username || '';
|
|
293
|
+
const username = (credsByHost.get(camera.host + ':' + (camera.port ?? 554)) || credsByHost.get(camera.host))?.username || '';
|
|
291
294
|
const seed = `${camera.host}:${camera.port ?? 554}:${username}`;
|
|
292
295
|
return { id: `local:${(0, crypto_1.createHash)('sha256').update(seed).digest('hex').slice(0, 24)}` };
|
|
293
296
|
}
|
|
@@ -310,6 +313,85 @@ function recorderGroupKey(camera) {
|
|
|
310
313
|
const host = cameraHost(camera);
|
|
311
314
|
return host ? `host:${host}` : null;
|
|
312
315
|
}
|
|
316
|
+
/** Sync commit prevents this process's address recovery from interleaving with the rename. */
|
|
317
|
+
function writeSetupConfigAtomic(filePath, raw, expectedRaw) {
|
|
318
|
+
const resolved = path.resolve(filePath);
|
|
319
|
+
const temporary = resolved + '.tmp-' + process.pid + '-' + (0, crypto_1.randomUUID)();
|
|
320
|
+
const unchanged = () => {
|
|
321
|
+
if (expectedRaw !== undefined && fs.readFileSync(resolved, 'utf8') !== expectedRaw) {
|
|
322
|
+
throw new Error('Camera settings changed during setup. Retry Add cameras against the latest settings.');
|
|
323
|
+
}
|
|
324
|
+
};
|
|
325
|
+
unchanged();
|
|
326
|
+
try {
|
|
327
|
+
const fd = fs.openSync(temporary, 'wx', 0o600);
|
|
328
|
+
try {
|
|
329
|
+
fs.writeFileSync(fd, raw);
|
|
330
|
+
fs.fsyncSync(fd);
|
|
331
|
+
}
|
|
332
|
+
finally {
|
|
333
|
+
fs.closeSync(fd);
|
|
334
|
+
}
|
|
335
|
+
unchanged();
|
|
336
|
+
fs.renameSync(temporary, resolved);
|
|
337
|
+
try {
|
|
338
|
+
fs.chmodSync(resolved, 0o600);
|
|
339
|
+
}
|
|
340
|
+
catch { /* Windows uses the profile directory ACL. */ }
|
|
341
|
+
}
|
|
342
|
+
finally {
|
|
343
|
+
fs.rmSync(temporary, { force: true });
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
/** Local-only credentials. Publish only the explicitly credential-free inventory below. */
|
|
347
|
+
function savedSetupRecorders(config) {
|
|
348
|
+
const records = new Map();
|
|
349
|
+
const decode = (value) => { try {
|
|
350
|
+
return decodeURIComponent(value);
|
|
351
|
+
}
|
|
352
|
+
catch {
|
|
353
|
+
return value;
|
|
354
|
+
} };
|
|
355
|
+
for (const camera of config.cameras || []) {
|
|
356
|
+
if (camera.sourceType !== 'recorder' && !camera.recorder)
|
|
357
|
+
continue;
|
|
358
|
+
try {
|
|
359
|
+
const url = new URL(camera.rtspUrl);
|
|
360
|
+
const path = url.pathname + url.search;
|
|
361
|
+
const username = url.username ? decode(url.username)
|
|
362
|
+
: decode(path.match(/(?:^|[?&/])(?:user|username|usr)=([^&#]*)/i)?.[1] || '');
|
|
363
|
+
const password = url.username ? decode(url.password)
|
|
364
|
+
: decode(path.match(/(?:^|[?&/])(?:password|passwd|pwd|pass)=([^&#]*)/i)?.[1] || '');
|
|
365
|
+
const port = Number(url.port) || 554;
|
|
366
|
+
const id = camera.recorder?.id ||
|
|
367
|
+
'local:' + (0, crypto_1.createHash)('sha256').update(url.hostname + ':' + port + ':' + username).digest('hex').slice(0, 24);
|
|
368
|
+
records.set(id + '|' + url.hostname + ':' + port, {
|
|
369
|
+
id, host: url.hostname, port, name: 'Recorder at ' + url.hostname,
|
|
370
|
+
credentials: { username, password },
|
|
371
|
+
});
|
|
372
|
+
}
|
|
373
|
+
catch { /* An invalid saved URL cannot supply a recorder login. */ }
|
|
374
|
+
}
|
|
375
|
+
return [...records.values()];
|
|
376
|
+
}
|
|
377
|
+
function cameraSetupInventory(config) {
|
|
378
|
+
const recorders = savedSetupRecorders(config).map(({ credentials: _credentials, ...record }) => record);
|
|
379
|
+
const cameras = (config.cameras || []).flatMap(camera => {
|
|
380
|
+
if (!camera.screenId || !camera.channelKey)
|
|
381
|
+
return [];
|
|
382
|
+
let host = '', port = 554;
|
|
383
|
+
try {
|
|
384
|
+
const url = new URL(camera.rtspUrl);
|
|
385
|
+
host = url.hostname;
|
|
386
|
+
port = Number(url.port) || 554;
|
|
387
|
+
}
|
|
388
|
+
catch { /* no usable URL */ }
|
|
389
|
+
const recorder = recorders.find(record => record.host === host && record.port === port);
|
|
390
|
+
return [{ screenId: camera.screenId, channelKey: camera.channelKey, recorderId: recorder?.id || '',
|
|
391
|
+
host, port, name: camera.name || '' }];
|
|
392
|
+
});
|
|
393
|
+
return { recorders, cameras };
|
|
394
|
+
}
|
|
313
395
|
const SETUP_STAGE_HEARTBEAT_MS = 10000;
|
|
314
396
|
/**
|
|
315
397
|
* Keep the setup session visibly alive while one command owns the main poll
|
|
@@ -353,15 +435,22 @@ async function withSetupStageHeartbeat(client, stage, detail, work, intervalMs =
|
|
|
353
435
|
* remain intact.
|
|
354
436
|
*/
|
|
355
437
|
function mergeConfigFile(existingRaw, incoming, credsByHost, directUrlsByChannelKey = new Map(), probedByChannelKey = new Map(), macByHost = new Map()) {
|
|
438
|
+
const additive = incoming.operation === 'add';
|
|
356
439
|
let existing = {};
|
|
357
440
|
if (existingRaw) {
|
|
358
441
|
try {
|
|
359
442
|
existing = JSON.parse(existingRaw);
|
|
360
443
|
}
|
|
361
444
|
catch {
|
|
445
|
+
if (additive)
|
|
446
|
+
throw new Error('Cannot add cameras: the saved configuration is unreadable.');
|
|
362
447
|
existing = {};
|
|
363
448
|
}
|
|
364
449
|
}
|
|
450
|
+
if (additive && (!existing || typeof existing !== 'object' ||
|
|
451
|
+
Array.isArray(existing) || !Array.isArray(existing.cameras))) {
|
|
452
|
+
throw new Error('Cannot add cameras: a valid saved camera configuration is required.');
|
|
453
|
+
}
|
|
365
454
|
const current = Array.isArray(existing.cameras)
|
|
366
455
|
? existing.cameras
|
|
367
456
|
: [];
|
|
@@ -381,7 +470,7 @@ function mergeConfigFile(existingRaw, incoming, credsByHost, directUrlsByChannel
|
|
|
381
470
|
...[...incomingRecorderIds].map((id) => `id:${id}`),
|
|
382
471
|
...[...incomingRecorderHosts].map((host) => `host:${host}`),
|
|
383
472
|
]);
|
|
384
|
-
const preserved = current.filter((camera) => {
|
|
473
|
+
const preserved = additive ? current : current.filter((camera) => {
|
|
385
474
|
const group = recorderGroupKey(camera);
|
|
386
475
|
if (!group)
|
|
387
476
|
return true;
|
|
@@ -403,17 +492,24 @@ function mergeConfigFile(existingRaw, incoming, credsByHost, directUrlsByChannel
|
|
|
403
492
|
? existing.localSensing
|
|
404
493
|
: {};
|
|
405
494
|
for (const cam of incoming.cameras) {
|
|
495
|
+
// An additive retry cannot rename, rotate or rewrite an existing feed.
|
|
496
|
+
// Replacement remains the explicit operation for reconfiguration.
|
|
497
|
+
if (additive && byScreen.has(cam.screenId))
|
|
498
|
+
continue;
|
|
406
499
|
// Reassemble the full rtsp:// URL from LOCAL creds + the server's
|
|
407
500
|
// credential-free recipe. Percent-encoding handled by buildRtspUrl (the
|
|
408
501
|
// `pass@123` class). A camera whose host has no local creds keeps an empty
|
|
409
502
|
// rtspUrl (creds-stay-on-prem manual fill, same as legacy pairing).
|
|
410
|
-
const creds = cam.host ? credsByHost.get(cam.host) : undefined;
|
|
503
|
+
const creds = cam.host ? (credsByHost.get(cam.host + ':' + (cam.port ?? 554)) || credsByHost.get(cam.host)) : undefined;
|
|
411
504
|
const directUrl = directUrlsByChannelKey.get(cam.channelKey);
|
|
412
505
|
const recorder = incomingRecorderIdentities.get(cam.channelKey);
|
|
413
506
|
const rtspUrl = directUrl ||
|
|
414
507
|
(cam.host && cam.pathTemplate && creds
|
|
415
508
|
? (0, ChannelProber_1.buildRtspUrl)(cam.host, cam.port ?? 554, (0, ChannelProber_1.materializeCredentialPathTemplate)(cam.pathTemplate, creds.username, creds.password), creds.username, creds.password)
|
|
416
509
|
: (byScreen.get(cam.screenId)?.rtspUrl || ''));
|
|
510
|
+
if (additive && !rtspUrl) {
|
|
511
|
+
throw new Error('Recorder login is unavailable. Enter the recorder login again and retry Add cameras.');
|
|
512
|
+
}
|
|
417
513
|
byScreen.set(cam.screenId, {
|
|
418
514
|
...(byScreen.get(cam.screenId) || {}),
|
|
419
515
|
name: cam.name,
|
|
@@ -427,8 +523,13 @@ function mergeConfigFile(existingRaw, incoming, credsByHost, directUrlsByChannel
|
|
|
427
523
|
});
|
|
428
524
|
}
|
|
429
525
|
const mergedCameras = [...byScreen.values()];
|
|
526
|
+
// Older generated configs store the derived cadence as a number. Resize that
|
|
527
|
+
// exact default for the enlarged fleet; retain a distinct operator override.
|
|
528
|
+
const resizeGeneratedCadence = additive && existingCloudSensing.periodicIntervalMs ===
|
|
529
|
+
(0, connectorCadence_1.periodicIntervalMsForFeedCount)(current.length);
|
|
430
530
|
return {
|
|
431
531
|
...existing,
|
|
532
|
+
...(incoming.connector ? { connector: incoming.connector } : {}),
|
|
432
533
|
apiBaseUrl: incoming.apiBaseUrl || existing.apiBaseUrl || 'https://api.trillboards.com',
|
|
433
534
|
cloudSensing: {
|
|
434
535
|
...existingCloudSensing,
|
|
@@ -443,10 +544,10 @@ function mergeConfigFile(existingRaw, incoming, credsByHost, directUrlsByChannel
|
|
|
443
544
|
//
|
|
444
545
|
// Precedence: an operator's explicit local value wins, then anything the
|
|
445
546
|
// server explicitly sent, then the derived default.
|
|
446
|
-
...(typeof existingCloudSensing.periodicIntervalMs === 'number'
|
|
547
|
+
...(typeof existingCloudSensing.periodicIntervalMs === 'number' && !resizeGeneratedCadence
|
|
447
548
|
? {}
|
|
448
549
|
: {
|
|
449
|
-
periodicIntervalMs: typeof incoming.cloudSensing.periodicIntervalMs === 'number'
|
|
550
|
+
periodicIntervalMs: !resizeGeneratedCadence && typeof incoming.cloudSensing.periodicIntervalMs === 'number'
|
|
450
551
|
? incoming.cloudSensing.periodicIntervalMs
|
|
451
552
|
: (0, connectorCadence_1.periodicIntervalMsForFeedCount)(mergedCameras.length),
|
|
452
553
|
}),
|
|
@@ -502,7 +603,13 @@ async function runSetupMode(opts) {
|
|
|
502
603
|
});
|
|
503
604
|
let started;
|
|
504
605
|
try {
|
|
505
|
-
|
|
606
|
+
if (opts.resumeSession) {
|
|
607
|
+
client.attach(opts.resumeSession.sessionId, opts.resumeSession.sessionSecret);
|
|
608
|
+
started = { displayCodeFormatted: '', codeExpiresAt: '', pollIntervalMs: opts.resumeSession.pollIntervalMs || 2500 };
|
|
609
|
+
}
|
|
610
|
+
else {
|
|
611
|
+
started = await client.start({ connectorVersion: opts.connectorVersion, platform: process.platform });
|
|
612
|
+
}
|
|
506
613
|
}
|
|
507
614
|
catch (err) {
|
|
508
615
|
const msg = err.message || '';
|
|
@@ -531,47 +638,83 @@ async function runSetupMode(opts) {
|
|
|
531
638
|
}
|
|
532
639
|
let codeExpiresAtMs = Date.parse(started.codeExpiresAt) || Date.now() + 15 * 60 * 1000;
|
|
533
640
|
let displayCodeFormatted = started.displayCodeFormatted;
|
|
534
|
-
log('');
|
|
535
|
-
log('==================================================');
|
|
536
|
-
log(' Your Sense Anything setup code:');
|
|
537
|
-
log('');
|
|
538
|
-
log(` ${started.displayCodeFormatted}`);
|
|
539
|
-
log('');
|
|
540
|
-
log(' In the Sense Anything portal, open Cameras →');
|
|
541
|
-
log(' Add a camera and type this code. This window');
|
|
542
|
-
log(' finishes the rest automatically.');
|
|
543
|
-
log('==================================================');
|
|
544
|
-
log('');
|
|
545
|
-
// Default path: take the owner straight back to the signed-in portal and let
|
|
546
|
-
// it claim this one-time code from the URL fragment. If the OS/browser blocks
|
|
547
|
-
// the launch, the displayed code above remains the complete fallback.
|
|
548
641
|
let portalUrl;
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
log(
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
log('
|
|
642
|
+
if (!opts.resumeSession) {
|
|
643
|
+
log('');
|
|
644
|
+
log('==================================================');
|
|
645
|
+
log(' Your Sense Anything setup code:');
|
|
646
|
+
log('');
|
|
647
|
+
log(` ${started.displayCodeFormatted}`);
|
|
648
|
+
log('');
|
|
649
|
+
log(' In the Sense Anything portal, open Cameras →');
|
|
650
|
+
log(' Add a camera and type this code. This window');
|
|
651
|
+
log(' finishes the rest automatically.');
|
|
652
|
+
log('==================================================');
|
|
653
|
+
log('');
|
|
654
|
+
// Default path: take the owner straight back to the signed-in portal and let
|
|
655
|
+
// it claim this one-time code from the URL fragment. If the OS/browser blocks
|
|
656
|
+
// the launch, the displayed code above remains the complete fallback.
|
|
657
|
+
try {
|
|
658
|
+
portalUrl = buildSetupPortalUrl(started.displayCodeFormatted, opts.portalBaseUrl || exports.DEFAULT_PORTAL_BASE_URL);
|
|
659
|
+
const opened = await (opts.openPortal ?? openSetupPortal)(portalUrl);
|
|
660
|
+
log(opened
|
|
661
|
+
? 'Opened Sense Anything in your browser — sign in if asked. Connecting automatically…'
|
|
662
|
+
: 'Open Sense Anything → Cameras → Add a camera, then type the code shown above.');
|
|
663
|
+
}
|
|
664
|
+
catch {
|
|
665
|
+
log('Open Sense Anything → Cameras → Add a camera, then type the code shown above.');
|
|
666
|
+
}
|
|
667
|
+
log('');
|
|
668
|
+
progress({
|
|
669
|
+
stage: 'waiting_for_account',
|
|
670
|
+
title: 'Connect your Sense Anything account',
|
|
671
|
+
message: portalUrl
|
|
672
|
+
? 'Continue in the Sense Anything portal. This app will finish setup automatically.'
|
|
673
|
+
: 'In Sense Anything, open Cameras, add a camera, and enter this setup code.',
|
|
674
|
+
displayCode: started.displayCodeFormatted,
|
|
675
|
+
...(portalUrl ? { portalUrl } : {}),
|
|
676
|
+
});
|
|
558
677
|
}
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
title: 'Connect your Sense Anything account',
|
|
563
|
-
message: portalUrl
|
|
564
|
-
? 'Continue in the Sense Anything portal. This app will finish setup automatically.'
|
|
565
|
-
: 'In Sense Anything, open Cameras, add a camera, and enter this setup code.',
|
|
566
|
-
displayCode: started.displayCodeFormatted,
|
|
567
|
-
...(portalUrl ? { portalUrl } : {}),
|
|
568
|
-
});
|
|
678
|
+
const savedRecorders = opts.resumeSession
|
|
679
|
+
? savedSetupRecorders(JSON.parse(fs.readFileSync(path.resolve(opts.configPath), 'utf8')))
|
|
680
|
+
: [];
|
|
569
681
|
const pollIntervalMs = Math.max(1500, Math.min(5000, started.pollIntervalMs || 2500));
|
|
570
682
|
const deadline = Date.now() + (opts.maxWaitMs ?? 2 * 60 * 60 * 1000);
|
|
571
683
|
const credsByHost = new Map();
|
|
572
684
|
const directUrlsByChannelKey = new Map();
|
|
573
685
|
const probedByChannelKey = new Map();
|
|
574
686
|
const macByHost = new Map();
|
|
687
|
+
let pendingPath = null;
|
|
688
|
+
if (opts.resumeSession) {
|
|
689
|
+
if (!/^[a-f0-9]{32}$/i.test(opts.resumeSession.sessionId))
|
|
690
|
+
throw new Error('Invalid setup session identity.');
|
|
691
|
+
pendingPath = path.join(path.dirname(path.resolve(opts.configPath)), '.camera-setup-' + opts.resumeSession.sessionId + '.json');
|
|
692
|
+
if (fs.existsSync(pendingPath)) {
|
|
693
|
+
const pending = JSON.parse(fs.readFileSync(pendingPath, 'utf8'));
|
|
694
|
+
if (Date.now() - Number(pending.savedAtMs) < 24 * 60 * 60 * 1000) {
|
|
695
|
+
for (const [key, value] of pending.credentials || [])
|
|
696
|
+
credsByHost.set(key, value);
|
|
697
|
+
for (const [key, value] of pending.directUrls || [])
|
|
698
|
+
directUrlsByChannelKey.set(key, value);
|
|
699
|
+
for (const [key, value] of pending.probes || [])
|
|
700
|
+
probedByChannelKey.set(key, value);
|
|
701
|
+
for (const [key, value] of pending.macs || [])
|
|
702
|
+
macByHost.set(key, value);
|
|
703
|
+
}
|
|
704
|
+
else
|
|
705
|
+
fs.rmSync(pendingPath, { force: true });
|
|
706
|
+
}
|
|
707
|
+
}
|
|
708
|
+
const checkpoint = () => {
|
|
709
|
+
if (!pendingPath)
|
|
710
|
+
return;
|
|
711
|
+
writeSetupConfigAtomic(pendingPath, JSON.stringify({
|
|
712
|
+
savedAtMs: Date.now(), credentials: [...credsByHost], directUrls: [...directUrlsByChannelKey],
|
|
713
|
+
probes: [...probedByChannelKey].map(([key, result]) => [key, {
|
|
714
|
+
channelKey: result.channelKey, status: result.status, host: result.host, serial: result.serial,
|
|
715
|
+
}]), macs: [...macByHost],
|
|
716
|
+
}) + '\n');
|
|
717
|
+
};
|
|
575
718
|
let claimedAnnounced = false;
|
|
576
719
|
let lastClaimIssueAtMs = 0;
|
|
577
720
|
let discoveryReported = false;
|
|
@@ -649,8 +792,17 @@ async function runSetupMode(opts) {
|
|
|
649
792
|
await client.ack(command.commandId);
|
|
650
793
|
return;
|
|
651
794
|
}
|
|
795
|
+
if (command.type === 'probe' && command.useSavedCredentials) {
|
|
796
|
+
const recorder = savedRecorders.find(record => record.id === command.recorderId &&
|
|
797
|
+
record.host === command.host && record.port === (command.port || 554));
|
|
798
|
+
if (!recorder)
|
|
799
|
+
throw new Error('Saved recorder login is unavailable. Enter this recorder login again in the portal.');
|
|
800
|
+
command = { ...command, credentials: recorder.credentials };
|
|
801
|
+
}
|
|
652
802
|
if (command.type === 'probe' && command.host && command.credentials) {
|
|
653
803
|
credsByHost.set(command.host, command.credentials);
|
|
804
|
+
credsByHost.set(command.host + ':' + (command.port || 554), command.credentials);
|
|
805
|
+
checkpoint();
|
|
654
806
|
log(`Checking cameras on ${command.host}…`);
|
|
655
807
|
reportValidationProgress();
|
|
656
808
|
let sentAny = false;
|
|
@@ -660,6 +812,7 @@ async function runSetupMode(opts) {
|
|
|
660
812
|
username: command.credentials.username,
|
|
661
813
|
password: command.credentials.password,
|
|
662
814
|
brandHint: command.brandHint,
|
|
815
|
+
brandHintSource: command.brandHintSource,
|
|
663
816
|
channelHint: command.channelHint,
|
|
664
817
|
pathHint: command.pathHint,
|
|
665
818
|
}, {
|
|
@@ -667,6 +820,7 @@ async function runSetupMode(opts) {
|
|
|
667
820
|
onResult: async (r) => {
|
|
668
821
|
sentAny = true;
|
|
669
822
|
probedByChannelKey.set(r.channelKey, r);
|
|
823
|
+
checkpoint();
|
|
670
824
|
// Acceptance is about THIS result, not about the channel for the
|
|
671
825
|
// life of the run. A leased command is re-delivered, so a channel
|
|
672
826
|
// accepted on an earlier execution must not vouch for the result
|
|
@@ -705,6 +859,7 @@ async function runSetupMode(opts) {
|
|
|
705
859
|
const mac = await (opts.lookupMac ?? RecorderAddressRecovery_1.lookupMacAddress)(command.host);
|
|
706
860
|
if (mac)
|
|
707
861
|
macByHost.set(command.host, mac);
|
|
862
|
+
checkpoint();
|
|
708
863
|
}
|
|
709
864
|
catch {
|
|
710
865
|
// ONVIF serial remains preferred; a missing neighbor-table entry only
|
|
@@ -750,6 +905,7 @@ async function runSetupMode(opts) {
|
|
|
750
905
|
const key = (0, ChannelProber_1.directStreamChannelKey)(streamUrl);
|
|
751
906
|
const info = directStreamInfo(streamUrl, command.name);
|
|
752
907
|
directUrlsByChannelKey.set(key, streamUrl);
|
|
908
|
+
checkpoint();
|
|
753
909
|
await client.heartbeat('probing', 'direct stream link');
|
|
754
910
|
log(`Checking direct camera stream at ${(0, ChannelProber_1.sanitizeRtspUrlForLog)(streamUrl)}…`);
|
|
755
911
|
reportValidationProgress();
|
|
@@ -818,7 +974,7 @@ async function runSetupMode(opts) {
|
|
|
818
974
|
// Unknown/malformed command — ack it away so the queue can't wedge.
|
|
819
975
|
await client.ack(command.commandId).catch(() => { });
|
|
820
976
|
};
|
|
821
|
-
while (Date.now() < deadline) {
|
|
977
|
+
while (Date.now() < deadline && !opts.signal?.aborted) {
|
|
822
978
|
let polled;
|
|
823
979
|
try {
|
|
824
980
|
polled = await client.poll();
|
|
@@ -945,20 +1101,31 @@ async function runSetupMode(opts) {
|
|
|
945
1101
|
catch {
|
|
946
1102
|
existingRaw = null;
|
|
947
1103
|
}
|
|
948
|
-
const merged = mergeConfigFile(existingRaw, polled.config, credsByHost, directUrlsByChannelKey, probedByChannelKey, macByHost);
|
|
949
1104
|
try {
|
|
950
|
-
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
955
|
-
|
|
1105
|
+
if (opts.resumeSession && polled.config.operation !== 'add') {
|
|
1106
|
+
throw new Error('An existing connector accepts only an additive setup recipe.');
|
|
1107
|
+
}
|
|
1108
|
+
const merged = mergeConfigFile(existingRaw, polled.config, credsByHost, directUrlsByChannelKey, probedByChannelKey, macByHost);
|
|
1109
|
+
if (opts.resumeSession) {
|
|
1110
|
+
if (!existingRaw || !opts.applyConfig)
|
|
1111
|
+
throw new Error('Add cameras requires a runtime configuration transaction.');
|
|
1112
|
+
await opts.applyConfig(merged, existingRaw);
|
|
956
1113
|
}
|
|
957
|
-
|
|
958
|
-
|
|
1114
|
+
else {
|
|
1115
|
+
fs.writeFileSync(resolved, JSON.stringify(merged, null, 2) + '\n', { mode: 0o600 });
|
|
1116
|
+
// mode: only applies when CREATING the file — an existing 0644 config
|
|
1117
|
+
// (trillboards-edge init / hand-made) must be tightened too: it now
|
|
1118
|
+
// holds camera credentials.
|
|
1119
|
+
try {
|
|
1120
|
+
fs.chmodSync(resolved, 0o600);
|
|
1121
|
+
}
|
|
1122
|
+
catch {
|
|
1123
|
+
/* best-effort (Windows ACLs) — the write above succeeded */
|
|
1124
|
+
}
|
|
959
1125
|
}
|
|
960
1126
|
}
|
|
961
1127
|
catch (err) {
|
|
1128
|
+
await client.heartbeat('setup_failed', 'Camera settings could not be applied. Retry Add cameras.').catch(() => { });
|
|
962
1129
|
log(`Could not save the camera configuration: ${err.message}`);
|
|
963
1130
|
log(`Fix the file permissions on ${resolved} and run setup again — your cameras are already created.`);
|
|
964
1131
|
progress({
|
|
@@ -971,6 +1138,8 @@ async function runSetupMode(opts) {
|
|
|
971
1138
|
return 1;
|
|
972
1139
|
}
|
|
973
1140
|
await client.heartbeat('config_applied').catch(() => { });
|
|
1141
|
+
if (pendingPath)
|
|
1142
|
+
fs.rmSync(pendingPath, { force: true });
|
|
974
1143
|
log('');
|
|
975
1144
|
log(`✓ ${polled.config.cameras.length} camera(s) configured — starting sensing.`);
|
|
976
1145
|
log('You can close this window. The portal shows each camera as it comes online.');
|