@matter/protocol 0.16.9 → 0.16.10-alpha.0-20260218-52b333ceb
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/dist/cjs/dcl/DclCertificateService.d.ts.map +1 -1
- package/dist/cjs/dcl/DclCertificateService.js +18 -2
- package/dist/cjs/dcl/DclCertificateService.js.map +1 -1
- package/dist/cjs/dcl/DclOtaUpdateService.d.ts +9 -4
- package/dist/cjs/dcl/DclOtaUpdateService.d.ts.map +1 -1
- package/dist/cjs/dcl/DclOtaUpdateService.js +126 -51
- package/dist/cjs/dcl/DclOtaUpdateService.js.map +2 -2
- package/dist/cjs/mdns/MdnsClient.d.ts.map +1 -1
- package/dist/cjs/mdns/MdnsClient.js +1 -3
- package/dist/cjs/mdns/MdnsClient.js.map +1 -1
- package/dist/cjs/peer/PeerSet.js +2 -2
- package/dist/cjs/peer/PeerSet.js.map +1 -1
- package/dist/esm/dcl/DclCertificateService.d.ts.map +1 -1
- package/dist/esm/dcl/DclCertificateService.js +18 -2
- package/dist/esm/dcl/DclCertificateService.js.map +1 -1
- package/dist/esm/dcl/DclOtaUpdateService.d.ts +9 -4
- package/dist/esm/dcl/DclOtaUpdateService.d.ts.map +1 -1
- package/dist/esm/dcl/DclOtaUpdateService.js +126 -51
- package/dist/esm/dcl/DclOtaUpdateService.js.map +2 -2
- package/dist/esm/mdns/MdnsClient.d.ts.map +1 -1
- package/dist/esm/mdns/MdnsClient.js +1 -3
- package/dist/esm/mdns/MdnsClient.js.map +1 -1
- package/dist/esm/peer/PeerSet.js +2 -2
- package/dist/esm/peer/PeerSet.js.map +1 -1
- package/package.json +6 -6
- package/src/dcl/DclCertificateService.ts +21 -3
- package/src/dcl/DclOtaUpdateService.ts +171 -62
- package/src/mdns/MdnsClient.ts +1 -4
- package/src/peer/PeerSet.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DclCertificateService.d.ts","sourceRoot":"","sources":["../../../src/dcl/DclCertificateService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,YAAY,EAIZ,QAAQ,EACR,WAAW,EASd,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAkB,MAAM,gBAAgB,CAAC;AAW3D;;;;;GAKG;AACH,qBAAa,qBAAqB;;gBAUlB,WAAW,EAAE,WAAW,EAAE,OAAO,GAAE,qBAAqB,CAAC,OAAY;IAoBjF,IAAI,YAAY,wCAEf;IAaD;;OAEG;IACH,cAAc,CAAC,YAAY,EAAE,KAAK,GAAG,MAAM;IAK3C;;OAEG;IACH,IAAI,YAAY,gDAGf;IAED;;;OAGG;IACG,mBAAmB,CAAC,YAAY,EAAE,KAAK,GAAG,MAAM;IAkBtD;;;OAGG;IACG,qBAAqB,CACvB,YAAY,EAAE,KAAK,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,GAAG;QAAE,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE;IAiE5D;;OAEG;IACG,iBAAiB,CAAC,YAAY,EAAE,KAAK,GAAG,MAAM;IAiBpD;;OAEG;IACG,KAAK;IAkDX;;OAEG;IACG,MAAM,CAAC,KAAK,UAAQ;
|
|
1
|
+
{"version":3,"file":"DclCertificateService.d.ts","sourceRoot":"","sources":["../../../src/dcl/DclCertificateService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,KAAK,EACL,YAAY,EAIZ,QAAQ,EACR,WAAW,EASd,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,SAAS,EAAkB,MAAM,gBAAgB,CAAC;AAW3D;;;;;GAKG;AACH,qBAAa,qBAAqB;;gBAUlB,WAAW,EAAE,WAAW,EAAE,OAAO,GAAE,qBAAqB,CAAC,OAAY;IAoBjF,IAAI,YAAY,wCAEf;IAaD;;OAEG;IACH,cAAc,CAAC,YAAY,EAAE,KAAK,GAAG,MAAM;IAK3C;;OAEG;IACH,IAAI,YAAY,gDAGf;IAED;;;OAGG;IACG,mBAAmB,CAAC,YAAY,EAAE,KAAK,GAAG,MAAM;IAkBtD;;;OAGG;IACG,qBAAqB,CACvB,YAAY,EAAE,KAAK,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO,GAAG;QAAE,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE;IAiE5D;;OAEG;IACG,iBAAiB,CAAC,YAAY,EAAE,KAAK,GAAG,MAAM;IAiBpD;;OAEG;IACG,KAAK;IAkDX;;OAEG;IACG,MAAM,CAAC,KAAK,UAAQ;CA0P7B;AAED,yBAAiB,qBAAqB,CAAC;IACnC,UAAiB,OAAO;QACpB,2FAA2F;QAC3F,qBAAqB,CAAC,EAAE,OAAO,CAAC;QAEhC;;;WAGG;QACH,cAAc,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;QAEjC,+CAA+C;QAC/C,OAAO,CAAC,EAAE,QAAQ,CAAC;KACtB;IAED;;OAEG;IACH,KAAY,mBAAmB,GAAG;QAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;QACrB,YAAY,EAAE,MAAM,CAAC;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,OAAO,CAAC;QAChB,YAAY,EAAE,OAAO,CAAC;KACzB,CAAC;CACL"}
|
|
@@ -253,9 +253,9 @@ class DclCertificateService {
|
|
|
253
253
|
if (this.#closed) {
|
|
254
254
|
return;
|
|
255
255
|
}
|
|
256
|
+
await this.#saveIndex();
|
|
256
257
|
const newCerts = this.#certificateIndex.size - initialSize;
|
|
257
258
|
if (newCerts > 0) {
|
|
258
|
-
await this.#saveIndex();
|
|
259
259
|
logger.info(`Downloaded and stored ${newCerts} new certificates (total: ${this.#certificateIndex.size})`);
|
|
260
260
|
} else {
|
|
261
261
|
logger.info(`All certificates up to date (${this.#certificateIndex.size} total)`);
|
|
@@ -291,7 +291,19 @@ class DclCertificateService {
|
|
|
291
291
|
try {
|
|
292
292
|
const normalizedSubjectKeyId = this.#normalizeSubjectKeyId(certRef.subjectKeyId);
|
|
293
293
|
if (!force && this.#certificateIndex.has(normalizedSubjectKeyId)) {
|
|
294
|
-
|
|
294
|
+
const existing = this.#certificateIndex.get(normalizedSubjectKeyId);
|
|
295
|
+
if (isProduction && !existing.isProduction) {
|
|
296
|
+
existing.isProduction = true;
|
|
297
|
+
logger.debug(
|
|
298
|
+
`Upgraded certificate to production`,
|
|
299
|
+
import_general.Diagnostic.dict({ skid: normalizedSubjectKeyId })
|
|
300
|
+
);
|
|
301
|
+
} else {
|
|
302
|
+
logger.debug(
|
|
303
|
+
`Certificate already exists, skipping`,
|
|
304
|
+
import_general.Diagnostic.dict({ skid: normalizedSubjectKeyId })
|
|
305
|
+
);
|
|
306
|
+
}
|
|
295
307
|
return;
|
|
296
308
|
}
|
|
297
309
|
const certs = await dclClient.fetchRootCertificateBySubject(certRef, options);
|
|
@@ -374,6 +386,10 @@ class DclCertificateService {
|
|
|
374
386
|
* Store a certificate and its metadata.
|
|
375
387
|
*/
|
|
376
388
|
async #storeCertificate(storage, subjectKeyId, derBytes, metadata) {
|
|
389
|
+
const existing = this.#certificateIndex.get(subjectKeyId);
|
|
390
|
+
if (existing?.isProduction && !metadata.isProduction) {
|
|
391
|
+
metadata = { ...metadata, isProduction: true };
|
|
392
|
+
}
|
|
377
393
|
await storage.set(subjectKeyId, derBytes);
|
|
378
394
|
this.#certificateIndex.set(subjectKeyId, metadata);
|
|
379
395
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/dcl/DclCertificateService.ts"],
|
|
4
|
-
"mappings": "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
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": []
|
|
6
6
|
}
|
|
@@ -12,6 +12,7 @@ export declare class OtaUpdateError extends MatterError {
|
|
|
12
12
|
constructor(message: string, options?: ErrorOptions);
|
|
13
13
|
}
|
|
14
14
|
export type OtaUpdateSource = "local" | "dcl-prod" | "dcl-test";
|
|
15
|
+
export type OtaStorageMode = "prod" | "test" | "local";
|
|
15
16
|
export interface DeviceSoftwareVersionModelDclSchemaWithSource extends DeviceSoftwareVersionModelDclSchema {
|
|
16
17
|
source: OtaUpdateSource;
|
|
17
18
|
}
|
|
@@ -53,7 +54,7 @@ export declare class DclOtaUpdateService {
|
|
|
53
54
|
/**
|
|
54
55
|
* Store an OTA update image from a ReadableStream into persistent storage.
|
|
55
56
|
*/
|
|
56
|
-
store(stream: ReadableStream<Uint8Array>, updateInfo: OtaUpdateInfo,
|
|
57
|
+
store(stream: ReadableStream<Uint8Array>, updateInfo: OtaUpdateInfo, mode?: boolean | OtaStorageMode): Promise<PersistedFileDesignator>;
|
|
57
58
|
/**
|
|
58
59
|
* Download and validate an OTA update image from a HTTP pr HTTPS server.
|
|
59
60
|
*
|
|
@@ -161,17 +162,20 @@ export declare class DclOtaUpdateService {
|
|
|
161
162
|
* If only vendor ID is provided (no product ID), all files for that vendor are deleted.
|
|
162
163
|
*
|
|
163
164
|
* @param options - Deletion criteria
|
|
164
|
-
* @param options.filename - Specific filename to delete
|
|
165
|
+
* @param options.filename - Specific filename to delete (e.g. `fff1.8000.prod.3`)
|
|
165
166
|
* @param options.vendorId - Vendor ID to filter files for deletion
|
|
166
167
|
* @param options.productId - Product ID to filter files for deletion (optional, requires vendorId)
|
|
167
|
-
* @param options.isProduction - Production (true) or test (false) mode
|
|
168
|
+
* @param options.isProduction - @deprecated Use mode instead. Production (true) or test (false) mode
|
|
169
|
+
* @param options.mode - Storage mode: "prod", "test", or "local"
|
|
168
170
|
* @returns Number of files deleted
|
|
169
171
|
*/
|
|
170
172
|
delete(options: {
|
|
171
173
|
filename?: string;
|
|
172
174
|
vendorId?: number;
|
|
173
175
|
productId?: number;
|
|
176
|
+
/** @deprecated Use mode instead */
|
|
174
177
|
isProduction?: boolean;
|
|
178
|
+
mode?: OtaStorageMode;
|
|
175
179
|
}): Promise<number>;
|
|
176
180
|
}
|
|
177
181
|
export declare namespace DclOtaUpdateService {
|
|
@@ -183,13 +187,14 @@ export declare namespace DclOtaUpdateService {
|
|
|
183
187
|
softwareVersionString: string;
|
|
184
188
|
minApplicableSoftwareVersion?: number;
|
|
185
189
|
maxApplicableSoftwareVersion?: number;
|
|
186
|
-
mode:
|
|
190
|
+
mode: OtaStorageMode;
|
|
187
191
|
size: number;
|
|
188
192
|
};
|
|
189
193
|
interface FindOptions {
|
|
190
194
|
vendorId?: number;
|
|
191
195
|
productId?: number;
|
|
192
196
|
isProduction?: boolean;
|
|
197
|
+
mode?: OtaStorageMode;
|
|
193
198
|
currentVersion?: number;
|
|
194
199
|
}
|
|
195
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DclOtaUpdateService.d.ts","sourceRoot":"","sources":["../../../src/dcl/DclOtaUpdateService.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EACH,YAAY,EAGZ,WAAW,EACX,aAAa,EAKb,WAAW,EAKd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,mCAAmC,EAAY,MAAM,QAAQ,CAAC;AAMvE,2DAA2D;AAC3D,qBAAa,cAAe,SAAQ,WAAW;gBAC/B,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAGtD;AAED,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,CAAC;AAEhE,MAAM,WAAW,6CAA8C,SAAQ,mCAAmC;IACtG,MAAM,EAAE,eAAe,CAAC;CAC3B;AAED;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,6CAA6C,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,mBAAmB;;IAM5B,IAAI,YAAY,sCAEf;gBAEW,WAAW,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"DclOtaUpdateService.d.ts","sourceRoot":"","sources":["../../../src/dcl/DclOtaUpdateService.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ class OtaUpdateError extends import_general.MatterError {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
const OTA_DOWNLOAD_TIMEOUT = (0, import_general.Minutes)(5);
|
|
44
|
-
const OTA_FILENAME_REGEX = /^[0-9a-f]+[./][0-9a-f]+[./](?:prod|test)
|
|
44
|
+
const OTA_FILENAME_REGEX = /^[0-9a-f]+[./][0-9a-f]+[./](?:prod|test|local)[./]\d+$/i;
|
|
45
45
|
class DclOtaUpdateService {
|
|
46
46
|
#construction;
|
|
47
47
|
#crypto;
|
|
@@ -56,6 +56,7 @@ class DclOtaUpdateService {
|
|
|
56
56
|
this.#construction = (0, import_general.Construction)(this, async () => {
|
|
57
57
|
this.#storageManager = await environment.get(import_general.StorageService).open("ota");
|
|
58
58
|
this.#storage = new import_ScopedStorage.ScopedStorage(this.#storageManager.createContext("bin"), "ota");
|
|
59
|
+
await this.#migrateStorage();
|
|
59
60
|
});
|
|
60
61
|
}
|
|
61
62
|
static [import_general.Environmental.create](env) {
|
|
@@ -68,6 +69,45 @@ class DclOtaUpdateService {
|
|
|
68
69
|
async close() {
|
|
69
70
|
await this.#storageManager?.close();
|
|
70
71
|
}
|
|
72
|
+
async #migrateStorage() {
|
|
73
|
+
const storage = this.#storage;
|
|
74
|
+
const context = storage.context;
|
|
75
|
+
for (const vendorHex of await context.contexts()) {
|
|
76
|
+
const vendorContext = context.createContext(vendorHex);
|
|
77
|
+
for (const productHex of await vendorContext.contexts()) {
|
|
78
|
+
const productContext = vendorContext.createContext(productHex);
|
|
79
|
+
const keys = await productContext.keys();
|
|
80
|
+
for (const key of keys) {
|
|
81
|
+
if (key !== "prod" && key !== "test") {
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
try {
|
|
85
|
+
const headerBlob = await productContext.openBlob(key);
|
|
86
|
+
const headerReader = headerBlob.stream().getReader();
|
|
87
|
+
const header = await import_OtaImageReader.OtaImageReader.header(headerReader);
|
|
88
|
+
await headerReader.cancel();
|
|
89
|
+
const versionKey = header.softwareVersion.toString();
|
|
90
|
+
const modeContext = productContext.createContext(key);
|
|
91
|
+
const copyBlob = await productContext.openBlob(key);
|
|
92
|
+
await modeContext.writeBlobFromStream(versionKey, copyBlob.stream());
|
|
93
|
+
await productContext.delete(key);
|
|
94
|
+
logger.info(
|
|
95
|
+
`Migrated OTA storage: ${vendorHex}.${productHex}.${key} -> ${vendorHex}.${productHex}.${key}.${versionKey}`
|
|
96
|
+
);
|
|
97
|
+
} catch (error) {
|
|
98
|
+
logger.warn(
|
|
99
|
+
`Failed to migrate OTA file ${vendorHex}.${productHex}.${key}, deleting corrupt entry:`,
|
|
100
|
+
error
|
|
101
|
+
);
|
|
102
|
+
try {
|
|
103
|
+
await productContext.delete(key);
|
|
104
|
+
} catch {
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
71
111
|
async #queryDclForUpdate(options) {
|
|
72
112
|
const { vendorId, productId, currentSoftwareVersion, isProduction, targetSoftwareVersion } = options;
|
|
73
113
|
const dclClient = new import_DclClient.DclClient(isProduction);
|
|
@@ -157,20 +197,20 @@ class DclOtaUpdateService {
|
|
|
157
197
|
const localUpdates = await this.find({
|
|
158
198
|
vendorId,
|
|
159
199
|
productId,
|
|
160
|
-
isProduction,
|
|
161
200
|
currentVersion: currentSoftwareVersion
|
|
162
201
|
});
|
|
163
|
-
|
|
202
|
+
for (let i = localUpdates.length - 1; i >= 0; i--) {
|
|
203
|
+
const entry = localUpdates[i];
|
|
164
204
|
const localUpdate = {
|
|
165
|
-
...
|
|
205
|
+
...entry,
|
|
166
206
|
vid: (0, import_types.VendorId)(vendorId),
|
|
167
207
|
pid: productId,
|
|
168
208
|
cdVersionNumber: 0,
|
|
169
209
|
softwareVersionValid: true,
|
|
170
210
|
schemaVersion: 1,
|
|
171
|
-
minApplicableSoftwareVersion:
|
|
172
|
-
maxApplicableSoftwareVersion:
|
|
173
|
-
source:
|
|
211
|
+
minApplicableSoftwareVersion: entry.minApplicableSoftwareVersion ?? 0,
|
|
212
|
+
maxApplicableSoftwareVersion: entry.maxApplicableSoftwareVersion ?? entry.softwareVersion - 1,
|
|
213
|
+
source: entry.mode === "prod" ? "dcl-prod" : entry.mode === "test" ? "dcl-test" : "local"
|
|
174
214
|
};
|
|
175
215
|
if (localUpdate.softwareVersion > currentSoftwareVersion && currentSoftwareVersion >= localUpdate.minApplicableSoftwareVersion && currentSoftwareVersion <= localUpdate.maxApplicableSoftwareVersion) {
|
|
176
216
|
logger.debug(`Found applicable local update`, import_general.Diagnostic.dict(localUpdate));
|
|
@@ -235,26 +275,29 @@ class DclOtaUpdateService {
|
|
|
235
275
|
);
|
|
236
276
|
}
|
|
237
277
|
}
|
|
238
|
-
#fileName(vid, pid,
|
|
239
|
-
return `${vid.toString(16)}.${pid.toString(16)}.${
|
|
278
|
+
#fileName(vid, pid, mode, softwareVersion) {
|
|
279
|
+
return `${vid.toString(16)}.${pid.toString(16)}.${mode}.${softwareVersion}`;
|
|
240
280
|
}
|
|
241
281
|
/**
|
|
242
282
|
* Store an OTA update image from a ReadableStream into persistent storage.
|
|
243
283
|
*/
|
|
244
|
-
async store(stream, updateInfo,
|
|
284
|
+
async store(stream, updateInfo, mode = true) {
|
|
245
285
|
if (this.#storage === void 0) {
|
|
246
286
|
await this.construction;
|
|
247
287
|
}
|
|
248
288
|
const storage = this.#storage;
|
|
289
|
+
if (typeof mode === "boolean") {
|
|
290
|
+
mode = mode ? "prod" : "test";
|
|
291
|
+
}
|
|
249
292
|
const { softwareVersion, softwareVersionString, vid, pid } = updateInfo;
|
|
250
|
-
const filename = this.#fileName(vid, pid,
|
|
293
|
+
const filename = this.#fileName(vid, pid, mode, softwareVersion);
|
|
251
294
|
const fileDesignator = new import_PersistedFileDesignator.PersistedFileDesignator(filename, storage);
|
|
252
295
|
const diagnosticInfo = {
|
|
253
296
|
filename,
|
|
254
297
|
vid,
|
|
255
298
|
pid,
|
|
256
299
|
v: `${softwareVersion} (${softwareVersionString})`,
|
|
257
|
-
|
|
300
|
+
mode
|
|
258
301
|
};
|
|
259
302
|
try {
|
|
260
303
|
await fileDesignator.writeFromStream(stream);
|
|
@@ -285,14 +328,14 @@ class DclOtaUpdateService {
|
|
|
285
328
|
}
|
|
286
329
|
const storage = this.#storage;
|
|
287
330
|
const { otaUrl, softwareVersion, softwareVersionString, vid, pid, source } = updateInfo;
|
|
288
|
-
const
|
|
331
|
+
const mode = source === "dcl-prod" ? "prod" : source === "dcl-test" ? "test" : "local";
|
|
289
332
|
const diagnosticInfo = {
|
|
290
333
|
vid,
|
|
291
334
|
pid,
|
|
292
335
|
v: `${softwareVersion} (${softwareVersionString})`,
|
|
293
|
-
|
|
336
|
+
mode
|
|
294
337
|
};
|
|
295
|
-
const filename = this.#fileName(vid, pid,
|
|
338
|
+
const filename = this.#fileName(vid, pid, mode, softwareVersion);
|
|
296
339
|
const fileDesignator = new import_PersistedFileDesignator.PersistedFileDesignator(filename, storage);
|
|
297
340
|
if (await fileDesignator.exists()) {
|
|
298
341
|
if (!force) {
|
|
@@ -333,7 +376,7 @@ class DclOtaUpdateService {
|
|
|
333
376
|
if (!response.body) {
|
|
334
377
|
throw new OtaUpdateError("No response body received");
|
|
335
378
|
}
|
|
336
|
-
return await this.store(response.body, updateInfo,
|
|
379
|
+
return await this.store(response.body, updateInfo, mode);
|
|
337
380
|
} catch (error) {
|
|
338
381
|
import_general.MatterError.reject(error);
|
|
339
382
|
const otaError = new OtaUpdateError(`Failed to download OTA image from ${otaUrl}`);
|
|
@@ -506,8 +549,10 @@ class DclOtaUpdateService {
|
|
|
506
549
|
await this.construction;
|
|
507
550
|
}
|
|
508
551
|
const results = await this.#findEntries(this.#storage.context, options);
|
|
552
|
+
const modeOrder = { prod: 0, test: 1, local: 2 };
|
|
509
553
|
results.sort((a, b) => {
|
|
510
|
-
|
|
554
|
+
const modeDiff = (modeOrder[a.mode] ?? 99) - (modeOrder[b.mode] ?? 99);
|
|
555
|
+
if (modeDiff !== 0) return modeDiff;
|
|
511
556
|
if (a.vendorId !== b.vendorId) return a.vendorId - b.vendorId;
|
|
512
557
|
if (a.productId !== b.productId) return a.productId - b.productId;
|
|
513
558
|
return a.softwareVersion - b.softwareVersion;
|
|
@@ -521,7 +566,7 @@ class DclOtaUpdateService {
|
|
|
521
566
|
return vendorEntries.map((entry) => ({
|
|
522
567
|
...entry,
|
|
523
568
|
vendorId,
|
|
524
|
-
filename: this.#fileName(vendorId, entry.productId, entry.mode
|
|
569
|
+
filename: this.#fileName(vendorId, entry.productId, entry.mode, entry.softwareVersion)
|
|
525
570
|
}));
|
|
526
571
|
}
|
|
527
572
|
const result = new Array();
|
|
@@ -532,7 +577,7 @@ class DclOtaUpdateService {
|
|
|
532
577
|
...vendorEntries.map((entry) => ({
|
|
533
578
|
...entry,
|
|
534
579
|
vendorId: vendorId2,
|
|
535
|
-
filename: this.#fileName(vendorId2, entry.productId, entry.mode
|
|
580
|
+
filename: this.#fileName(vendorId2, entry.productId, entry.mode, entry.softwareVersion)
|
|
536
581
|
}))
|
|
537
582
|
);
|
|
538
583
|
}
|
|
@@ -559,24 +604,33 @@ class DclOtaUpdateService {
|
|
|
559
604
|
return result;
|
|
560
605
|
}
|
|
561
606
|
async #findVendorProductEntries(productContext, options) {
|
|
562
|
-
const { isProduction } = options;
|
|
607
|
+
const { isProduction, mode: filterMode } = options;
|
|
563
608
|
const result = new Array();
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
mode: "prod"
|
|
570
|
-
});
|
|
609
|
+
const modeContexts = await productContext.contexts();
|
|
610
|
+
const validModes = ["prod", "test", "local"];
|
|
611
|
+
for (const modeStr of modeContexts) {
|
|
612
|
+
if (!validModes.includes(modeStr)) {
|
|
613
|
+
continue;
|
|
571
614
|
}
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
615
|
+
const mode = modeStr;
|
|
616
|
+
if (filterMode !== void 0 && filterMode !== mode) {
|
|
617
|
+
continue;
|
|
618
|
+
}
|
|
619
|
+
if (filterMode === void 0 && isProduction !== void 0) {
|
|
620
|
+
if (isProduction === true && mode !== "prod") continue;
|
|
621
|
+
if (isProduction === false && mode === "prod") continue;
|
|
622
|
+
}
|
|
623
|
+
const modeContext = productContext.createContext(modeStr);
|
|
624
|
+
const versionKeys = await modeContext.keys();
|
|
625
|
+
for (const versionKey of versionKeys) {
|
|
626
|
+
const fileDesignator = new import_PersistedFileDesignator.PersistedFileDesignator(versionKey, modeContext);
|
|
627
|
+
const entry = await this.#checkEntry(fileDesignator, options);
|
|
628
|
+
if (entry !== void 0) {
|
|
629
|
+
result.push({
|
|
630
|
+
...entry,
|
|
631
|
+
mode
|
|
632
|
+
});
|
|
633
|
+
}
|
|
580
634
|
}
|
|
581
635
|
}
|
|
582
636
|
return result;
|
|
@@ -586,6 +640,7 @@ class DclOtaUpdateService {
|
|
|
586
640
|
const blob = await fileDesignator.openBlob();
|
|
587
641
|
const reader = blob.stream().getReader();
|
|
588
642
|
const header = await import_OtaImageReader.OtaImageReader.header(reader);
|
|
643
|
+
await reader.cancel();
|
|
589
644
|
const { currentVersion } = options;
|
|
590
645
|
if (currentVersion !== void 0) {
|
|
591
646
|
if (header.minApplicableSoftwareVersion !== void 0 && currentVersion < header.minApplicableSoftwareVersion) {
|
|
@@ -627,10 +682,11 @@ class DclOtaUpdateService {
|
|
|
627
682
|
* If only vendor ID is provided (no product ID), all files for that vendor are deleted.
|
|
628
683
|
*
|
|
629
684
|
* @param options - Deletion criteria
|
|
630
|
-
* @param options.filename - Specific filename to delete
|
|
685
|
+
* @param options.filename - Specific filename to delete (e.g. `fff1.8000.prod.3`)
|
|
631
686
|
* @param options.vendorId - Vendor ID to filter files for deletion
|
|
632
687
|
* @param options.productId - Product ID to filter files for deletion (optional, requires vendorId)
|
|
633
|
-
* @param options.isProduction - Production (true) or test (false) mode
|
|
688
|
+
* @param options.isProduction - @deprecated Use mode instead. Production (true) or test (false) mode
|
|
689
|
+
* @param options.mode - Storage mode: "prod", "test", or "local"
|
|
634
690
|
* @returns Number of files deleted
|
|
635
691
|
*/
|
|
636
692
|
async delete(options) {
|
|
@@ -639,9 +695,9 @@ class DclOtaUpdateService {
|
|
|
639
695
|
}
|
|
640
696
|
const storage = this.#storage;
|
|
641
697
|
const { vendorId, productId, isProduction } = options;
|
|
642
|
-
let { filename } = options;
|
|
643
|
-
if (
|
|
644
|
-
|
|
698
|
+
let { filename, mode } = options;
|
|
699
|
+
if (mode === void 0 && isProduction !== void 0) {
|
|
700
|
+
mode = isProduction ? "prod" : "test";
|
|
645
701
|
}
|
|
646
702
|
if (filename !== void 0) {
|
|
647
703
|
try {
|
|
@@ -654,23 +710,42 @@ class DclOtaUpdateService {
|
|
|
654
710
|
logger.info(`Deleted OTA file: ${filename}`);
|
|
655
711
|
return 1;
|
|
656
712
|
}
|
|
713
|
+
if (vendorId !== void 0 && productId !== void 0 && mode !== void 0) {
|
|
714
|
+
const vendorHex2 = vendorId.toString(16);
|
|
715
|
+
const productHex = productId.toString(16);
|
|
716
|
+
const modeContext = storage.context.createContext(vendorHex2).createContext(productHex).createContext(mode);
|
|
717
|
+
const versionKeys = await modeContext.keys();
|
|
718
|
+
let deletedCount2 = 0;
|
|
719
|
+
for (const versionKey of versionKeys) {
|
|
720
|
+
const fd = new import_PersistedFileDesignator.PersistedFileDesignator(versionKey, modeContext);
|
|
721
|
+
await fd.delete();
|
|
722
|
+
deletedCount2++;
|
|
723
|
+
}
|
|
724
|
+
if (deletedCount2 > 0) {
|
|
725
|
+
logger.info(`Deleted ${deletedCount2} OTA file(s) for ${vendorHex2}.${productHex}.${mode}`);
|
|
726
|
+
}
|
|
727
|
+
return deletedCount2;
|
|
728
|
+
}
|
|
657
729
|
if (vendorId === void 0) {
|
|
658
730
|
throw new OtaUpdateError("Either filename or vendorId must be provided to delete files");
|
|
659
731
|
}
|
|
660
732
|
const vendorHex = vendorId.toString(16);
|
|
661
733
|
const vendorStorage = storage.context.createContext(vendorHex);
|
|
662
734
|
let deletedCount = 0;
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
735
|
+
const validModes = ["prod", "test", "local"];
|
|
736
|
+
const modesToDelete = mode !== void 0 ? [mode] : validModes;
|
|
737
|
+
for (const productKey of await vendorStorage.contexts()) {
|
|
738
|
+
const productContext = vendorStorage.createContext(productKey);
|
|
739
|
+
const modeSubContexts = await productContext.contexts();
|
|
740
|
+
for (const modeStr of modesToDelete) {
|
|
741
|
+
if (modeSubContexts.includes(modeStr)) {
|
|
742
|
+
const modeContext = productContext.createContext(modeStr);
|
|
743
|
+
for (const versionKey of await modeContext.keys()) {
|
|
744
|
+
const fd = new import_PersistedFileDesignator.PersistedFileDesignator(versionKey, modeContext);
|
|
745
|
+
await fd.delete();
|
|
746
|
+
deletedCount++;
|
|
747
|
+
}
|
|
748
|
+
}
|
|
674
749
|
}
|
|
675
750
|
}
|
|
676
751
|
return deletedCount;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/dcl/DclOtaUpdateService.ts"],
|
|
4
|
-
"mappings": "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",
|
|
5
|
-
"names": ["vendorId", "productId"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["vendorId", "productId", "vendorHex", "deletedCount"]
|
|
6
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MdnsClient.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,eAAe,EAEf,QAAQ,EACR,WAAW,EACX,UAAU,EAMV,QAAQ,EAKR,QAAQ,EAER,UAAU,EAMV,gBAAgB,EAOnB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAC1D,OAAO,EACH,oBAAoB,EACpB,+BAA+B,EAC/B,aAAa,EACb,iBAAiB,EACjB,OAAO,EACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA+B7C,KAAK,4BAA4B,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAoCvE;;;;;;;;;GASG;AACH,MAAM,WAAW,yBAAyB;IACtC,gDAAgD;IAChD,cAAc,EAAE,OAAO,CAAC;IAExB,mCAAmC;IACnC,kBAAkB,EAAE;QAChB,QAAQ,EAAE,cAAc,CAAC;QACzB,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACP;AAYD;;;GAGG;AACH,qBAAa,UAAW,YAAW,OAAO;;IAItC,QAAQ,CAAC,IAAI,mBAAmB;gBAiCpB,MAAM,EAAE,UAAU,EAAE,QAAQ,iBAAmB;IAa3D,uDAAuD;IACvD,IAAI,uBAAuB,mEAE1B;IA2WD;;;OAGG;IACG,qBAAqB,CACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,QAAQ,EAClB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAoCzC,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,UAAO;IAKtF,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO;IAUtG,8BAA8B,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAoLnE;;;;;;;OAOG;IACG,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,OAAO,WAAa,EACpB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqBlC;;;OAGG;IACG,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,OAAO,CAAC,EAAE,QAAQ,EAClB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"MdnsClient.d.ts","sourceRoot":"","sources":["../../../src/mdns/MdnsClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACH,eAAe,EAEf,QAAQ,EACR,WAAW,EACX,UAAU,EAMV,QAAQ,EAKR,QAAQ,EAER,UAAU,EAMV,gBAAgB,EAOnB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,cAAc,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAC1D,OAAO,EACH,oBAAoB,EACpB,+BAA+B,EAC/B,aAAa,EACb,iBAAiB,EACjB,OAAO,EACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA+B7C,KAAK,4BAA4B,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAoCvE;;;;;;;;;GASG;AACH,MAAM,WAAW,yBAAyB;IACtC,gDAAgD;IAChD,cAAc,EAAE,OAAO,CAAC;IAExB,mCAAmC;IACnC,kBAAkB,EAAE;QAChB,QAAQ,EAAE,cAAc,CAAC;QACzB,MAAM,CAAC,EAAE,MAAM,CAAC;KACnB,EAAE,CAAC;CACP;AAYD;;;GAGG;AACH,qBAAa,UAAW,YAAW,OAAO;;IAItC,QAAQ,CAAC,IAAI,mBAAmB;gBAiCpB,MAAM,EAAE,UAAU,EAAE,QAAQ,iBAAmB;IAa3D,uDAAuD;IACvD,IAAI,uBAAuB,mEAE1B;IA2WD;;;OAGG;IACG,qBAAqB,CACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,QAAQ,EAClB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAoCzC,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,UAAO;IAKtF,mCAAmC,CAAC,UAAU,EAAE,+BAA+B,EAAE,cAAc,UAAO;IAUtG,8BAA8B,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAoLnE;;;;;;;OAOG;IACG,yBAAyB,CAC3B,UAAU,EAAE,+BAA+B,EAC3C,OAAO,WAAa,EACpB,qBAAqB,UAAQ,GAC9B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAqBlC;;;OAGG;IACG,qCAAqC,CACvC,UAAU,EAAE,+BAA+B,EAC3C,QAAQ,EAAE,CAAC,MAAM,EAAE,oBAAoB,KAAK,IAAI,EAChD,OAAO,CAAC,EAAE,QAAQ,EAClB,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAC7B,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAiElC,kCAAkC,CAAC,UAAU,EAAE,+BAA+B;mBAtPvD,gBAAgB,EAAE;;;;;;;;;;;;;;;;;oBAtkBzB,MAAM;YACd,MAAM;YACN,MAAM;YACN,MAAM;;IA6zBd;;OAEG;IACG,KAAK;IAwzBX,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,MAAM;IAiBlE,MAAM,CAAC,wBAAwB,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,4BAA4B,CAAC;CAUvF"}
|
|
@@ -690,9 +690,7 @@ class MdnsClient {
|
|
|
690
690
|
cancelSignal?.then(
|
|
691
691
|
() => {
|
|
692
692
|
canceled = true;
|
|
693
|
-
|
|
694
|
-
this.#finishWaiter(queryId, true);
|
|
695
|
-
}
|
|
693
|
+
this.#finishWaiter(queryId, true);
|
|
696
694
|
},
|
|
697
695
|
(cause) => {
|
|
698
696
|
logger.warn("Unexpected error canceling commissioning", cause);
|