agl 43.7.0 → 43.8.0
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/changelog.md +17 -0
- package/dist_serve/bundle.js +786 -786
- package/dist_serve/bundle.js.map +2 -2
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/aglapi/interfaces.d.ts +35 -0
- package/dist_ts/aglapi/interfaces.js +9 -1
- package/dist_ts/classes.apnsclient.d.ts +97 -0
- package/dist_ts/classes.apnsclient.js +363 -0
- package/dist_ts/classes.authmodels.js +19 -6
- package/dist_ts/classes.authstore.js +15 -2
- package/dist_ts/classes.cli.js +8 -1
- package/dist_ts/classes.controller.d.ts +30 -3
- package/dist_ts/classes.controller.js +250 -9
- package/dist_ts/classes.controllerdevices.d.ts +35 -7
- package/dist_ts/classes.controllerdevices.js +86 -13
- package/dist_ts/classes.controllerpush.d.ts +111 -0
- package/dist_ts/classes.controllerpush.js +299 -0
- package/dist_ts/classes.fcmclient.d.ts +78 -0
- package/dist_ts/classes.fcmclient.js +278 -0
- package/dist_ts/classes.inbox.d.ts +10 -2
- package/dist_ts/classes.inbox.js +9 -2
- package/dist_ts/classes.mcpclient.d.ts +5 -0
- package/dist_ts/classes.mcpclient.js +18 -6
- package/dist_ts/classes.mcpcontrollerhost.d.ts +3 -0
- package/dist_ts/classes.mcpcontrollerhost.js +19 -1
- package/dist_ts/classes.mcpvalidation.js +4 -1
- package/dist_ts/classes.mcpworkercaller.d.ts +6 -0
- package/dist_ts/classes.mcpworkercaller.js +26 -4
- package/dist_ts/classes.pushdelivery.d.ts +115 -0
- package/dist_ts/classes.pushdelivery.js +311 -0
- package/dist_ts/classes.pushhandover.d.ts +46 -0
- package/dist_ts/classes.pushhandover.js +131 -0
- package/dist_ts/classes.pushregistrations.d.ts +96 -0
- package/dist_ts/classes.pushregistrations.js +263 -0
- package/dist_ts/classes.pushsettings.d.ts +125 -0
- package/dist_ts/classes.pushsettings.js +377 -0
- package/dist_ts/classes.workercallers.d.ts +73 -2
- package/dist_ts/classes.workercallers.js +354 -43
- package/dist_ts/driver/classes.directreports.d.ts +5 -0
- package/dist_ts/driver/classes.directreports.js +3 -2
- package/dist_ts/fleet/classes.workerlaunches.d.ts +6 -4
- package/dist_ts/fleet/classes.workerlaunches.js +10 -9
- package/dist_ts/fleet/classes.workers.d.ts +12 -2
- package/dist_ts/fleet/classes.workers.js +82 -2
- package/dist_ts/functions.deviceapi.d.ts +23 -3
- package/dist_ts/functions.deviceapi.js +41 -3
- package/dist_ts/functions.pushcli.d.ts +43 -0
- package/dist_ts/functions.pushcli.js +201 -0
- package/dist_ts/functions.pushcredentials.d.ts +53 -0
- package/dist_ts/functions.pushcredentials.js +111 -0
- package/dist_ts/functions.pushwire.d.ts +8 -0
- package/dist_ts/functions.pushwire.js +83 -0
- package/dist_ts/functions.remotecli.d.ts +2 -2
- package/dist_ts/functions.remotecli.js +4 -4
- package/dist_ts/functions.workercallervalidation.js +3 -2
- package/dist_ts/functions.workerprocessproof.d.ts +12 -0
- package/dist_ts/functions.workerprocessproof.js +32 -1
- package/dist_ts/interfaces.auth.d.ts +27 -3
- package/dist_ts/interfaces.auth.js +9 -1
- package/dist_ts/interfaces.lifecycle.d.ts +7 -1
- package/dist_ts/interfaces.push.d.ts +69 -0
- package/dist_ts/interfaces.push.js +25 -0
- package/dist_ts/plugins.d.ts +3 -1
- package/dist_ts/plugins.js +4 -2
- package/dist_ts_interfaces/devices.d.ts +178 -2
- package/dist_ts_interfaces/devices.js +24 -2
- package/dist_ts_interfaces/index.d.ts +1 -0
- package/dist_ts_interfaces/index.js +2 -1
- package/dist_ts_interfaces/mcprequests.d.ts +3 -2
- package/dist_ts_interfaces/mcprequests.js +3 -1
- package/dist_ts_interfaces/push.d.ts +166 -0
- package/dist_ts_interfaces/push.js +24 -0
- package/dist_ts_interfaces/workercallers.d.ts +43 -3
- package/package.json +1 -1
- package/readme.md +64 -11
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/aglapi/interfaces.ts +8 -0
- package/ts/classes.apnsclient.ts +389 -0
- package/ts/classes.authmodels.ts +21 -5
- package/ts/classes.authstore.ts +14 -1
- package/ts/classes.cli.ts +7 -0
- package/ts/classes.controller.ts +273 -7
- package/ts/classes.controllerdevices.ts +94 -12
- package/ts/classes.controllerpush.ts +351 -0
- package/ts/classes.fcmclient.ts +292 -0
- package/ts/classes.inbox.ts +13 -2
- package/ts/classes.mcpclient.ts +20 -5
- package/ts/classes.mcpcontrollerhost.ts +20 -0
- package/ts/classes.mcpvalidation.ts +2 -0
- package/ts/classes.mcpworkercaller.ts +24 -2
- package/ts/classes.pushdelivery.ts +378 -0
- package/ts/classes.pushhandover.ts +98 -0
- package/ts/classes.pushregistrations.ts +244 -0
- package/ts/classes.pushsettings.ts +428 -0
- package/ts/classes.workercallers.ts +329 -37
- package/ts/driver/classes.directreports.ts +7 -1
- package/ts/fleet/classes.workerlaunches.ts +9 -7
- package/ts/fleet/classes.workers.ts +65 -2
- package/ts/functions.deviceapi.ts +52 -2
- package/ts/functions.pushcli.ts +212 -0
- package/ts/functions.pushcredentials.ts +129 -0
- package/ts/functions.pushwire.ts +106 -0
- package/ts/functions.remotecli.ts +3 -2
- package/ts/functions.workercallervalidation.ts +2 -1
- package/ts/functions.workerprocessproof.ts +34 -0
- package/ts/interfaces.auth.ts +26 -3
- package/ts/interfaces.lifecycle.ts +7 -1
- package/ts/interfaces.push.ts +78 -0
- package/ts/plugins.ts +3 -1
- package/ts_interfaces/devices.schema.json +327 -0
- package/ts_interfaces/devices.ts +206 -1
- package/ts_interfaces/index.ts +1 -0
- package/ts_interfaces/mcprequests.ts +3 -0
- package/ts_interfaces/push.ts +162 -0
- package/ts_interfaces/workercallers.ts +34 -2
- package/ts_web/00_commitinfo_data.ts +1 -1
|
@@ -0,0 +1,377 @@
|
|
|
1
|
+
var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
|
|
2
|
+
function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
|
|
3
|
+
var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
|
|
4
|
+
var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
|
|
5
|
+
var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
|
|
6
|
+
var _, done = false;
|
|
7
|
+
for (var i = decorators.length - 1; i >= 0; i--) {
|
|
8
|
+
var context = {};
|
|
9
|
+
for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
|
|
10
|
+
for (var p in contextIn.access) context.access[p] = contextIn.access[p];
|
|
11
|
+
context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
|
|
12
|
+
var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
|
|
13
|
+
if (kind === "accessor") {
|
|
14
|
+
if (result === void 0) continue;
|
|
15
|
+
if (result === null || typeof result !== "object") throw new TypeError("Object expected");
|
|
16
|
+
if (_ = accept(result.get)) descriptor.get = _;
|
|
17
|
+
if (_ = accept(result.set)) descriptor.set = _;
|
|
18
|
+
if (_ = accept(result.init)) initializers.unshift(_);
|
|
19
|
+
}
|
|
20
|
+
else if (_ = accept(result)) {
|
|
21
|
+
if (kind === "field") initializers.unshift(_);
|
|
22
|
+
else descriptor[key] = _;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
26
|
+
done = true;
|
|
27
|
+
};
|
|
28
|
+
var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
|
|
29
|
+
var useValue = arguments.length > 2;
|
|
30
|
+
for (var i = 0; i < initializers.length; i++) {
|
|
31
|
+
value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
|
|
32
|
+
}
|
|
33
|
+
return useValue ? value : void 0;
|
|
34
|
+
};
|
|
35
|
+
import * as plugins from './plugins.js';
|
|
36
|
+
import { isPushVendorReason } from './interfaces.push.js';
|
|
37
|
+
import { isApnsSigningKey, isAppleId, isBundleId, isFirebaseProjectId, isServiceAccountEmail, isServiceAccountKeyId, isServiceAccountSigningKey, privateKeyBytes, privateKeyFromBytes, } from './functions.pushcredentials.js';
|
|
38
|
+
/** The stored document's `content` is bounded plain JSON. */
|
|
39
|
+
const maximumContentBytes = 64 * 1024;
|
|
40
|
+
const isPlainObject = (valueArg) => (!!valueArg && typeof valueArg === 'object' && !Array.isArray(valueArg)
|
|
41
|
+
&& (Object.getPrototypeOf(valueArg) === Object.prototype || Object.getPrototypeOf(valueArg) === null));
|
|
42
|
+
const assertDocument = (valueArg) => {
|
|
43
|
+
const value = valueArg;
|
|
44
|
+
let size = Number.POSITIVE_INFINITY;
|
|
45
|
+
try {
|
|
46
|
+
size = Buffer.byteLength(JSON.stringify(value?.content), 'utf8');
|
|
47
|
+
}
|
|
48
|
+
catch { /* refused below */ }
|
|
49
|
+
if (!isPlainObject(value)
|
|
50
|
+
|| Object.keys(value).length !== 2
|
|
51
|
+
|| typeof value.id !== 'string' || !/^controller:[1-9][0-9]{0,4}$/u.test(value.id)
|
|
52
|
+
|| !isPlainObject(value.content)
|
|
53
|
+
|| size > maximumContentBytes) {
|
|
54
|
+
throw new Error('Invalid push settings record.');
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
let ControllerPushSettingsModel = (() => {
|
|
58
|
+
let _classDecorators = [plugins.nosqldb.managed({ collectionName: 'agl_controller_push_settings' }), plugins.nosqldb.exactPersistence({ assertDocument })];
|
|
59
|
+
let _classDescriptor;
|
|
60
|
+
let _classExtraInitializers = [];
|
|
61
|
+
let _classThis;
|
|
62
|
+
let _classSuper = plugins.nosqldb.SmartDataDbDoc;
|
|
63
|
+
let _id_decorators;
|
|
64
|
+
let _id_initializers = [];
|
|
65
|
+
let _id_extraInitializers = [];
|
|
66
|
+
let _content_decorators;
|
|
67
|
+
let _content_initializers = [];
|
|
68
|
+
let _content_extraInitializers = [];
|
|
69
|
+
var ControllerPushSettingsModel = class extends _classSuper {
|
|
70
|
+
static { _classThis = this; }
|
|
71
|
+
static {
|
|
72
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
|
|
73
|
+
_id_decorators = [plugins.nosqldb.unI()];
|
|
74
|
+
_content_decorators = [plugins.nosqldb.svDb()];
|
|
75
|
+
__esDecorate(null, null, _id_decorators, { kind: "field", name: "id", static: false, private: false, access: { has: obj => "id" in obj, get: obj => obj.id, set: (obj, value) => { obj.id = value; } }, metadata: _metadata }, _id_initializers, _id_extraInitializers);
|
|
76
|
+
__esDecorate(null, null, _content_decorators, { kind: "field", name: "content", static: false, private: false, access: { has: obj => "content" in obj, get: obj => obj.content, set: (obj, value) => { obj.content = value; } }, metadata: _metadata }, _content_initializers, _content_extraInitializers);
|
|
77
|
+
__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
|
|
78
|
+
ControllerPushSettingsModel = _classThis = _classDescriptor.value;
|
|
79
|
+
if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
80
|
+
__runInitializers(_classThis, _classExtraInitializers);
|
|
81
|
+
}
|
|
82
|
+
id = __runInitializers(this, _id_initializers, void 0);
|
|
83
|
+
content = (__runInitializers(this, _id_extraInitializers), __runInitializers(this, _content_initializers, void 0));
|
|
84
|
+
constructor() {
|
|
85
|
+
super(...arguments);
|
|
86
|
+
__runInitializers(this, _content_extraInitializers);
|
|
87
|
+
}
|
|
88
|
+
};
|
|
89
|
+
return ControllerPushSettingsModel = _classThis;
|
|
90
|
+
})();
|
|
91
|
+
export { ControllerPushSettingsModel };
|
|
92
|
+
const isTime = (valueArg) => Number.isSafeInteger(valueArg) && valueArg > 0;
|
|
93
|
+
const isStoredKey = (valueArg) => (isPlainObject(valueArg)
|
|
94
|
+
&& Number.isSafeInteger(valueArg.generation) && valueArg.generation >= 1
|
|
95
|
+
&& typeof valueArg.ciphertext === 'string' && /^[A-Za-z0-9_-]{1,131072}$/u.test(valueArg.ciphertext));
|
|
96
|
+
const isRefusal = (valueArg) => (isPlainObject(valueArg) && isTime(valueArg.at) && (valueArg.vendorReason === undefined || isPushVendorReason(valueArg.vendorReason)));
|
|
97
|
+
/** A stored entry this release reads: its own keys checked, any other key a later release's. */
|
|
98
|
+
const readApnsEntry = (valueArg) => (isPlainObject(valueArg) && isAppleId(valueArg.keyId) && isAppleId(valueArg.teamId) && isBundleId(valueArg.topic)
|
|
99
|
+
&& isStoredKey(valueArg.key) && isTime(valueArg.setAt) && (valueArg.refused === undefined || isRefusal(valueArg.refused))
|
|
100
|
+
? valueArg : undefined);
|
|
101
|
+
const readFcmEntry = (valueArg) => (isPlainObject(valueArg) && isFirebaseProjectId(valueArg.projectId) && isServiceAccountEmail(valueArg.clientEmail)
|
|
102
|
+
&& (valueArg.privateKeyId === undefined || isServiceAccountKeyId(valueArg.privateKeyId))
|
|
103
|
+
&& isStoredKey(valueArg.key) && isTime(valueArg.setAt) && (valueArg.refused === undefined || isRefusal(valueArg.refused))
|
|
104
|
+
? valueArg : undefined);
|
|
105
|
+
const readRecord = (controllerIdArg) => ControllerPushSettingsModel.exact.findStoredOne({ id: controllerIdArg });
|
|
106
|
+
/**
|
|
107
|
+
* The push settings of one running controller: what it read at start and every change the owner makes, in one order.
|
|
108
|
+
* The keys exist in plaintext only in this process, as key objects; the store holds them sealed. A change of a
|
|
109
|
+
* platform's credential reaches the listeners (the delivery service drops its sender for the platform).
|
|
110
|
+
*/
|
|
111
|
+
export class ControllerPushSettings {
|
|
112
|
+
options;
|
|
113
|
+
previewsOn = false;
|
|
114
|
+
apnsHeld = { state: 'unset' };
|
|
115
|
+
fcmHeld = { state: 'unset' };
|
|
116
|
+
/**
|
|
117
|
+
* The newest generation each platform's credential had in this process, also after `unset`: the next one is always
|
|
118
|
+
* higher, so a refusal of an earlier credential that arrives late never names the one set since.
|
|
119
|
+
*/
|
|
120
|
+
generations = { apns: 0, fcm: 0 };
|
|
121
|
+
listeners = new Set();
|
|
122
|
+
mutationTail = Promise.resolve();
|
|
123
|
+
closed = false;
|
|
124
|
+
constructor(options) {
|
|
125
|
+
this.options = options;
|
|
126
|
+
}
|
|
127
|
+
/** Reads the controller's settings and unseals each credential that was not refused. */
|
|
128
|
+
static async open(optionsArg) {
|
|
129
|
+
const settings = new ControllerPushSettings(optionsArg);
|
|
130
|
+
const stored = await readRecord(optionsArg.controllerId);
|
|
131
|
+
const content = stored ? ControllerPushSettingsModel.exact.toPersisted(stored).content : {};
|
|
132
|
+
settings.previewsOn = content.previews === true;
|
|
133
|
+
settings.apnsHeld = await settings.holdApns(content.apns);
|
|
134
|
+
settings.fcmHeld = await settings.holdFcm(content.fcm);
|
|
135
|
+
// An entry this release cannot read still names its generation: the next credential's seal name is not that one's.
|
|
136
|
+
for (const platform of ['apns', 'fcm']) {
|
|
137
|
+
const entry = content[platform];
|
|
138
|
+
const generation = isPlainObject(entry) && isPlainObject(entry.key) ? entry.key.generation : undefined;
|
|
139
|
+
if (Number.isSafeInteger(generation) && generation > 0)
|
|
140
|
+
settings.generations[platform] = generation;
|
|
141
|
+
}
|
|
142
|
+
return settings;
|
|
143
|
+
}
|
|
144
|
+
now() {
|
|
145
|
+
return this.options.now?.() ?? Date.now();
|
|
146
|
+
}
|
|
147
|
+
/** Whether notifications carry previews. */
|
|
148
|
+
previews() {
|
|
149
|
+
return this.previewsOn;
|
|
150
|
+
}
|
|
151
|
+
/** What `agl push status` shows of the APNs credential, without the key. */
|
|
152
|
+
apnsStatus() {
|
|
153
|
+
const { state, stored } = this.apnsHeld;
|
|
154
|
+
return {
|
|
155
|
+
state,
|
|
156
|
+
...(stored === undefined ? {} : { keyId: stored.keyId, teamId: stored.teamId, topic: stored.topic, setAt: stored.setAt }),
|
|
157
|
+
...(state === 'refused' && stored?.refused ? { refused: { at: stored.refused.at, reason: 'credential_refused',
|
|
158
|
+
...(stored.refused.vendorReason === undefined ? {} : { vendorReason: stored.refused.vendorReason }) } } : {}),
|
|
159
|
+
};
|
|
160
|
+
}
|
|
161
|
+
/** What `agl push status` shows of the FCM credential, without the key. */
|
|
162
|
+
fcmStatus() {
|
|
163
|
+
const { state, stored } = this.fcmHeld;
|
|
164
|
+
return {
|
|
165
|
+
state,
|
|
166
|
+
...(stored === undefined ? {} : { projectId: stored.projectId, clientEmail: stored.clientEmail, setAt: stored.setAt }),
|
|
167
|
+
...(state === 'refused' && stored?.refused ? { refused: { at: stored.refused.at, reason: 'credential_refused',
|
|
168
|
+
...(stored.refused.vendorReason === undefined ? {} : { vendorReason: stored.refused.vendorReason }) } } : {}),
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
/** The APNs credential to send with, while it is ready. */
|
|
172
|
+
apnsCredential() {
|
|
173
|
+
return this.closed ? undefined : this.apnsHeld.credential;
|
|
174
|
+
}
|
|
175
|
+
/** The FCM credential to send with, while it is ready. */
|
|
176
|
+
fcmCredential() {
|
|
177
|
+
return this.closed ? undefined : this.fcmHeld.credential;
|
|
178
|
+
}
|
|
179
|
+
/** Whether the host holds a credential for the platform that Apple or Google did not refuse. */
|
|
180
|
+
ready(platformArg) {
|
|
181
|
+
return (platformArg === 'apns' ? this.apnsCredential() : this.fcmCredential()) !== undefined;
|
|
182
|
+
}
|
|
183
|
+
/** Calls `listenerArg` with the platform whenever its credential changes; answers the unsubscription. */
|
|
184
|
+
onChange(listenerArg) {
|
|
185
|
+
this.listeners.add(listenerArg);
|
|
186
|
+
return () => { this.listeners.delete(listenerArg); };
|
|
187
|
+
}
|
|
188
|
+
/** Seals and stores a new APNs credential, which replaces the one held (a refused one too). */
|
|
189
|
+
setApns(inputArg) {
|
|
190
|
+
return this.mutate(async () => {
|
|
191
|
+
const generation = this.nextGeneration('apns');
|
|
192
|
+
const key = await this.seal('apns', generation, inputArg.key);
|
|
193
|
+
const stored = { keyId: inputArg.keyId, teamId: inputArg.teamId, topic: inputArg.topic, key, setAt: this.now() };
|
|
194
|
+
await this.write((contentArg) => { contentArg.apns = stored; });
|
|
195
|
+
this.apnsHeld = { state: 'ready', stored, credential: {
|
|
196
|
+
keyId: stored.keyId, teamId: stored.teamId, topic: stored.topic, key: inputArg.key, generation,
|
|
197
|
+
} };
|
|
198
|
+
this.changed('apns');
|
|
199
|
+
return true;
|
|
200
|
+
});
|
|
201
|
+
}
|
|
202
|
+
/** Seals and stores a new FCM credential, which replaces the one held (a refused one too). */
|
|
203
|
+
setFcm(inputArg) {
|
|
204
|
+
return this.mutate(async () => {
|
|
205
|
+
const generation = this.nextGeneration('fcm');
|
|
206
|
+
const key = await this.seal('fcm', generation, inputArg.key);
|
|
207
|
+
const stored = {
|
|
208
|
+
projectId: inputArg.projectId, clientEmail: inputArg.clientEmail,
|
|
209
|
+
...(inputArg.privateKeyId === undefined ? {} : { privateKeyId: inputArg.privateKeyId }), key, setAt: this.now(),
|
|
210
|
+
};
|
|
211
|
+
await this.write((contentArg) => { contentArg.fcm = stored; });
|
|
212
|
+
this.fcmHeld = { state: 'ready', stored, credential: {
|
|
213
|
+
projectId: stored.projectId, clientEmail: stored.clientEmail,
|
|
214
|
+
...(stored.privateKeyId === undefined ? {} : { privateKeyId: stored.privateKeyId }), key: inputArg.key, generation,
|
|
215
|
+
} };
|
|
216
|
+
this.changed('fcm');
|
|
217
|
+
return true;
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
/** Removes a platform's credential; answers whether the host held one (also an unreadable one). */
|
|
221
|
+
unset(platformArg) {
|
|
222
|
+
return this.mutate(async () => {
|
|
223
|
+
const current = await readRecord(this.options.controllerId);
|
|
224
|
+
const held = platformArg === 'apns' ? this.apnsHeld : this.fcmHeld;
|
|
225
|
+
if (!current || (!Object.hasOwn(ControllerPushSettingsModel.exact.toPersisted(current).content, platformArg) && held.state === 'unset')) {
|
|
226
|
+
return false;
|
|
227
|
+
}
|
|
228
|
+
await this.write((contentArg) => { delete contentArg[platformArg]; });
|
|
229
|
+
if (platformArg === 'apns')
|
|
230
|
+
this.apnsHeld = { state: 'unset' };
|
|
231
|
+
else
|
|
232
|
+
this.fcmHeld = { state: 'unset' };
|
|
233
|
+
this.changed(platformArg);
|
|
234
|
+
return true;
|
|
235
|
+
});
|
|
236
|
+
}
|
|
237
|
+
/** Turns previews on or off; answers whether that changed them. */
|
|
238
|
+
setPreviews(previewsArg) {
|
|
239
|
+
return this.mutate(async () => {
|
|
240
|
+
if (this.previewsOn === previewsArg)
|
|
241
|
+
return false;
|
|
242
|
+
await this.write((contentArg) => { contentArg.previews = previewsArg; });
|
|
243
|
+
this.previewsOn = previewsArg;
|
|
244
|
+
return true;
|
|
245
|
+
});
|
|
246
|
+
}
|
|
247
|
+
/**
|
|
248
|
+
* Apple or Google refused generation `generationArg` of a platform's credential: it is kept as `refused`, and nothing
|
|
249
|
+
* is sent on the platform until the owner sets it again. A credential set since is not the one refused.
|
|
250
|
+
*/
|
|
251
|
+
refuse(platformArg, generationArg, vendorReasonArg) {
|
|
252
|
+
return this.mutate(async () => {
|
|
253
|
+
const held = platformArg === 'apns' ? this.apnsHeld : this.fcmHeld;
|
|
254
|
+
if (held.state !== 'ready' || held.credential?.generation !== generationArg || !held.stored)
|
|
255
|
+
return false;
|
|
256
|
+
const refused = { at: this.now(), ...(isPushVendorReason(vendorReasonArg) ? { vendorReason: vendorReasonArg } : {}) };
|
|
257
|
+
const stored = { ...held.stored, refused };
|
|
258
|
+
await this.write((contentArg) => {
|
|
259
|
+
// What a later release added to the entry stays.
|
|
260
|
+
contentArg[platformArg] = { ...(isPlainObject(contentArg[platformArg]) ? contentArg[platformArg] : {}), ...stored };
|
|
261
|
+
});
|
|
262
|
+
if (platformArg === 'apns')
|
|
263
|
+
this.apnsHeld = { state: 'refused', stored: stored };
|
|
264
|
+
else
|
|
265
|
+
this.fcmHeld = { state: 'refused', stored: stored };
|
|
266
|
+
this.changed(platformArg);
|
|
267
|
+
return true;
|
|
268
|
+
});
|
|
269
|
+
}
|
|
270
|
+
/** Forgets the keys; the record stays. Changes still running fail. */
|
|
271
|
+
close() {
|
|
272
|
+
this.closed = true;
|
|
273
|
+
this.apnsHeld = { state: this.apnsHeld.state, ...(this.apnsHeld.stored ? { stored: this.apnsHeld.stored } : {}) };
|
|
274
|
+
this.fcmHeld = { state: this.fcmHeld.state, ...(this.fcmHeld.stored ? { stored: this.fcmHeld.stored } : {}) };
|
|
275
|
+
this.listeners.clear();
|
|
276
|
+
}
|
|
277
|
+
/** A generation the platform's credential never had in this process, nor the stored one. */
|
|
278
|
+
nextGeneration(platformArg) {
|
|
279
|
+
this.generations[platformArg] += 1;
|
|
280
|
+
return this.generations[platformArg];
|
|
281
|
+
}
|
|
282
|
+
changed(platformArg) {
|
|
283
|
+
for (const listener of [...this.listeners])
|
|
284
|
+
listener(platformArg);
|
|
285
|
+
}
|
|
286
|
+
sealName(platformArg, generationArg) {
|
|
287
|
+
return `agl-controller.${this.options.issuerId.slice(0, 22)}.${this.options.controllerId.replace(':', '-')}.push-${platformArg}.${generationArg}`;
|
|
288
|
+
}
|
|
289
|
+
async seal(platformArg, generationArg, keyArg) {
|
|
290
|
+
const bytes = privateKeyBytes(keyArg);
|
|
291
|
+
try {
|
|
292
|
+
return { generation: generationArg, ciphertext: await this.options.codec.seal(this.sealName(platformArg, generationArg), bytes) };
|
|
293
|
+
}
|
|
294
|
+
finally {
|
|
295
|
+
bytes.fill(0);
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
/** The key of a stored credential, unsealed; none (`unreadable`) when this machine cannot unseal it. */
|
|
299
|
+
async unseal(platformArg, keyArg) {
|
|
300
|
+
let bytes;
|
|
301
|
+
try {
|
|
302
|
+
bytes = await this.options.codec.unseal(this.sealName(platformArg, keyArg.generation), keyArg.ciphertext);
|
|
303
|
+
return privateKeyFromBytes(bytes);
|
|
304
|
+
}
|
|
305
|
+
catch {
|
|
306
|
+
return undefined;
|
|
307
|
+
}
|
|
308
|
+
finally {
|
|
309
|
+
bytes?.fill(0);
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
async holdApns(valueArg) {
|
|
313
|
+
if (valueArg === undefined)
|
|
314
|
+
return { state: 'unset' };
|
|
315
|
+
const stored = readApnsEntry(valueArg);
|
|
316
|
+
if (!stored)
|
|
317
|
+
return this.unreadable('APNs', 'apns');
|
|
318
|
+
if (stored.refused)
|
|
319
|
+
return { state: 'refused', stored };
|
|
320
|
+
const key = await this.unseal('apns', stored.key);
|
|
321
|
+
if (!key || !isApnsSigningKey(key))
|
|
322
|
+
return { ...this.unreadable('APNs', 'apns'), stored };
|
|
323
|
+
return { state: 'ready', stored, credential: {
|
|
324
|
+
keyId: stored.keyId, teamId: stored.teamId, topic: stored.topic, key, generation: stored.key.generation,
|
|
325
|
+
} };
|
|
326
|
+
}
|
|
327
|
+
async holdFcm(valueArg) {
|
|
328
|
+
if (valueArg === undefined)
|
|
329
|
+
return { state: 'unset' };
|
|
330
|
+
const stored = readFcmEntry(valueArg);
|
|
331
|
+
if (!stored)
|
|
332
|
+
return this.unreadable('FCM', 'fcm');
|
|
333
|
+
if (stored.refused)
|
|
334
|
+
return { state: 'refused', stored };
|
|
335
|
+
const key = await this.unseal('fcm', stored.key);
|
|
336
|
+
if (!key || !isServiceAccountSigningKey(key))
|
|
337
|
+
return { ...this.unreadable('FCM', 'fcm'), stored };
|
|
338
|
+
return { state: 'ready', stored, credential: {
|
|
339
|
+
projectId: stored.projectId, clientEmail: stored.clientEmail,
|
|
340
|
+
...(stored.privateKeyId === undefined ? {} : { privateKeyId: stored.privateKeyId }), key, generation: stored.key.generation,
|
|
341
|
+
} };
|
|
342
|
+
}
|
|
343
|
+
unreadable(nameArg, platformArg) {
|
|
344
|
+
console.warn(`The ${nameArg} push credential of ${this.options.controllerId} cannot be read or unsealed on this machine, so `
|
|
345
|
+
+ `nothing is sent on it: set it again with \`agl push ${platformArg} set\`.`);
|
|
346
|
+
return { state: 'unreadable' };
|
|
347
|
+
}
|
|
348
|
+
/** Changes the stored `content` with `changeArg`, keeping every key this release does not know. */
|
|
349
|
+
async write(changeArg) {
|
|
350
|
+
const current = await readRecord(this.options.controllerId);
|
|
351
|
+
if (!current) {
|
|
352
|
+
const content = {};
|
|
353
|
+
changeArg(content);
|
|
354
|
+
const inserted = await ControllerPushSettingsModel.exact.insert({ id: this.options.controllerId, content });
|
|
355
|
+
if (inserted.status !== 'inserted')
|
|
356
|
+
throw new Error('The push settings changed concurrently and were not stored.');
|
|
357
|
+
return;
|
|
358
|
+
}
|
|
359
|
+
const content = structuredClone(ControllerPushSettingsModel.exact.toPersisted(current).content);
|
|
360
|
+
changeArg(content);
|
|
361
|
+
const result = await ControllerPushSettingsModel.exact.transition({ current, change: (modelArg) => { modelArg.content = content; } });
|
|
362
|
+
if (result.status !== 'transitioned')
|
|
363
|
+
throw new Error('The push settings changed concurrently and were not stored.');
|
|
364
|
+
}
|
|
365
|
+
mutate(operationArg) {
|
|
366
|
+
if (this.closed)
|
|
367
|
+
return Promise.reject(new Error('The push settings are closed.'));
|
|
368
|
+
const task = this.mutationTail.then(() => {
|
|
369
|
+
if (this.closed)
|
|
370
|
+
throw new Error('The push settings are closed.');
|
|
371
|
+
return operationArg();
|
|
372
|
+
});
|
|
373
|
+
this.mutationTail = task.then(() => undefined, () => undefined);
|
|
374
|
+
return task;
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.pushsettings.js","sourceRoot":"","sources":["../../ts/classes.pushsettings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type IFleetWorkerCallerHooks, type TFleetWorkerCallerLaunch, type TFleetWorkerCallerBinding, type IWorkerCallerReadiness, type TWorkerCallerEnrollment, type IWorkerCallerEnrollmentResponse, type IConfigurationMaster, type IControllerMcpCaller, type IControllerMcpWireCaller, type IWorkerClaudeJobRequest, type TWorkerClaudeJobObservation } from '../dist_ts_interfaces/index.js';
|
|
1
|
+
import { type IFleetWorkerCallerHooks, type TFleetWorkerCallerLaunch, type TFleetWorkerCallerBinding, type IWorkerCallerReadiness, type TWorkerCallerEnrollment, type IWorkerCallerEnrollmentResponse, type IConfigurationMaster, type IControllerMcpCaller, type IControllerMcpWireCaller, type IWorkerClaudeJobRequest, type TWorkerClaudeJobObservation, type IWorkerClaudeProcessRequest, type TWorkerClaudeProcessIdentification } from '../dist_ts_interfaces/index.js';
|
|
2
2
|
import { ControllerMcpCallerRegistry } from './classes.mcpcallerregistry.js';
|
|
3
|
-
import { resolveWorkerBridgeCommand, resolveClaudeWorkerExecutable, verifyClaudeWorkerProcess, readWorkerBridge, verifyWorkerBridge, type IWorkerCallerConnection, type IWorkerProcessSnapshot } from './functions.workerprocessproof.js';
|
|
3
|
+
import { resolveWorkerBridgeCommand, resolveClaudeWorkerExecutable, verifyClaudeWorkerProcess, verifyClaudeReleaseProcess, readWorkerBridge, verifyWorkerBridge, readWorkerProcessSnapshot, type IWorkerCallerConnection, type IWorkerProcessSnapshot } from './functions.workerprocessproof.js';
|
|
4
4
|
import { type IWorkerCallerBindingStore } from './classes.workercallerbindings.js';
|
|
5
5
|
export interface IWorkerCodexCallerOrigin {
|
|
6
6
|
parent: IWorkerProcessSnapshot;
|
|
@@ -11,6 +11,19 @@ export interface IWorkerCallerLease {
|
|
|
11
11
|
caller: IControllerMcpCaller;
|
|
12
12
|
release(): void;
|
|
13
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Why a bridge that enrolled by its process was not identified: the check that refused it (`bridge`: the approved
|
|
16
|
+
* command over its own connection; `parent`: the process it runs under directly; `inventory`: the fleet's Claude
|
|
17
|
+
* inventory; `worker`: the fleet's registry; `release`: the Claude Code release its parent runs; `record`: the worker's
|
|
18
|
+
* caller record), with the job's session and the fleet worker once the inventory and registry named them. Never a
|
|
19
|
+
* credential, a launch id or a process id.
|
|
20
|
+
*/
|
|
21
|
+
export interface IWorkerProcessRefusal {
|
|
22
|
+
check: 'bridge' | 'parent' | 'inventory' | 'worker' | 'release' | 'record';
|
|
23
|
+
reason: string;
|
|
24
|
+
workerId?: string;
|
|
25
|
+
nativeSessionId?: string;
|
|
26
|
+
}
|
|
14
27
|
export interface IControllerWorkerCallerOptions {
|
|
15
28
|
controllerGeneration: string;
|
|
16
29
|
/** The port this controller is configured to serve: a bridge an upgrade re-executed in place names it (`aglMcpReexecArguments`). */
|
|
@@ -28,6 +41,12 @@ export interface IControllerWorkerCallerOptions {
|
|
|
28
41
|
* Without it a bridge of a process that replaced the bound one stays pending.
|
|
29
42
|
*/
|
|
30
43
|
observeClaudeJob?(request: IWorkerClaudeJobRequest): Promise<TWorkerClaudeJobObservation>;
|
|
44
|
+
/**
|
|
45
|
+
* Which fleet worker's Claude background job runs the process a bridge without a launch runs under, from a fresh
|
|
46
|
+
* inventory of the fleet's Claude homes and its registry (`FleetWorkers.identifyCallerProcess`). Without it such a
|
|
47
|
+
* bridge stays pending.
|
|
48
|
+
*/
|
|
49
|
+
identifyClaudeProcess?(request: IWorkerClaudeProcessRequest): Promise<TWorkerClaudeProcessIdentification>;
|
|
31
50
|
/** Where the reason a worker enrollment stays pending is written once; the controller log by default. */
|
|
32
51
|
log?(line: string): void;
|
|
33
52
|
}
|
|
@@ -35,8 +54,10 @@ export interface IWorkerCallerProcessProof {
|
|
|
35
54
|
resolveCommand: typeof resolveWorkerBridgeCommand;
|
|
36
55
|
resolveClaude: typeof resolveClaudeWorkerExecutable;
|
|
37
56
|
verifyClaude: typeof verifyClaudeWorkerProcess;
|
|
57
|
+
verifyClaudeRelease: typeof verifyClaudeReleaseProcess;
|
|
38
58
|
readBridge: typeof readWorkerBridge;
|
|
39
59
|
verifyBridge: typeof verifyWorkerBridge;
|
|
60
|
+
readProcess: typeof readWorkerProcessSnapshot;
|
|
40
61
|
}
|
|
41
62
|
export declare class ControllerWorkerCallers implements IFleetWorkerCallerHooks {
|
|
42
63
|
private readonly options;
|
|
@@ -49,6 +70,24 @@ export declare class ControllerWorkerCallers implements IFleetWorkerCallerHooks
|
|
|
49
70
|
private readonly workerTails;
|
|
50
71
|
/** Pending reasons logged for launches this controller does not hold, by launch digest and reason. */
|
|
51
72
|
private readonly loggedUnknown;
|
|
73
|
+
/**
|
|
74
|
+
* Process enrollments refused once the bridge was proved, until when: by the digest of the bridge's whole snapshot
|
|
75
|
+
* and by its parent's PID and start, so neither that bridge nor another under the same process is proved, or reads
|
|
76
|
+
* the inventory, again while the refusal holds. Cleared when the fleet adopts or re-binds a worker.
|
|
77
|
+
*/
|
|
78
|
+
private readonly processRefusals;
|
|
79
|
+
/**
|
|
80
|
+
* How often the fleet adopted, re-bound or revoked a worker: an identification that ran across such a change is
|
|
81
|
+
* discarded in both directions. Its refusal is remembered only while this is what it was when the evidence for it
|
|
82
|
+
* began to be read, and it creates a worker's record only while this is what it was when the fleet began to read.
|
|
83
|
+
* One counter for every worker: which worker a running identification names is known only once it returns.
|
|
84
|
+
*/
|
|
85
|
+
private refusalEpoch;
|
|
86
|
+
/**
|
|
87
|
+
* The fleet identification running for a parent process, by its PID and start, and the epoch it began in: enrollments
|
|
88
|
+
* under it wait for that one read, until the fleet adopts or re-binds a worker.
|
|
89
|
+
*/
|
|
90
|
+
private readonly identifications;
|
|
52
91
|
private closed;
|
|
53
92
|
private readonly proof;
|
|
54
93
|
private readonly log;
|
|
@@ -59,6 +98,7 @@ export declare class ControllerWorkerCallers implements IFleetWorkerCallerHooks
|
|
|
59
98
|
revokeWorkerCaller(requestArg: Parameters<IFleetWorkerCallerHooks['revokeWorkerCaller']>[0]): Promise<void>;
|
|
60
99
|
enroll(requestArg: TWorkerCallerEnrollment, connectionArg?: IWorkerCallerConnection): Promise<IWorkerCallerEnrollmentResponse>;
|
|
61
100
|
admit(wireArg: IControllerMcpWireCaller | undefined, connectionArg?: IWorkerCallerConnection): Promise<IWorkerCallerLease>;
|
|
101
|
+
clearCallerRefusals(): void;
|
|
62
102
|
close(): Promise<void>;
|
|
63
103
|
/**
|
|
64
104
|
* Binds `recordArg` to `bindingArg`, inside its serial chain: a Claude launch to its background job and, when it has
|
|
@@ -70,6 +110,36 @@ export declare class ControllerWorkerCallers implements IFleetWorkerCallerHooks
|
|
|
70
110
|
* replaced, after the fleet proved the bridge's process to be the next process of the same job.
|
|
71
111
|
*/
|
|
72
112
|
private enrollClaude;
|
|
113
|
+
/**
|
|
114
|
+
* Enrolls a bridge that holds no launch this controller can use by its process chain (AGL-1888). Every check is
|
|
115
|
+
* required: (1) the bridge holds its own connection and runs the bridge command this controller approves now; (2) its
|
|
116
|
+
* parent, the process it runs under directly and never one further up, is a process of the controller's user; (5) the
|
|
117
|
+
* parent runs an installed Claude Code release, proved locally before anything of the fleet is read; (3) a fresh
|
|
118
|
+
* inventory of the fleet's Claude homes lists that parent exactly once, as the process of a background job, and the
|
|
119
|
+
* parent is unchanged across the read; (4) exactly one live fleet Claude worker binds that job's session. The bridge
|
|
120
|
+
* then enrolls into that worker's caller record.
|
|
121
|
+
*/
|
|
122
|
+
private enrollProcess;
|
|
123
|
+
private identifyProcess;
|
|
124
|
+
/**
|
|
125
|
+
* Enrolls a bridge whose process the fleet identified into its worker's caller record: the worker's current bound
|
|
126
|
+
* record proves it as for any of its bridges (`enrollClaude`); only a worker without one, or with one revoked, also by
|
|
127
|
+
* that proof, gets a record created and bound to the job's process, and only while the epoch is still `epochArg`, the
|
|
128
|
+
* one the identification began in. A record a fleet wake prepared is never replaced.
|
|
129
|
+
*/
|
|
130
|
+
private enrollIdentified;
|
|
131
|
+
/** The current, verified record of a worker that is bound to `processArg`: the same PID and start. */
|
|
132
|
+
private recordOfProcess;
|
|
133
|
+
/**
|
|
134
|
+
* The fleet's identification of the process `parentArg`, shared by every enrollment that waits for it, with the epoch
|
|
135
|
+
* it began in. One that began before the fleet's last adoption or re-bind is not shared any more.
|
|
136
|
+
*/
|
|
137
|
+
private identifyOnce;
|
|
138
|
+
/**
|
|
139
|
+
* Where a process enrollment's refusal goes: once per job session or worker and reason to the controller log, never
|
|
140
|
+
* for a bridge whose parent runs no Claude job of the inventory (an AGL terminal, a harness's own server).
|
|
141
|
+
*/
|
|
142
|
+
private noteProcessRefusal;
|
|
73
143
|
/**
|
|
74
144
|
* Proves the bridge's process to be the current process of the job the launch is bound to, from a fresh inventory the
|
|
75
145
|
* fleet reads, and binds the launch to it at the current revision. A bridge refused for good is remembered for its
|
|
@@ -83,6 +153,7 @@ export declare class ControllerWorkerCallers implements IFleetWorkerCallerHooks
|
|
|
83
153
|
* checked against its generation's, and only while it is still its worker's current launch. It is restored
|
|
84
154
|
* unverified: its bridge enrolls only after a fresh inventory shows the job still the worker's, in the kept process
|
|
85
155
|
* when that still runs unchanged, or in the bridge's process, which then proves itself as the job's next process.
|
|
156
|
+
* Otherwise the reason it cannot be restored, which is logged only when the bridge's process does not identify it.
|
|
86
157
|
*/
|
|
87
158
|
private restore;
|
|
88
159
|
/** The kept process of a restored launch while it still runs as it was proved: the same PID, start and snapshot. */
|