instar 1.3.1601 → 1.3.1603
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/dashboard/console/nav-model.js +2 -0
- package/dashboard/glance.js +1 -0
- package/dashboard/index.html +23 -0
- package/dashboard/phones.js +146 -0
- package/dist/commands/init.d.ts +7 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +8 -1
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/server.d.ts.map +1 -1
- package/dist/commands/server.js +38 -0
- package/dist/commands/server.js.map +1 -1
- package/dist/core/BrowserCareProbes.d.ts +15 -0
- package/dist/core/BrowserCareProbes.d.ts.map +1 -0
- package/dist/core/BrowserCareProbes.js +78 -0
- package/dist/core/BrowserCareProbes.js.map +1 -0
- package/dist/core/MachineLockStateReader.d.ts +34 -0
- package/dist/core/MachineLockStateReader.d.ts.map +1 -0
- package/dist/core/MachineLockStateReader.js +114 -0
- package/dist/core/MachineLockStateReader.js.map +1 -0
- package/dist/core/MobileDeviceKeys.d.ts +7 -4
- package/dist/core/MobileDeviceKeys.d.ts.map +1 -1
- package/dist/core/MobileDeviceKeys.js +16 -5
- package/dist/core/MobileDeviceKeys.js.map +1 -1
- package/dist/core/MobilePush.d.ts +15 -4
- package/dist/core/MobilePush.d.ts.map +1 -1
- package/dist/core/MobilePush.js +16 -3
- package/dist/core/MobilePush.js.map +1 -1
- package/dist/core/PostUpdateMigrator.d.ts +12 -0
- package/dist/core/PostUpdateMigrator.d.ts.map +1 -1
- package/dist/core/PostUpdateMigrator.js +47 -0
- package/dist/core/PostUpdateMigrator.js.map +1 -1
- package/dist/core/types.d.ts +10 -0
- package/dist/core/types.d.ts.map +1 -1
- package/dist/core/types.js.map +1 -1
- package/dist/data/standards-guard-index.json +1 -1
- package/dist/data/standards-guard-index.meta.json +2 -2
- package/dist/data/standards-registry.meta.json +1 -1
- package/dist/monitoring/machineMaintenance/BrowserCare.d.ts +166 -0
- package/dist/monitoring/machineMaintenance/BrowserCare.d.ts.map +1 -0
- package/dist/monitoring/machineMaintenance/BrowserCare.js +334 -0
- package/dist/monitoring/machineMaintenance/BrowserCare.js.map +1 -0
- package/dist/monitoring/machineMaintenance/lockState.d.ts +34 -0
- package/dist/monitoring/machineMaintenance/lockState.d.ts.map +1 -0
- package/dist/monitoring/machineMaintenance/lockState.js +53 -0
- package/dist/monitoring/machineMaintenance/lockState.js.map +1 -0
- package/dist/monitoring/machineMaintenance/readings.d.ts +4 -0
- package/dist/monitoring/machineMaintenance/readings.d.ts.map +1 -1
- package/dist/monitoring/machineMaintenance/readings.js +2 -1
- package/dist/monitoring/machineMaintenance/readings.js.map +1 -1
- package/dist/native/instar-desktop-host +0 -0
- package/dist/scaffold/templates.d.ts.map +1 -1
- package/dist/scaffold/templates.js +3 -1
- package/dist/scaffold/templates.js.map +1 -1
- package/dist/server/AgentServer.d.ts.map +1 -1
- package/dist/server/AgentServer.js +6 -0
- package/dist/server/AgentServer.js.map +1 -1
- package/dist/server/CapabilityIndex.js +4 -4
- package/dist/server/CapabilityIndex.js.map +1 -1
- package/dist/server/mobilePairingRoutes.d.ts +32 -2
- package/dist/server/mobilePairingRoutes.d.ts.map +1 -1
- package/dist/server/mobilePairingRoutes.js +149 -13
- package/dist/server/mobilePairingRoutes.js.map +1 -1
- package/dist/server/routes.d.ts.map +1 -1
- package/dist/server/routes.js +19 -1
- package/dist/server/routes.js.map +1 -1
- package/package.json +1 -1
- package/scripts/blocking-decision-surfaces-baseline.json +22 -2
- package/src/data/builtin-manifest.json +64 -64
- package/src/data/standards-guard-index.json +1 -1
- package/src/data/standards-guard-index.meta.json +2 -2
- package/src/data/standards-registry.meta.json +1 -1
- package/src/data/state-coherence-registry.json +37 -0
- package/src/scaffold/templates.ts +3 -1
- package/src/templates/scripts/browser/chrome-close.sh +97 -0
- package/src/templates/scripts/browser/chrome-js.sh +2 -0
- package/src/templates/scripts/browser/chrome-launch.sh +16 -3
- package/src/templates/scripts/browser/chrome-ledger.sh +49 -0
- package/src/templates/scripts/browser/chrome-renew.sh +38 -0
- package/src/templates/scripts/browser/chrome-unsaved.sh +83 -0
- package/upgrades/1.3.1602.md +24 -0
- package/upgrades/1.3.1603.md +26 -0
- package/upgrades/side-effects/machine-self-maintenance-browser-care-lock-reading.md +98 -0
- package/upgrades/side-effects/mobile-native-conversations-inc3.md +116 -0
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { TabCheck } from '../monitoring/machineMaintenance/BrowserCare.js';
|
|
2
|
+
export declare const UNSAVED_CHECK_TIMEOUT_MS = 60000;
|
|
3
|
+
/**
|
|
4
|
+
* Parses `chrome-unsaved.sh` output: one `tab <window>.<tab> yes|no|unreadable` line per
|
|
5
|
+
* tab, then `done`. Output without `done`, or with no tab lines, is unreadable: nothing is
|
|
6
|
+
* closed to find out.
|
|
7
|
+
*/
|
|
8
|
+
export declare function parseUnsavedOutput(output: string): TabCheck[] | 'unreadable';
|
|
9
|
+
/** Runs the installed helper for one profile. A non-zero exit or a timeout is unreadable. */
|
|
10
|
+
export declare function makeTabChecker(agentHome: string, platform?: NodeJS.Platform): (userDataDir: string) => Promise<TabCheck[] | 'unreadable'>;
|
|
11
|
+
/** The profile's download folder: its own setting, else ~/Downloads. */
|
|
12
|
+
export declare function downloadFolder(userDataDir: string, home?: string): string;
|
|
13
|
+
/** True when a `.crdownload` in that folder changed in the last `freshMs`; null when unreadable. */
|
|
14
|
+
export declare function makeDownloadCheck(freshMs: number, now?: () => number, home?: string): (userDataDir: string) => Promise<boolean | null>;
|
|
15
|
+
//# sourceMappingURL=BrowserCareProbes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrowserCareProbes.d.ts","sourceRoot":"","sources":["../../src/core/BrowserCareProbes.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iDAAiD,CAAC;AAEhF,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAE/C;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE,GAAG,YAAY,CAU5E;AAED,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,GAAE,MAAM,CAAC,QAA2B,iBAEvE,MAAM,KAAG,OAAO,CAAC,QAAQ,EAAE,GAAG,YAAY,CAAC,CAKjE;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,GAAE,MAAqB,GAAG,MAAM,CAOvF;AAED,oGAAoG;AACpG,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,MAAiB,EAAE,IAAI,GAAE,MAAqB,iBAC/E,MAAM,KAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAY5D"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The two reads the browser-care sweep needs that touch a running browser or its
|
|
3
|
+
* folders (docs/specs/machine-self-maintenance.md, Part B, "Unsaved input and
|
|
4
|
+
* downloads"). Both are reads. Kept outside `monitoring/machineMaintenance/` because
|
|
5
|
+
* the per-tab check runs the installed `chrome-unsaved.sh` helper, and that folder
|
|
6
|
+
* holds a source rule that it cannot run any command but its fixed readings.
|
|
7
|
+
*/
|
|
8
|
+
import { execFile } from 'node:child_process';
|
|
9
|
+
import fs from 'node:fs';
|
|
10
|
+
import os from 'node:os';
|
|
11
|
+
import path from 'node:path';
|
|
12
|
+
export const UNSAVED_CHECK_TIMEOUT_MS = 60_000;
|
|
13
|
+
/**
|
|
14
|
+
* Parses `chrome-unsaved.sh` output: one `tab <window>.<tab> yes|no|unreadable` line per
|
|
15
|
+
* tab, then `done`. Output without `done`, or with no tab lines, is unreadable: nothing is
|
|
16
|
+
* closed to find out.
|
|
17
|
+
*/
|
|
18
|
+
export function parseUnsavedOutput(output) {
|
|
19
|
+
const lines = output.split('\n').map((l) => l.trim()).filter(Boolean);
|
|
20
|
+
if (lines[lines.length - 1] !== 'done')
|
|
21
|
+
return 'unreadable';
|
|
22
|
+
const tabs = [];
|
|
23
|
+
for (const line of lines.slice(0, -1)) {
|
|
24
|
+
const m = /^tab \d+\.\d+ (yes|no|unreadable)$/.exec(line);
|
|
25
|
+
if (!m)
|
|
26
|
+
return 'unreadable';
|
|
27
|
+
tabs.push(m[1]);
|
|
28
|
+
}
|
|
29
|
+
return tabs.length > 0 ? tabs : 'unreadable';
|
|
30
|
+
}
|
|
31
|
+
/** Runs the installed helper for one profile. A non-zero exit or a timeout is unreadable. */
|
|
32
|
+
export function makeTabChecker(agentHome, platform = process.platform) {
|
|
33
|
+
const script = path.join(agentHome, '.instar', 'scripts', 'browser', 'chrome-unsaved.sh');
|
|
34
|
+
return (userDataDir) => new Promise((resolve) => {
|
|
35
|
+
if (platform !== 'darwin' || !fs.existsSync(script)) {
|
|
36
|
+
resolve('unreadable');
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
execFile('/bin/bash', [script, userDataDir], { timeout: UNSAVED_CHECK_TIMEOUT_MS, maxBuffer: 64 * 1024 }, (err, stdout) => resolve(err ? 'unreadable' : parseUnsavedOutput(stdout)));
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
/** The profile's download folder: its own setting, else ~/Downloads. */
|
|
43
|
+
export function downloadFolder(userDataDir, home = os.homedir()) {
|
|
44
|
+
try {
|
|
45
|
+
const prefs = JSON.parse(fs.readFileSync(path.join(userDataDir, 'Default', 'Preferences'), 'utf-8'));
|
|
46
|
+
const dir = prefs.download?.default_directory;
|
|
47
|
+
if (typeof dir === 'string' && path.isAbsolute(dir))
|
|
48
|
+
return dir;
|
|
49
|
+
}
|
|
50
|
+
catch { /* @silent-fallback-ok — an unreadable Preferences file uses Chrome's default folder. */ }
|
|
51
|
+
return path.join(home, 'Downloads');
|
|
52
|
+
}
|
|
53
|
+
/** True when a `.crdownload` in that folder changed in the last `freshMs`; null when unreadable. */
|
|
54
|
+
export function makeDownloadCheck(freshMs, now = Date.now, home = os.homedir()) {
|
|
55
|
+
return async (userDataDir) => {
|
|
56
|
+
const folder = downloadFolder(userDataDir, home);
|
|
57
|
+
let names;
|
|
58
|
+
try {
|
|
59
|
+
names = fs.readdirSync(folder);
|
|
60
|
+
}
|
|
61
|
+
catch (err) {
|
|
62
|
+
return err.code === 'ENOENT' ? false : null;
|
|
63
|
+
} // @silent-fallback-ok — null is reported as unreadable and keeps the browser
|
|
64
|
+
for (const name of names) {
|
|
65
|
+
if (!name.endsWith('.crdownload'))
|
|
66
|
+
continue;
|
|
67
|
+
try {
|
|
68
|
+
if (now() - fs.statSync(path.join(folder, name)).mtimeMs < freshMs)
|
|
69
|
+
return true;
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return null;
|
|
73
|
+
} // @silent-fallback-ok — null is reported as unreadable and keeps the browser
|
|
74
|
+
}
|
|
75
|
+
return false;
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=BrowserCareProbes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BrowserCareProbes.js","sourceRoot":"","sources":["../../src/core/BrowserCareProbes.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC;AAE/C;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,MAAM;QAAE,OAAO,YAAY,CAAC;IAC5D,MAAM,IAAI,GAAe,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,oCAAoC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,CAAC;YAAE,OAAO,YAAY,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAa,CAAC,CAAC;IAC9B,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;AAC/C,CAAC;AAED,6FAA6F;AAC7F,MAAM,UAAU,cAAc,CAAC,SAAiB,EAAE,QAAQ,GAAoB,OAAO,CAAC,QAAQ;IAC5F,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,mBAAmB,CAAC,CAAC;IAC1F,OAAO,CAAC,WAAmB,EAAsC,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC1F,IAAI,QAAQ,KAAK,QAAQ,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAAC,OAAO,CAAC,YAAY,CAAC,CAAC;YAAC,OAAO;QAAC,CAAC;QACvF,QAAQ,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,EAAE,EACtG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wEAAwE;AACxE,MAAM,UAAU,cAAc,CAAC,WAAmB,EAAE,IAAI,GAAW,EAAE,CAAC,OAAO,EAAE;IAC7E,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE,OAAO,CAAC,CAAmD,CAAC;QACvJ,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,iBAAiB,CAAC;QAC9C,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,GAAG,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC,CAAC,wFAAwF,CAAC,CAAC;IACpG,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AACtC,CAAC;AAED,oGAAoG;AACpG,MAAM,UAAU,iBAAiB,CAAC,OAAe,EAAE,GAAG,GAAiB,IAAI,CAAC,GAAG,EAAE,IAAI,GAAW,EAAE,CAAC,OAAO,EAAE;IAC1G,OAAO,KAAK,EAAE,WAAmB,EAA2B,EAAE;QAC5D,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACjD,IAAI,KAAe,CAAC;QACpB,IAAI,CAAC;YAAC,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAAC,CAAC;QACvC,OAAO,GAAG,EAAE,CAAC;YAAC,OAAQ,GAA6B,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAAC,CAAC,CAAC,6EAA6E;QACrK,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAAE,SAAS;YAC5C,IAAI,CAAC;gBAAC,IAAI,GAAG,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,GAAG,OAAO;oBAAE,OAAO,IAAI,CAAC;YAAC,CAAC;YACxF,MAAM,CAAC;gBAAC,OAAO,IAAI,CAAC;YAAC,CAAC,CAAC,6EAA6E;QACtG,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { type LockReadingInputs, type LockVerdict, type PasswordRequired } from '../monitoring/machineMaintenance/lockState.js';
|
|
2
|
+
export interface LockStateReport extends LockVerdict {
|
|
3
|
+
platform: NodeJS.Platform;
|
|
4
|
+
readAt: string;
|
|
5
|
+
/** Kept for readers of the old field: the raw flag, never the verdict. */
|
|
6
|
+
screenLocked: boolean | null;
|
|
7
|
+
}
|
|
8
|
+
export interface MachineLockStateReaderDeps {
|
|
9
|
+
platform?: NodeJS.Platform;
|
|
10
|
+
now?: () => number;
|
|
11
|
+
/** Raw helper probe output (one JSON line), or null when the helper cannot run. */
|
|
12
|
+
runProbe?: () => Promise<string | null>;
|
|
13
|
+
/** Raw `sysadminctl -screenLock status` output (stdout + stderr), or null. */
|
|
14
|
+
runPolicy?: () => Promise<string | null>;
|
|
15
|
+
/** True on Windows-with-WSL, where the session to read is Windows'. */
|
|
16
|
+
wsl?: boolean;
|
|
17
|
+
}
|
|
18
|
+
/** Builds the table inputs from the helper's probe line. A stale or partial sample reads as unreadable. */
|
|
19
|
+
export declare function inputsFromProbe(raw: string | null, policy: PasswordRequired, nowMs: number): LockReadingInputs;
|
|
20
|
+
export declare class MachineLockStateReader {
|
|
21
|
+
private readonly platform;
|
|
22
|
+
private readonly now;
|
|
23
|
+
private readonly runProbe;
|
|
24
|
+
private readonly runPolicy;
|
|
25
|
+
private readonly wsl;
|
|
26
|
+
private cached;
|
|
27
|
+
private inflight;
|
|
28
|
+
constructor(deps?: MachineLockStateReaderDeps);
|
|
29
|
+
read(): Promise<LockStateReport>;
|
|
30
|
+
private readNow;
|
|
31
|
+
}
|
|
32
|
+
export declare function setActiveMachineLockStateReader(reader: MachineLockStateReader | null): void;
|
|
33
|
+
export declare function getActiveMachineLockStateReader(): MachineLockStateReader | null;
|
|
34
|
+
//# sourceMappingURL=MachineLockStateReader.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MachineLockStateReader.d.ts","sourceRoot":"","sources":["../../src/core/MachineLockStateReader.ts"],"names":[],"mappings":"AAiBA,OAAO,EAEL,KAAK,iBAAiB,EAAE,KAAK,WAAW,EAAE,KAAK,gBAAgB,EAChE,MAAM,+CAA+C,CAAC;AAKvD,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAClD,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,0EAA0E;IAC1E,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,mFAAmF;IACnF,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxC,8EAA8E;IAC9E,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACzC,uEAAuE;IACvE,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAqBD,2GAA2G;AAC3G,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAkB9G;AAED,qBAAa,sBAAsB;IACjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;IAC3C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAe;IACnC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA+B;IACxD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAwD;IACtE,OAAO,CAAC,QAAQ,CAAyC;IAEzD,YAAY,IAAI,GAAE,0BAA+B,EAMhD;IAED,IAAI,IAAI,OAAO,CAAC,eAAe,CAAC,CAQ/B;YAEa,OAAO;CAsBtB;AAGD,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,GAAG,IAAI,CAAqB;AACjH,wBAAgB,+BAA+B,IAAI,sBAAsB,GAAG,IAAI,CAAmB"}
|
|
@@ -0,0 +1,114 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Reads the inputs for the honest lock verdict (docs/specs/machine-self-maintenance.md,
|
|
3
|
+
* Part A) and hands them to the pure table in machineMaintenance/lockState.ts.
|
|
4
|
+
*
|
|
5
|
+
* macOS: the packaged desktop helper's `probe`, run with the lock-input switch so it
|
|
6
|
+
* also reports the shield window, screensaver and display sleep, plus
|
|
7
|
+
* `sysadminctl -screenLock status`. Both are reads: the probe takes no permission,
|
|
8
|
+
* captures nothing and sends no input. Linux has no such session here
|
|
9
|
+
* (`not-applicable`); Windows is not covered yet (`unknown`).
|
|
10
|
+
*
|
|
11
|
+
* One read at a time and a short cache, so a busy dashboard cannot stack helper runs.
|
|
12
|
+
*/
|
|
13
|
+
// RULE 3: EXEMPT — reads the macOS console session from Instar's own desktop helper and sysadminctl; it parses no agent-framework or provider output.
|
|
14
|
+
import { execFile } from 'node:child_process';
|
|
15
|
+
import fs from 'node:fs';
|
|
16
|
+
import { DEFAULT_MAC_DESKTOP_HELPER } from './MacDesktopHost.js';
|
|
17
|
+
import { isWslHost } from './wslPlatform.js';
|
|
18
|
+
import { EMPTY_LOCK_INPUTS, decideLockState, parsePasswordRequired, } from '../monitoring/machineMaintenance/lockState.js';
|
|
19
|
+
const CACHE_MS = 5_000;
|
|
20
|
+
const SAMPLE_MAX_AGE_MS = 5_000;
|
|
21
|
+
const HELPER_ENV = { PATH: '/usr/bin:/bin:/usr/sbin:/sbin', INSTAR_DESKTOP_LOCKED: '1' };
|
|
22
|
+
function defaultProbe() {
|
|
23
|
+
return new Promise((resolve) => {
|
|
24
|
+
if (!fs.existsSync(DEFAULT_MAC_DESKTOP_HELPER)) {
|
|
25
|
+
resolve(null);
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
execFile(DEFAULT_MAC_DESKTOP_HELPER, ['probe'], { timeout: 3_000, maxBuffer: 16_384, env: HELPER_ENV }, (err, stdout) => resolve(err ? null : stdout));
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
function defaultPolicy() {
|
|
32
|
+
return new Promise((resolve) => {
|
|
33
|
+
execFile('/usr/sbin/sysadminctl', ['-screenLock', 'status'], { timeout: 3_000, maxBuffer: 16_384 }, (err, stdout, stderr) => resolve(err ? null : `${stdout}${stderr}`));
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
const bool = (v) => (typeof v === 'boolean' ? v : null);
|
|
37
|
+
/** Builds the table inputs from the helper's probe line. A stale or partial sample reads as unreadable. */
|
|
38
|
+
export function inputsFromProbe(raw, policy, nowMs) {
|
|
39
|
+
if (raw === null)
|
|
40
|
+
return { ...EMPTY_LOCK_INPUTS, passwordRequired: policy };
|
|
41
|
+
let probe;
|
|
42
|
+
try {
|
|
43
|
+
probe = JSON.parse(raw.trim());
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return { ...EMPTY_LOCK_INPUTS, passwordRequired: policy };
|
|
47
|
+
} // @silent-fallback-ok — an unparseable probe is every input unreadable, so the verdict is unknown.
|
|
48
|
+
const lock = probe.lockInputs && typeof probe.lockInputs === 'object' ? probe.lockInputs : null;
|
|
49
|
+
const fresh = lock !== null && typeof lock.sampledAtMs === 'number' && Math.abs(nowMs - lock.sampledAtMs) <= SAMPLE_MAX_AGE_MS;
|
|
50
|
+
const console = bool(probe.consoleSessionPresent);
|
|
51
|
+
const onConsole = bool(probe.onConsole);
|
|
52
|
+
return {
|
|
53
|
+
flagLocked: bool(probe.screenLocked),
|
|
54
|
+
passwordRequired: policy,
|
|
55
|
+
screensaverRunning: fresh ? bool(lock.screensaver) : null,
|
|
56
|
+
displayAsleep: fresh ? bool(lock.displayAsleep) : null,
|
|
57
|
+
lockShieldSeen: fresh ? bool(lock.shieldWindow) : null,
|
|
58
|
+
consoleSession: console === null || onConsole === null ? null : console && onConsole,
|
|
59
|
+
loginDone: bool(probe.loginDone),
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
export class MachineLockStateReader {
|
|
63
|
+
platform;
|
|
64
|
+
now;
|
|
65
|
+
runProbe;
|
|
66
|
+
runPolicy;
|
|
67
|
+
wsl;
|
|
68
|
+
cached = null;
|
|
69
|
+
inflight = null;
|
|
70
|
+
constructor(deps = {}) {
|
|
71
|
+
this.platform = deps.platform ?? process.platform;
|
|
72
|
+
this.now = deps.now ?? Date.now;
|
|
73
|
+
this.runProbe = deps.runProbe ?? defaultProbe;
|
|
74
|
+
this.runPolicy = deps.runPolicy ?? defaultPolicy;
|
|
75
|
+
this.wsl = deps.wsl ?? isWslHost(this.platform);
|
|
76
|
+
}
|
|
77
|
+
read() {
|
|
78
|
+
if (this.cached && this.now() - this.cached.at < CACHE_MS)
|
|
79
|
+
return Promise.resolve(this.cached.report);
|
|
80
|
+
if (this.inflight)
|
|
81
|
+
return this.inflight;
|
|
82
|
+
this.inflight = this.readNow().then((report) => {
|
|
83
|
+
this.cached = { at: this.now(), report };
|
|
84
|
+
return report;
|
|
85
|
+
}).finally(() => { this.inflight = null; });
|
|
86
|
+
return this.inflight;
|
|
87
|
+
}
|
|
88
|
+
async readNow() {
|
|
89
|
+
const readAt = new Date(this.now()).toISOString();
|
|
90
|
+
if (this.platform !== 'darwin') {
|
|
91
|
+
const notApplicable = this.platform === 'linux' && !this.wsl;
|
|
92
|
+
return {
|
|
93
|
+
lockState: notApplicable ? 'not-applicable' : 'unknown', row: 0,
|
|
94
|
+
reason: notApplicable ? 'no console lock session is read on Linux' : 'this platform does not read its own lock state yet',
|
|
95
|
+
inputs: { ...EMPTY_LOCK_INPUTS }, platform: this.platform, readAt, screenLocked: null,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
const [probe, policyRaw] = await Promise.all([
|
|
99
|
+
this.runProbe().catch(() => null), // @silent-fallback-ok — an unreadable input makes the verdict unknown, with the reason
|
|
100
|
+
this.runPolicy().catch(() => null), // @silent-fallback-ok — an unreadable input makes the verdict unknown, with the reason
|
|
101
|
+
]);
|
|
102
|
+
const inputs = inputsFromProbe(probe, policyRaw === null ? null : parsePasswordRequired(policyRaw), this.now());
|
|
103
|
+
const verdict = decideLockState(inputs);
|
|
104
|
+
return {
|
|
105
|
+
...verdict,
|
|
106
|
+
reason: probe === null ? `desktop helper unavailable; ${verdict.reason}` : verdict.reason,
|
|
107
|
+
platform: this.platform, readAt, screenLocked: inputs.flagLocked,
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
let active = null;
|
|
112
|
+
export function setActiveMachineLockStateReader(reader) { active = reader; }
|
|
113
|
+
export function getActiveMachineLockStateReader() { return active; }
|
|
114
|
+
//# sourceMappingURL=MachineLockStateReader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MachineLockStateReader.js","sourceRoot":"","sources":["../../src/core/MachineLockStateReader.ts"],"names":[],"mappings":"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"}
|
|
@@ -156,8 +156,11 @@ export declare class DeviceRegistry {
|
|
|
156
156
|
ok: false;
|
|
157
157
|
wrongHmac: string;
|
|
158
158
|
}): DeviceRecord | null;
|
|
159
|
-
/**
|
|
160
|
-
|
|
159
|
+
/**
|
|
160
|
+
* Boot and lease loss: no pending device can be confirmed any more. `except` keeps the named
|
|
161
|
+
* devices pending (a lease move does not expire a dashboard-path device, mobile-native-conversations §4.4).
|
|
162
|
+
*/
|
|
163
|
+
expireAllPending(except?: ReadonlySet<string>): void;
|
|
161
164
|
decline(id: string): void;
|
|
162
165
|
/**
|
|
163
166
|
* Terminal; always allowed. Returns false when this machine holds no such device. `at` is the
|
|
@@ -190,8 +193,8 @@ export declare class ConfirmationCodes {
|
|
|
190
193
|
result: 'none';
|
|
191
194
|
};
|
|
192
195
|
drop(deviceId: string): void;
|
|
193
|
-
/** Lease loss: no code issued before it may confirm anything. */
|
|
194
|
-
clearAll(): void;
|
|
196
|
+
/** Lease loss: no code issued before it may confirm anything (`except`: dashboard-path devices keep theirs). */
|
|
197
|
+
clearAll(except?: ReadonlySet<string>): void;
|
|
195
198
|
/** Forget codes past their expiry (bounded memory). */
|
|
196
199
|
prune(): void;
|
|
197
200
|
/** Device ids whose live code appears in `text` (6 digits, spaced or not). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MobileDeviceKeys.d.ts","sourceRoot":"","sources":["../../src/core/MobileDeviceKeys.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,MAAM,MAAM,aAAa,CAAC;AAIjC,eAAO,MAAM,kBAAkB,qBAAqB,CAAC;AACrD,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAC5C,eAAO,MAAM,aAAa,QAAa,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAQ,CAAC;AAC3C,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAErF,uEAAuE;AACvE,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAkE,CAAC;AAExH,wBAAgB,WAAW,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,YAAY,CAG1E;AAQD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,SAAS,GAAG,IAAI,CAY1E;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAG9D;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAG1J;AAMD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAiBpD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,gBAAgB,GAAG,oBAAoB,GAAG,OAAO,GAAG,eAAe,GAAG,QAAQ,GAAG,cAAc,CAAA;CAAE,CAAC;AAEzI;;;;GAIG;AACH,qBAAa,WAAW;IAEV,OAAO,CAAC,QAAQ,CAAC,GAAG;IADhC,OAAO,CAAC,IAAI,CAA0C;IACtD,YAA6B,GAAG,GAAE,MAAM,MAAiB,EAAI;IAE7D;;;OAGG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,CAUtF;CACF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAE,GAAG,IAAI,EAC9F,aAAa,EAAE,WAAW,CAAC,YAAY,CAAC,EACxC,MAAM,EAAE,WAAW,EACnB,GAAG,GAAE,MAAmB,EACxB,SAAS,UAAQ,GAChB,YAAY,CAsBd;AAID,eAAO,MAAM,cAAc,QAAc,CAAC;AAC1C,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,YAAY,KAAK,CAAC;AAC/B,eAAO,MAAM,sBAAsB,QAAmB,CAAC;AAIvD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,YAAY,GAAG,cAAc,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,WAAW,CAAC,EAAE,aAAa,GAAG,eAAe,CAAC;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4FAA4F;IAC5F,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;mGAC+F;IAC/F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;IAC3C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,GAAG,mBAAmB,CAAA;CAAE,CAAC;AASjF,qBAAa,cAAc;IAEK,OAAO,CAAC,QAAQ,CAAC,GAAG;IADlD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,QAAQ,EAAE,MAAM,EAAmB,GAAG,GAAE,MAAM,MAAiB,EAE1E;IAED,OAAO,CAAC,IAAI;IAaZ,OAAO,CAAC,KAAK;IAOb,6FAA6F;IAC7F,OAAO,CAAC,SAAS;IAqBjB,IAAI,IAAI,YAAY,EAAE,CAAgD;IACtE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAAyD;IAE7F,aAAa,IAAI,OAAO,CAAsF;IAE9G,4FAA4F;IAC5F,aAAa,CAAC,GAAG,EAAE;QAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACrG;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,eAAe,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAcpH;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAIvB;IAED,0FAA0F;IAC1F,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,aAAa,GAAG,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,GAAG,IAAI,CAiB1K;IAED
|
|
1
|
+
{"version":3,"file":"MobileDeviceKeys.d.ts","sourceRoot":"","sources":["../../src/core/MobileDeviceKeys.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,MAAM,MAAM,aAAa,CAAC;AAIjC,eAAO,MAAM,kBAAkB,qBAAqB,CAAC;AACrD,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAC5C,eAAO,MAAM,aAAa,QAAa,CAAC;AACxC,eAAO,MAAM,qBAAqB,OAAQ,CAAC;AAC3C,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,GAAG,SAAS,CAAC;AAErF,uEAAuE;AACvE,eAAO,MAAM,WAAW,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAkE,CAAC;AAExH,wBAAgB,WAAW,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,GAAG,YAAY,CAG1E;AAQD;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAAC,SAAS,GAAG,IAAI,CAY1E;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAG9D;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAG1J;AAMD;;;GAGG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAiBpD;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,WAAW,GAAG,gBAAgB,GAAG,oBAAoB,GAAG,OAAO,GAAG,eAAe,GAAG,QAAQ,GAAG,cAAc,CAAA;CAAE,CAAC;AAEzI;;;;GAIG;AACH,qBAAa,WAAW;IAEV,OAAO,CAAC,QAAQ,CAAC,GAAG;IADhC,OAAO,CAAC,IAAI,CAA0C;IACtD,YAA6B,GAAG,GAAE,MAAM,MAAiB,EAAI;IAE7D;;;OAGG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,UAAQ,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,CAUtF;CACF;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,kBAAkB,EACzB,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,YAAY,CAAA;CAAE,GAAG,IAAI,EAC9F,aAAa,EAAE,WAAW,CAAC,YAAY,CAAC,EACxC,MAAM,EAAE,WAAW,EACnB,GAAG,GAAE,MAAmB,EACxB,SAAS,UAAQ,GAChB,YAAY,CAsBd;AAID,eAAO,MAAM,cAAc,QAAc,CAAC;AAC1C,eAAO,MAAM,WAAW,KAAK,CAAC;AAC9B,eAAO,MAAM,oBAAoB,IAAI,CAAC;AACtC,eAAO,MAAM,YAAY,KAAK,CAAC;AAC/B,eAAO,MAAM,sBAAsB,QAAmB,CAAC;AAIvD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,YAAY,GAAG,cAAc,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gGAAgG;IAChG,WAAW,CAAC,EAAE,aAAa,GAAG,eAAe,CAAC;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4FAA4F;IAC5F,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB;mGAC+F;IAC/F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;IAC3C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,GAAG,YAAY,CAAC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,kBAAkB,GAC1B;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC/C;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,YAAY,GAAG,gBAAgB,GAAG,mBAAmB,CAAA;CAAE,CAAC;AASjF,qBAAa,cAAc;IAEK,OAAO,CAAC,QAAQ,CAAC,GAAG;IADlD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,YAAY,QAAQ,EAAE,MAAM,EAAmB,GAAG,GAAE,MAAM,MAAiB,EAE1E;IAED,OAAO,CAAC,IAAI;IAaZ,OAAO,CAAC,KAAK;IAOb,6FAA6F;IAC7F,OAAO,CAAC,SAAS;IAqBjB,IAAI,IAAI,YAAY,EAAE,CAAgD;IACtE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAAyD;IAE7F,aAAa,IAAI,OAAO,CAAsF;IAE9G,4FAA4F;IAC5F,aAAa,CAAC,GAAG,EAAE;QAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACrG;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,YAAY,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,eAAe,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAcpH;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAIvB;IAED,0FAA0F;IAC1F,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,EAAE,EAAE,IAAI,CAAC;QAAC,WAAW,CAAC,EAAE,aAAa,GAAG,eAAe,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,EAAE,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,GAAG,IAAI,CAiB1K;IAED;;;OAGG;IACH,gBAAgB,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAKnD;IAED,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAIxB;IAED;;;OAGG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAMvC;IAED;;;;OAIG;IACH,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,gBAAgB,GAAG,kBAAkB,CAsB3D;IAED,iGAAiG;IACjG,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAQvD;CACF;AAUD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,0EAA0E;AAC1E,qBAAa,iBAAiB;IAEhB,OAAO,CAAC,QAAQ,CAAC,GAAG;IADhC,OAAO,CAAC,KAAK,CAA0D;IACvE,YAA6B,GAAG,GAAE,MAAM,MAAiB,EAAI;IAE7D,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAIjD;IAED,8EAA8E;IAC9E,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG;QAAE,MAAM,EAAE,IAAI,CAAA;KAAE,GAAG;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAQhH;IAED,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAiC;IAE7D,gHAAgH;IAChH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAG3C;IAED,uDAAuD;IACvD,KAAK,IAAI,IAAI,CAAyG;IAEtH,8EAA8E;IAC9E,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAW/B;CACF"}
|
|
@@ -286,12 +286,15 @@ export class DeviceRegistry {
|
|
|
286
286
|
this.write(f);
|
|
287
287
|
return d;
|
|
288
288
|
}
|
|
289
|
-
/**
|
|
290
|
-
|
|
289
|
+
/**
|
|
290
|
+
* Boot and lease loss: no pending device can be confirmed any more. `except` keeps the named
|
|
291
|
+
* devices pending (a lease move does not expire a dashboard-path device, mobile-native-conversations §4.4).
|
|
292
|
+
*/
|
|
293
|
+
expireAllPending(except) {
|
|
291
294
|
const f = this.normalize(this.read());
|
|
292
295
|
let changed = false;
|
|
293
296
|
for (const d of f.devices)
|
|
294
|
-
if (d.status === 'pending') {
|
|
297
|
+
if (d.status === 'pending' && !except?.has(d.id)) {
|
|
295
298
|
d.status = 'expired';
|
|
296
299
|
d.expiresAt = new Date(this.now()).toISOString();
|
|
297
300
|
changed = true;
|
|
@@ -410,8 +413,16 @@ export class ConfirmationCodes {
|
|
|
410
413
|
return { result: 'wrong', hmac: h };
|
|
411
414
|
}
|
|
412
415
|
drop(deviceId) { this.codes.delete(deviceId); }
|
|
413
|
-
/** Lease loss: no code issued before it may confirm anything. */
|
|
414
|
-
clearAll() {
|
|
416
|
+
/** Lease loss: no code issued before it may confirm anything (`except`: dashboard-path devices keep theirs). */
|
|
417
|
+
clearAll(except) {
|
|
418
|
+
if (!except?.size) {
|
|
419
|
+
this.codes.clear();
|
|
420
|
+
return;
|
|
421
|
+
}
|
|
422
|
+
for (const id of [...this.codes.keys()])
|
|
423
|
+
if (!except.has(id))
|
|
424
|
+
this.codes.delete(id);
|
|
425
|
+
}
|
|
415
426
|
/** Forget codes past their expiry (bounded memory). */
|
|
416
427
|
prune() { const t = this.now(); for (const [id, e] of this.codes)
|
|
417
428
|
if (e.expiresAt <= t)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MobileDeviceKeys.js","sourceRoot":"","sources":["../../src/core/MobileDeviceKeys.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,CAAC,MAAM,kBAAkB,GAAG,kBAAkB,CAAC;AACrD,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAC5C,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAG,MAAM,CAAC;AACxC,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC;AAC3C,4DAA4D;AAC5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,CAAC;AAIvC,uEAAuE;AACvE,MAAM,CAAC,MAAM,WAAW,GAAiC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;AAExH,MAAM,UAAU,WAAW,CAAC,CAAe,EAAE,CAAe;IAC1D,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACzD,OAAO,WAAW,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClD,CAAC;AAED,gEAAgE;AAChE,SAAS,MAAM,CAAC,CAAU;IACxB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,GAAG;QAAE,OAAO,IAAI,CAAC;IACxF,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;AACrC,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAY;IAC/C,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACpE,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,eAAe,CAAC;YAC5B,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;YAC7H,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,+FAA+F;QAC/F,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,gFAAgF;AAChF,MAAM,UAAU,iBAAiB,CAAC,YAAoB;IACpD,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9H,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,IAAY,EAAE,MAAc,EAAE,aAAqB,EAAE,MAAc,EAAE,OAA2B;IAChJ,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9F,OAAO,GAAG,kBAAkB,KAAK,QAAQ,KAAK,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,WAAW,EAAE,KAAK,aAAa,KAAK,MAAM,KAAK,QAAQ,EAAE,CAAC;AACxI,CAAC;AAED,uDAAuD;AACvD,MAAM,MAAM,GAAG,MAAM,CAAC,oEAAoE,CAAC,CAAC;AAC5F,MAAM,WAAW,GAAG,MAAM,IAAI,EAAE,CAAC;AAEjC;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,KAAK,CAAC;IACpG,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,MAAM,OAAO,GAAG,GAAkB,EAAE;QAClC,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QACjC,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACvB,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QACxF,MAAM,KAAK,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;QAC/C,IAAI,KAAK,CAAC,CAAC,CAAE,GAAG,IAAI;YAAE,OAAO,IAAI,CAAC,CAAkC,WAAW;QAC/E,IAAI,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,GAAG,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,CAAC,cAAc;QACpF,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;QACb,OAAO,MAAM,CAAC,IAAI,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;IAAC,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;IAC1C,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAChE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,WAAW;QAAE,OAAO,KAAK,CAAC;IACzE,OAAO,IAAI,CAAC;AACd,CAAC;AAqBD;;;;GAIG;AACH,MAAM,OAAO,WAAW;IAEO,GAAG;IADxB,IAAI,GAAG,IAAI,GAAG,EAA+B,CAAC;IACtD,YAA6B,GAAG,GAAiB,IAAI,CAAC,GAAG;mBAA5B,GAAG;IAA4B,CAAC;IAE7D;;;OAGG;IACH,KAAK,CAAC,QAAgB,EAAE,SAAiB,EAAE,SAAS,GAAG,KAAK;QAC1D,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAChC,IAAI,CAAC,CAAC,EAAE,CAAC;YAAC,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;YAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAAC,CAAC;QACtD,KAAK,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAAC,IAAI,CAAC,GAAG,EAAE,GAAG,aAAa;gBAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;;gBAAM,MAAM;QAAC,CAAC;QACjF,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxE,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,OAAO,QAAQ,CAAC;QAChC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,GAAG,mBAAmB,CAAC;YAAE,OAAO,MAAM,CAAC;QAC/G,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,KAAyB,EACzB,MAA8F,EAC9F,aAAwC,EACxC,MAAmB,EACnB,GAAG,GAAW,IAAI,CAAC,GAAG,EAAE,EACxB,SAAS,GAAG,KAAK;IAEjB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC;IACtC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC/J,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAC5C,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IACzD,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC7B,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;IACvF,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,qBAAqB;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;IAChG,MAAM,GAAG,GAAG,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IACxD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IAC9E,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC1H,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,CAAC;QAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,KAAK,GAAG,KAAK,CAAC;IAAC,CAAC,CAAC,oEAAoE;IACnM,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1D,MAAM,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IACrD,IAAI,CAAC,KAAK,QAAQ;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;IAC3D,IAAI,CAAC,KAAK,MAAM;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;IAC/D,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAChC,CAAC;AAED,uFAAuF;AAEvF,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,GAAG,MAAM,CAAC;AAC1C,MAAM,CAAC,MAAM,WAAW,GAAG,EAAE,CAAC;AAC9B,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AACtC,MAAM,CAAC,MAAM,YAAY,GAAG,EAAE,CAAC;AAC/B,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AACvD,MAAM,gBAAgB,GAAG,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;AAC1C,MAAM,cAAc,GAAG,GAAG,CAAC;AAwC3B,SAAS,QAAQ,CAAC,CAAe,EAAE,CAAmB;IACpD,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI;QAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1C,OAAO,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,eAAe,KAAK,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,eAAe,KAAK,CAAC,CAAC,eAAe,CAAC;AACnH,CAAC;AAID,MAAM,OAAO,cAAc;IAEsB,GAAG;IADzC,IAAI,CAAS;IACtB,YAAY,QAAgB,EAAmB,GAAG,GAAiB,IAAI,CAAC,GAAG;mBAA5B,GAAG;QAChD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAC;IAClE,CAAC;IAEO,IAAI;QACV,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAA0B,CAAC;YACrF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAqB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAQ,CAAkB,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3K,0FAA0F;YAC1F,KAAK,MAAM,CAAC,IAAI,OAAO;gBAAE,IAAI,CAAC,CAAC,CAAC,MAAM;oBAAE,CAAC,CAAC,MAAM,GAAG,cAAc,CAAC;YAClE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QACvI,CAAC;QAAC,MAAM,CAAC;YACP,4GAA4G;YAC5G,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC;QAC7C,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,CAAe;QAC3B,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC;QACvF,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED,6FAA6F;IACrF,SAAS,CAAC,CAAe;QAC/B,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;gBAAE,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC;QAClG,CAAC;QACD,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACjC,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBACtD,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACjE,OAAO,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC;YACnC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;QAChE,IAAI,OAAO,CAAC,MAAM,GAAG,cAAc,EAAE,CAAC;YACpC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAChK,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC;QACD,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,CAAC;QAC1F,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,KAAqB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACtE,GAAG,CAAC,EAAU,IAAyB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IAE7F,aAAa,KAAc,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC;IAE9G,4FAA4F;IAC5F,aAAa,CAAC,GAAyF;QAErG,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,MAAM,IAAI,YAAY;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;QACpG,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,GAAG,CAAC,SAAS,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC;QACxG,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,MAAM,IAAI,WAAW;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;QAC5H,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,MAAM,MAAM,GAAiB;YAC3B,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;YAC1G,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,iBAAiB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI;YAC1G,SAAS,EAAE,IAAI,IAAI,CAAC,CAAC,GAAG,cAAc,CAAC,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,EAAE;SACtE,CAAC;QACF,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACd,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,CAAC,EAAU;QACf,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;IAED,0FAA0F;IAC1F,YAAY,CAAC,EAAU,EAAE,OAA4H;QACnJ,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,CAAC,IAAI,IAAI,CAAC;QACnD,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;YACf,CAAC,CAAC,MAAM,GAAG,QAAQ,CAAC;YAAC,CAAC,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YAAC,CAAC,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,aAAa,CAAC;YACnJ,OAAO,CAAC,CAAC,UAAU,CAAC;YAAC,OAAO,CAAC,CAAC,SAAS,CAAC;QAC1C,CAAC;aAAM,CAAC;YACN,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC;YAClC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9C,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACrC,CAAC,CAAC,CAAC,cAAc,GAAG,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,IAAI,oBAAoB,EAAE,CAAC;gBAAC,CAAC,CAAC,MAAM,GAAG,UAAU,CAAC;gBAAC,CAAC,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YAAC,CAAC;QAChI,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACd,OAAO,CAAC,CAAC;IACX,CAAC;IAED,wEAAwE;IACxE,gBAAgB;QACd,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO;YAAE,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC;gBAAC,CAAC,CAAC,SAAS,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;gBAAC,OAAO,GAAG,IAAI,CAAC;YAAC,CAAC;QAClJ,IAAI,OAAO;YAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,CAAC,EAAU;QAChB,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAAC,CAAC,CAAC,MAAM,GAAG,UAAU,CAAC;YAAC,CAAC,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;IAC/H,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,EAAU,EAAE,EAAW;QAC5B,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,CAAC;YAAE,OAAO,KAAK,CAAC;QACrB,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAAC,CAAC,CAAC,MAAM,GAAG,SAAS,CAAC;YAAC,CAAC,CAAC,SAAS,GAAG,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YAAC,SAAS,CAAC,CAAC,CAAC,CAAC;YAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAAC,CAAC;QAC1I,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,EAAU,EAAE,CAAmB;QACrC,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,QAAQ;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;QAC5E,MAAM,IAAI,GAAG,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,CAAC,QAAQ,GAAG,IAAI;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;QACtE,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YACxB,OAAO,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,CAAC;QACjI,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,QAAQ,CAAC;QAC5B,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI;gBAAE,SAAS,CAAC,CAAC,CAAC,CAAC;iBAC9B,CAAC;gBACJ,KAAK,MAAM,KAAK,IAAI,CAAC,CAAC,OAAO;oBAAE,IAAI,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,IAAI,KAAK,CAAC,SAAS,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;wBAAC,SAAS,CAAC,KAAK,CAAC,CAAC;wBAAC,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;oBAAC,CAAC;gBAC5J,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC;gBAAC,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,WAAW,CAAC;gBAAC,CAAC,CAAC,eAAe,GAAG,CAAC,CAAC,eAAe,CAAC;gBAChG,CAAC,CAAC,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;YACvD,CAAC;YACD,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACd,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,EAAE,CAAC;IACzE,CAAC;IAED,iGAAiG;IACjG,kBAAkB,CAAC,EAAU,EAAE,OAAe;QAC5C,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,KAAK,OAAO;YAAE,OAAO,KAAK,CAAC;QACzE,SAAS,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,CAAC,WAAW,GAAG,OAAO,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACd,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAED,SAAS,SAAS,CAAC,CAAe;IAChC,OAAO,CAAC,CAAC,SAAS,CAAC;IAAC,OAAO,CAAC,CAAC,eAAe,CAAC;IAAC,OAAO,CAAC,CAAC,eAAe,CAAC;IACvE,CAAC,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAC7C,CAAC;AAED,uFAAuF;AAEvF,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;AACxC,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1E,CAAC;AAED,0EAA0E;AAC1E,MAAM,OAAO,iBAAiB;IAEC,GAAG;IADxB,KAAK,GAAG,IAAI,GAAG,EAA+C,CAAC;IACvE,YAA6B,GAAG,GAAiB,IAAI,CAAC,GAAG;mBAA5B,GAAG;IAA4B,CAAC;IAE7D,KAAK,CAAC,QAAgB,EAAE,SAAiB;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACrE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,8EAA8E;IAC9E,KAAK,CAAC,QAAgB,EAAE,IAAa;QACnC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;YAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC/D,MAAM,UAAU,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3E,MAAM,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/B,qFAAqF;QACrF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACpH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,QAAgB,IAAU,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE7D,iEAAiE;IACjE,QAAQ,KAAW,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAExC,uDAAuD;IACvD,KAAK,KAAW,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK;QAAE,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC;YAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEtH,8EAA8E;IAC9E,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAChC,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACrB,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;QACrC,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,oCAAoC,CAAC;YAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAE,GAAG,CAAC,CAAC,CAAC,CAAE,CAAC,CAAC;QACnG,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACtB,KAAK,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK;gBAAE,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC;oBAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACvF,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"MobileDeviceKeys.js","sourceRoot":"","sources":["../../src/core/MobileDeviceKeys.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,11 @@ export declare const URGENT_EXTRA_24H = 10;
|
|
|
7
7
|
export declare const BACKOFF_MS: number;
|
|
8
8
|
export declare const DEDUPE_MS: number;
|
|
9
9
|
export interface PushTrigger {
|
|
10
|
-
|
|
10
|
+
/** `reply`: an agent reply appended to a native app conversation (mobile-native-conversations §4.7). */
|
|
11
|
+
kind: 'item' | 'notice' | 'reply';
|
|
11
12
|
itemId?: string;
|
|
13
|
+
/** For `reply`: the app conversation's UUID, so the phone can open it. Never the reply's text. */
|
|
14
|
+
conversationKey?: string;
|
|
12
15
|
dedupeKey: string;
|
|
13
16
|
priority?: string;
|
|
14
17
|
sourceMachine: string;
|
|
@@ -53,6 +56,12 @@ export declare class MobilePushService {
|
|
|
53
56
|
private dev;
|
|
54
57
|
/** A hub post on this machine: notify own devices and fan out to peers. */
|
|
55
58
|
onHubPost(t: Omit<PushTrigger, 'sourceMachine'>): void;
|
|
59
|
+
/**
|
|
60
|
+
* An agent reply appended to a native app conversation (mobile-native-conversations §4.7): one
|
|
61
|
+
* push per reply, through the same budgets, folding and dedupe as a hub post, fanned out so a
|
|
62
|
+
* phone paired on another machine hears it too. Needs no Telegram.
|
|
63
|
+
*/
|
|
64
|
+
onAppReply(conversationKey: string, messageId: string): void;
|
|
56
65
|
/** A trigger from this machine or a peer. Returns 'deduped' or 'accepted'. */
|
|
57
66
|
receive(t: PushTrigger, fromPeer: boolean): Promise<'deduped' | 'accepted' | 'off'>;
|
|
58
67
|
noteRefused(): void;
|
|
@@ -68,12 +77,14 @@ export declare class MobilePushService {
|
|
|
68
77
|
private maybeUnpause;
|
|
69
78
|
status(): Record<string, unknown>;
|
|
70
79
|
}
|
|
71
|
-
export
|
|
72
|
-
kind: 'item' | 'notice' | 'aggregate';
|
|
80
|
+
export interface PushPayloadInput {
|
|
81
|
+
kind: 'item' | 'notice' | 'reply' | 'aggregate';
|
|
73
82
|
itemId?: string;
|
|
83
|
+
conversationKey?: string;
|
|
74
84
|
machine?: string;
|
|
75
85
|
count: number;
|
|
76
|
-
}
|
|
86
|
+
}
|
|
87
|
+
export declare function buildPayload(agentName: string, agentId: string, deviceId: string, p: PushPayloadInput): Record<string, unknown>;
|
|
77
88
|
export declare function credHash(c: ApnsCredentials): string;
|
|
78
89
|
export declare function signApnsJwt(c: ApnsCredentials, iatSec: number): string;
|
|
79
90
|
/** One lazy HTTP/2 session per environment, closed after 5 idle minutes, at most 20 in flight. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MobilePush.d.ts","sourceRoot":"","sources":["../../src/core/MobilePush.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MobilePush.d.ts","sourceRoot":"","sources":["../../src/core/MobilePush.ts"],"names":[],"mappings":"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"}
|
package/dist/core/MobilePush.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Mobile push (docs/specs/mobile-push.md): notify paired phones through Apple's push service
|
|
3
|
-
* when the Attention hub posts
|
|
3
|
+
* when the Attention hub posts, and when the agent replies in a native app conversation
|
|
4
|
+
* (mobile-native-conversations §4.7, no Telegram needed). Direct from this agent with the operator's APNs key; no relay.
|
|
4
5
|
*
|
|
5
6
|
* Bounds are durable and per device (`.instar/state/mobile-push-state.json`): a 2-minute fold,
|
|
6
7
|
* hourly after 40 sends in any rolling 24 h, an URGENT bypass of the hourly wait (10 more per
|
|
@@ -105,6 +106,14 @@ export class MobilePushService {
|
|
|
105
106
|
}
|
|
106
107
|
void this.receive(trig, false).catch((err) => this.deps.reportDegradation?.('MobilePush.receive', err));
|
|
107
108
|
}
|
|
109
|
+
/**
|
|
110
|
+
* An agent reply appended to a native app conversation (mobile-native-conversations §4.7): one
|
|
111
|
+
* push per reply, through the same budgets, folding and dedupe as a hub post, fanned out so a
|
|
112
|
+
* phone paired on another machine hears it too. Needs no Telegram.
|
|
113
|
+
*/
|
|
114
|
+
onAppReply(conversationKey, messageId) {
|
|
115
|
+
this.onHubPost({ kind: 'reply', conversationKey, dedupeKey: `app-reply:${messageId}` });
|
|
116
|
+
}
|
|
108
117
|
/** A trigger from this machine or a peer. Returns 'deduped' or 'accepted'. */
|
|
109
118
|
async receive(t, fromPeer) {
|
|
110
119
|
if (!this.deps.enabled())
|
|
@@ -130,7 +139,7 @@ export class MobilePushService {
|
|
|
130
139
|
const ds = this.dev(st, d.id);
|
|
131
140
|
prune(ds, t0);
|
|
132
141
|
if (!ds.pending && this.dueFor(ds, urgent) <= t0) {
|
|
133
|
-
await this.send(d.id, { kind: t.kind, itemId: t.kind === 'item' ? t.itemId : undefined, machine: t.sourceMachine, count: 1 }, urgent && this.throttled(ds));
|
|
142
|
+
await this.send(d.id, { kind: t.kind, itemId: t.kind === 'item' ? t.itemId : undefined, conversationKey: t.kind === 'reply' ? t.conversationKey : undefined, machine: t.sourceMachine, count: 1 }, urgent && this.throttled(ds));
|
|
134
143
|
}
|
|
135
144
|
else {
|
|
136
145
|
ds.pending = { count: (ds.pending?.count ?? 0) + 1, hasUrgent: (ds.pending?.hasUrgent ?? false) || urgent };
|
|
@@ -303,12 +312,16 @@ function prune(ds, t0) {
|
|
|
303
312
|
ds.backoffUntil = null;
|
|
304
313
|
}
|
|
305
314
|
export function buildPayload(agentName, agentId, deviceId, p) {
|
|
306
|
-
const body = p.kind === 'aggregate' ? `${p.count} more ${p.count === 1 ? 'thing needs' : 'things need'} you`
|
|
315
|
+
const body = p.kind === 'aggregate' ? `${p.count} more ${p.count === 1 ? 'thing needs' : 'things need'} you`
|
|
316
|
+
: p.kind === 'reply' ? 'New reply' : 'Something needs you';
|
|
307
317
|
const instar = { kind: p.kind, agentId, deviceId, count: p.count };
|
|
308
318
|
if (p.kind === 'item' && p.itemId) {
|
|
309
319
|
instar.itemId = p.itemId;
|
|
310
320
|
instar.machine = p.machine;
|
|
311
321
|
}
|
|
322
|
+
// The conversation to open; never the reply's text (the phone fetches it itself).
|
|
323
|
+
if (p.kind === 'reply' && p.conversationKey)
|
|
324
|
+
instar.conversationKey = p.conversationKey;
|
|
312
325
|
return {
|
|
313
326
|
aps: { alert: { title: agentName, body }, sound: 'default', 'mutable-content': 1, 'thread-id': agentName },
|
|
314
327
|
instar,
|