@matter/protocol 0.16.0-alpha.0-20251217-038f88085 → 0.16.0-alpha.0-20251221-21acf226d

package/dist/esm/certificate/kinds/definitions/operational.d.ts

@@ -316,7 +316,7 @@ export declare namespace OperationalCertificate {
             pseudonym: import("#types").OptionalFieldType<string>;
             domainComponent: import("#types").OptionalFieldType<string>;
         } & {
-            icacId: import("#types").FieldType<number | bigint>;
+            icacId: import("#types").OptionalFieldType<number | bigint>;
             fabricId: import("#types").OptionalFieldType<import("#types").FabricId>;
         } & {
             commonNamePs: import("#types").OptionalFieldType<string>;

package/dist/esm/certificate/kinds/definitions/operational.js

@@ -134,7 +134,7 @@ var OperationalCertificate;
   });
   OperationalCertificate2.TlvIcac = BaseMatterCertificate({
     subject: {
-      icacId: TlvField(19, TlvUInt64),
+      icacId: TlvOptionalField(19, TlvUInt64),
       fabricId: TlvOptionalField(21, TlvFabricId)
     },
     issuer: AllowedSubjectAndIssuerMatterFields

package/dist/esm/certificate/kinds/definitions/operational.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../../../src/certificate/kinds/definitions/operational.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["OperationalCertificate"]
 }

package/dist/esm/common/FailsafeContext.js

@@ -173,8 +173,8 @@ class FailsafeContext {
       }
     }
     await builder.setOperationalCert(nocValue, icacValue);
-    const fabricAlreadyExisting = this.#fabrics.find((fabric) => builder.matchesToFabric(fabric));
-    if (fabricAlreadyExisting) {
+    const newGlobalId = await builder.globalId;
+    if (this.#fabrics.has(newGlobalId)) {
       throw new MatterFabricConflictError(
         `Fabric with Id ${builder.fabricId} and Node Id ${builder.nodeId} already exists.`
       );

package/dist/esm/common/FailsafeContext.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/common/FailsafeContext.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/dcl/DclClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DclClient.d.ts","sourceRoot":"","sources":["../../../src/dcl/DclClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EACH,mBAAmB,EAMnB,qCAAqC,EACrC,aAAa,EAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAU,WAAW,EAAW,MAAM,UAAU,CAAC;AAUlE,4CAA4C;AAC5C,qBAAa,cAAe,SAAQ,WAAW;CAAG;AAElD,qDAAqD;AACrD,qBAAa,sBAAuB,SAAQ,cAAc;gBAC1C,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,YAAY;CAG/E;AAED,4EAA4E;AAC5E,qBAAa,SAAS;;IAGN,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,GAAE,OAAc;IAkEjD,wBAAwB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAUpD,6BAA6B,CAAC,OAAO,EAAE,qCAAqC,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAiBzG,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAexE,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAehF,wCAAwC,CAC1C,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAmB/B;;OAEG;IACG,eAAe,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;CAGpD;AAED,yBAAiB,SAAS,CAAC;IACvB,UAAiB,OAAO;QACpB,+CAA+C;QAC/C,OAAO,CAAC,EAAE,QAAQ,CAAC;KACtB;CACJ"}
+{"version":3,"file":"DclClient.d.ts","sourceRoot":"","sources":["../../../src/dcl/DclClient.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EACH,mBAAmB,EAMnB,qCAAqC,EACrC,aAAa,EAChB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAU,WAAW,EAAW,MAAM,UAAU,CAAC;AAUlE,4CAA4C;AAC5C,qBAAa,cAAe,SAAQ,WAAW;CAAG;AAElD,qDAAqD;AACrD,qBAAa,sBAAuB,SAAQ,cAAc;gBAC1C,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,CAAC,EAAE,YAAY;CAG/E;AAED,4EAA4E;AAC5E,qBAAa,SAAS;;IAGN,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,GAAE,OAAc;IAiEjD,wBAAwB,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAUpD,6BAA6B,CAAC,OAAO,EAAE,qCAAqC,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAiBzG,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAexE,0BAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAehF,wCAAwC,CAC1C,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;IAmB/B;;OAEG;IACG,eAAe,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,OAAO;CAGpD;AAED,yBAAiB,SAAS,CAAC;IACvB,UAAiB,OAAO;QACpB,+CAA+C;QAC/C,OAAO,CAAC,EAAE,QAAQ,CAAC;KACtB;CACJ"}

package/dist/esm/dcl/DclClient.js

@@ -53,12 +53,11 @@ class DclClient {
       return await response.json();
     } catch (error) {
       MatterDclResponseError.reject(error);
-      MatterError.accept(error);
       throw new MatterDclResponseError(
         path,
         {
           code: 500,
-          message: error.message,
+          message: error.message ?? error,
           details: []
         },
         { cause: error }

package/dist/esm/dcl/DclClient.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/dcl/DclClient.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/dcl/DclOtaUpdateService.d.ts

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { PersistedFileDesignator } from "#bdx/PersistedFileDesignator.js";
+import { ScopedStorage } from "#bdx/ScopedStorage.js";
 import { Construction, Environment, Environmental, MatterError } from "#general";
 import { DeviceSoftwareVersionModelDclSchema } from "#types";
 /** Error thrown when OTA update check or download fails */
@@ -28,19 +29,20 @@ export declare class DclOtaUpdateService {
     get construction(): Construction<DclOtaUpdateService>;
     constructor(environment: Environment);
     static [Environmental.create](env: Environment): DclOtaUpdateService;
+    get storage(): ScopedStorage;
     /**
      * Check DCL for available software updates for a device, defined by it's vendor ID, product ID and current
      * software version. If a target software version is provided, only that version is checked for applicability and
      * ignoring other newer versions.
-     *
-     * @param vendorId - Vendor ID of the device
-     * @param productId - Product ID of the device
-     * @param currentSoftwareVersion - Current software version of the device
-     * @param isProduction - Whether to check production DCL (true) or test DCL (false)
-     * @param targetSoftwareVersion - Optional specific version to check. If not provided, checks for any newer version.
-     * @returns Update information if an update is available, undefined otherwise
      */
-    checkForUpdate(vendorId: number, productId: number, currentSoftwareVersion: number, isProduction?: boolean, targetSoftwareVersion?: number): Promise<DeviceSoftwareVersionModelDclSchema | undefined>;
+    checkForUpdate(options: {
+        vendorId: number;
+        productId: number;
+        currentSoftwareVersion: number;
+        includeStoredUpdates?: boolean;
+        isProduction?: boolean;
+        targetSoftwareVersion?: number;
+    }): Promise<DeviceSoftwareVersionModelDclSchema | undefined>;
     /**
      * Store an OTA update image from a ReadableStream into persistent storage.
      */
@@ -110,16 +112,6 @@ export declare class DclOtaUpdateService {
      * @param fileUrl - HTTPS URL to the OTA image file
      * @param options - Optional parameters for DCL-specific fields not in OTA header
      * @returns OtaUpdateInfo with file URL and header data
-     *
-     * @example
-     * ```typescript
-     * const service = new DclOtaUpdateService(environment);
-     * const updateInfo = await service.createUpdateInfoFromFile(
-     *     "https://example.com/ota-image.bin",
-     *     { cdVersionNumber: 1 }
-     * );
-     * const fileDesignator = await service.downloadUpdate(updateInfo, true);
-     * ```
      */
     createUpdateInfoFromFile(fileUrl: string, options?: {
         /** Certificate Declaration version number. Defaults to 1. */
@@ -152,19 +144,7 @@ export declare class DclOtaUpdateService {
      * @param options.isProduction - Filter by production (true) or test (false) mode
      * @returns Array of downloaded update information
      */
-    find(options?: {
-        vendorId?: number;
-        productId?: number;
-        isProduction?: boolean;
-    }): Promise<{
-        filename: string;
-        vendorId: number;
-        productId: number;
-        softwareVersion: number;
-        softwareVersionString: string;
-        mode: "prod" | "test";
-        size: number;
-    }[]>;
+    find(options?: DclOtaUpdateService.FindOptions): Promise<DclOtaUpdateService.OtaUpdateListEntry[]>;
     /** Get a PersistedFileDesignator for a stored OTA update file by filename. */
     fileDesignatorForUpdate(filename: string): Promise<PersistedFileDesignator>;
     /**
@@ -187,4 +167,23 @@ export declare class DclOtaUpdateService {
         isProduction?: boolean;
     }): Promise<number>;
 }
+export declare namespace DclOtaUpdateService {
+    type OtaUpdateListEntry = {
+        filename: string;
+        vendorId: number;
+        productId: number;
+        softwareVersion: number;
+        softwareVersionString: string;
+        minApplicableSoftwareVersion?: number;
+        maxApplicableSoftwareVersion?: number;
+        mode: "prod" | "test";
+        size: number;
+    };
+    interface FindOptions {
+        vendorId?: number;
+        productId?: number;
+        isProduction?: boolean;
+        currentVersion?: number;
+    }
+}
 //# sourceMappingURL=DclOtaUpdateService.d.ts.map

package/dist/esm/dcl/DclOtaUpdateService.d.ts.map

@@ -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,EAEH,YAAY,EAGZ,WAAW,EACX,aAAa,EAKb,WAAW,EAId,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;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG,mCAAmC,CAAC;AAMhE;;;;;;;GAOG;AACH,qBAAa,mBAAmB;;IAK5B,IAAI,YAAY,sCAEf;gBAEW,WAAW,EAAE,WAAW;IAUpC,MAAM,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,WAAW;IAI9C;;;;;;;;;;;OAWG;IACG,cAAc,CAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,sBAAsB,EAAE,MAAM,EAC9B,YAAY,UAAO,EACnB,qBAAqB,CAAC,EAAE,MAAM;IAwGlC;;OAEG;IACG,KAAK,CAAC,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,UAAO;IAyC9F;;;;;;;;;OASG;IACG,cAAc,CAChB,UAAU,EAAE,aAAa,EACzB,YAAY,UAAO,EACnB,KAAK,UAAQ,EACb,OAAO,8BAAuB;IAgKlC;;;;;;;;;;;;;;;;;;OAkBG;IACG,oBAAoB,CACtB,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,EAClC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;QACN,6DAA6D;QAC7D,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,uDAAuD;QACvD,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,yCAAyC;QACzC,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;;WAGG;QACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;QACtC;;;WAGG;QACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;KACzC;IAyCL;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IACG,wBAAwB,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE;QACN,6DAA6D;QAC7D,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,uDAAuD;QACvD,oBAAoB,CAAC,EAAE,OAAO,CAAC;QAC/B,yCAAyC;QACzC,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB;;;WAGG;QACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;QACtC;;;WAGG;QACH,4BAA4B,CAAC,EAAE,MAAM,CAAC;KACzC;IAyBL;;;;;;;;;;;;OAYG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE;kBAYpE,MAAM;kBACN,MAAM;mBACL,MAAM;yBACA,MAAM;+BACA,MAAM;cACvB,MAAM,GAAG,MAAM;cACf,MAAM;;IA2DpB,8EAA8E;IACxE,uBAAuB,CAAC,QAAQ,EAAE,MAAM;IAkB9C;;;;;;;;;;;;OAYG;IACG,MAAM,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE;CAkD7G"}
+{"version":3,"file":"DclOtaUpdateService.d.ts","sourceRoot":"","sources":["../../../src/dcl/DclOtaUpdateService.ts"],"names":[],"mappings":"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"}

package/dist/esm/dcl/DclOtaUpdateService.js

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { PersistedFileDesignator } from "#bdx/PersistedFileDesignator.js";
+import { ScopedStorage } from "#bdx/ScopedStorage.js";
 import {
-  Bytes,
   Construction,
   Crypto,
   Diagnostic,
@@ -18,8 +18,8 @@ import {
   StorageService
 } from "#general";
 import { VendorId } from "#types";
+import { OtaImageReader } from "../ota/OtaImageReader.js";
 import { DclClient, MatterDclError } from "./DclClient.js";
-import { OtaImageReader } from "./OtaImageReader.js";
 const logger = Logger.get("DclOtaUpdateService");
 class OtaUpdateError extends MatterError {
   constructor(message, options) {
@@ -27,7 +27,7 @@ class OtaUpdateError extends MatterError {
   }
 }
 const OTA_DOWNLOAD_TIMEOUT = Minutes(5);
-const OTA_FILENAME_REGEX = /^([0-9a-f]+)-([0-9a-f]+)-(prod|test)$/i;
+const OTA_FILENAME_REGEX = /^[0-9a-f]+[./][0-9a-f]+[./](?:prod|test)$/i;
 class DclOtaUpdateService {
   #construction;
   #crypto;
@@ -39,25 +39,55 @@ class DclOtaUpdateService {
     environment.set(DclOtaUpdateService, this);
     this.#crypto = environment.get(Crypto);
     this.#construction = Construction(this, async () => {
-      this.#storage = (await environment.get(StorageService).open("ota")).createContext("bin");
+      this.#storage = new ScopedStorage(
+        (await environment.get(StorageService).open("ota")).createContext("bin"),
+        "ota"
+      );
     });
   }
   static [Environmental.create](env) {
     return new DclOtaUpdateService(env);
   }
+  get storage() {
+    this.construction.assert();
+    return this.#storage;
+  }
   /**
    * Check DCL for available software updates for a device, defined by it's vendor ID, product ID and current
    * software version. If a target software version is provided, only that version is checked for applicability and
    * ignoring other newer versions.
-   *
-   * @param vendorId - Vendor ID of the device
-   * @param productId - Product ID of the device
-   * @param currentSoftwareVersion - Current software version of the device
-   * @param isProduction - Whether to check production DCL (true) or test DCL (false)
-   * @param targetSoftwareVersion - Optional specific version to check. If not provided, checks for any newer version.
-   * @returns Update information if an update is available, undefined otherwise
    */
-  async checkForUpdate(vendorId, productId, currentSoftwareVersion, isProduction = true, targetSoftwareVersion) {
+  async checkForUpdate(options) {
+    const {
+      vendorId,
+      productId,
+      currentSoftwareVersion,
+      includeStoredUpdates = false,
+      isProduction = true,
+      targetSoftwareVersion
+    } = options;
+    let localUpdateFound = void 0;
+    if (includeStoredUpdates) {
+      const localUpdates = await this.find({
+        vendorId,
+        productId,
+        isProduction,
+        currentVersion: currentSoftwareVersion
+      });
+      if (localUpdates.length) {
+        localUpdateFound = {
+          ...localUpdates[0],
+          vid: VendorId(vendorId),
+          pid: productId,
+          cdVersionNumber: 0,
+          softwareVersionValid: true,
+          schemaVersion: 1,
+          minApplicableSoftwareVersion: localUpdates[0].minApplicableSoftwareVersion ?? 0,
+          maxApplicableSoftwareVersion: localUpdates[0].maxApplicableSoftwareVersion ?? localUpdates[0].softwareVersion - 1
+        };
+        logger.debug(`Found local update`, Diagnostic.dict(localUpdateFound));
+      }
+    }
     const dclClient = new DclClient(isProduction);
     const diagnosticInfo = {
       vid: vendorId,
@@ -67,6 +97,16 @@ class DclOtaUpdateService {
     };
     try {
       if (targetSoftwareVersion !== void 0) {
+        if (localUpdateFound !== void 0 && localUpdateFound.softwareVersion === targetSoftwareVersion) {
+          logger.debug(
+            `Update already available locally for specific version`,
+            Diagnostic.dict({
+              ...diagnosticInfo,
+              target: targetSoftwareVersion
+            })
+          );
+          return localUpdateFound;
+        }
         logger.debug(
           `Checking update in DCL for specific version`,
           Diagnostic.dict({
@@ -86,20 +126,33 @@ class DclOtaUpdateService {
       const newerVersions = softwareVersions.filter((version) => version > currentSoftwareVersion).sort((a, b) => b - a);
       if (newerVersions.length === 0) {
         logger.debug(`No newer versions available in DCL`, Diagnostic.dict(diagnosticInfo));
+        if (localUpdateFound !== void 0) {
+          logger.info(`Other update already available locally`, Diagnostic.dict(diagnosticInfo));
+          return localUpdateFound;
+        }
         return;
       }
       logger.debug(`Found ${newerVersions.length} newer version(s) in DCL`, Diagnostic.dict(diagnosticInfo));
       for (const version of newerVersions) {
-        const updateInfo = await this.#checkSpecificVersion(
-          dclClient,
-          vendorId,
-          productId,
-          version,
-          currentSoftwareVersion
-        );
-        if (updateInfo !== void 0) {
-          logger.info(`Update available in DCL`, Diagnostic.dict({ new: version, ...diagnosticInfo }));
-          return updateInfo;
+        try {
+          const updateInfo = await this.#checkSpecificVersion(
+            dclClient,
+            vendorId,
+            productId,
+            version,
+            currentSoftwareVersion
+          );
+          if (updateInfo !== void 0) {
+            logger.info(`Update available in DCL`, Diagnostic.dict({ new: version, ...diagnosticInfo }));
+            if (localUpdateFound !== void 0 && localUpdateFound.softwareVersion > updateInfo.softwareVersion) {
+              logger.info(`Newer update already available locally`, Diagnostic.dict(diagnosticInfo));
+              return localUpdateFound;
+            }
+            return updateInfo;
+          }
+        } catch (error) {
+          MatterDclError.accept(error);
+          logger.info(`Failed to check for update for VID: ${vendorId}, PID: ${productId}: ${error.message}`);
         }
       }
       logger.info(`No applicable updates found in DCL`, Diagnostic.dict(diagnosticInfo));
@@ -107,6 +160,10 @@ class DclOtaUpdateService {
       MatterDclError.accept(error);
       logger.info(`Failed to check for updates for VID: ${vendorId}, PID: ${productId}: ${error.message}`);
     }
+    if (localUpdateFound !== void 0) {
+      logger.info(`Other update already available locally`, Diagnostic.dict(diagnosticInfo));
+      return localUpdateFound;
+    }
   }
   async #verifyUpdate(updateInfo, fileDesignator) {
     const { otaFileSize, softwareVersion, vid, pid } = updateInfo;
@@ -131,7 +188,7 @@ class DclOtaUpdateService {
     }
   }
   #fileName(vid, pid, isProduction) {
-    return `${vid.toString(16)}-${pid.toString(16)}-${isProduction ? "prod" : "test"}`;
+    return `${vid.toString(16)}.${pid.toString(16)}.${isProduction ? "prod" : "test"}`;
   }
   /**
    * Store an OTA update image from a ReadableStream into persistent storage.
@@ -186,9 +243,6 @@ class DclOtaUpdateService {
       v: `${softwareVersion} (${softwareVersionString})`,
       prod: isProduction
     };
-    if (!otaUrl?.trim()) {
-      throw new OtaUpdateError("No OTA URL provided in update info");
-    }
     const filename = this.#fileName(vid, pid, isProduction);
     const fileDesignator = new PersistedFileDesignator(filename, storage);
     if (await fileDesignator.exists()) {
@@ -203,6 +257,9 @@ class DclOtaUpdateService {
       }
       await fileDesignator.delete();
     }
+    if (!otaUrl?.trim()) {
+      throw new OtaUpdateError("No OTA URL provided in update info");
+    }
     let url;
     try {
       url = new URL(otaUrl);
@@ -317,9 +374,6 @@ class DclOtaUpdateService {
       cdVersionNumber: options?.cdVersionNumber ?? 1,
       softwareVersionValid: options?.softwareVersionValid ?? true,
       otaUrl,
-      otaFileSize: header.payloadSize,
-      otaChecksum: Bytes.toBase64(header.imageDigest),
-      otaChecksumType: header.imageDigestType,
       // Use header values if present, otherwise use provided options or defaults
       minApplicableSoftwareVersion: header.minApplicableSoftwareVersion ?? options?.minApplicableSoftwareVersion ?? 0,
       maxApplicableSoftwareVersion: header.maxApplicableSoftwareVersion ?? options?.maxApplicableSoftwareVersion ?? header.softwareVersion - 1,
@@ -353,16 +407,6 @@ class DclOtaUpdateService {
    * @param fileUrl - HTTPS URL to the OTA image file
    * @param options - Optional parameters for DCL-specific fields not in OTA header
    * @returns OtaUpdateInfo with file URL and header data
-   *
-   * @example
-   * ```typescript
-   * const service = new DclOtaUpdateService(environment);
-   * const updateInfo = await service.createUpdateInfoFromFile(
-   *     "https://example.com/ota-image.bin",
-   *     { cdVersionNumber: 1 }
-   * );
-   * const fileDesignator = await service.downloadUpdate(updateInfo, true);
-   * ```
    */
   async createUpdateInfoFromFile(fileUrl, options) {
     const fileProtocol = fileUrl.split(":")[0].toLowerCase();
@@ -393,51 +437,11 @@ class DclOtaUpdateService {
    * @param options.isProduction - Filter by production (true) or test (false) mode
    * @returns Array of downloaded update information
    */
-  async find(options) {
+  async find(options = {}) {
     if (this.#storage === void 0) {
       await this.construction;
     }
-    const storage = this.#storage;
-    const keys = await storage.keys();
-    logger.debug(`Scanning stored OTA files, found ${keys.length} total files`);
-    const results = new Array();
-    for (const key of keys) {
-      const match = key.match(OTA_FILENAME_REGEX);
-      logger.debug(`Checking stored OTA file: ${key}: match=${match !== null}`);
-      if (!match) {
-        continue;
-      }
-      const [, vidHex, pidHex, mode] = match;
-      const vendorId = parseInt(vidHex, 16);
-      const productId = parseInt(pidHex, 16);
-      const isProduction = mode === "prod";
-      if (options?.vendorId !== void 0 && vendorId !== options.vendorId) {
-        continue;
-      }
-      if (options?.productId !== void 0 && productId !== options.productId) {
-        continue;
-      }
-      if (options?.isProduction !== void 0 && isProduction !== options.isProduction) {
-        continue;
-      }
-      try {
-        const fileDesignator = new PersistedFileDesignator(key, storage);
-        const blob = await fileDesignator.openBlob();
-        const reader = blob.stream().getReader();
-        const header = await OtaImageReader.header(reader);
-        results.push({
-          filename: key,
-          vendorId,
-          productId,
-          softwareVersion: header.softwareVersion,
-          softwareVersionString: header.softwareVersionString,
-          mode,
-          size: blob.size
-        });
-      } catch (error) {
-        logger.warn(`Failed to read OTA file ${key}:`, error);
-      }
-    }
+    const results = await this.#findEntries(this.#storage.context, options);
     results.sort((a, b) => {
       if (a.mode !== b.mode) return a.mode === "prod" ? -1 : 1;
       if (a.vendorId !== b.vendorId) return a.vendorId - b.vendorId;
@@ -446,6 +450,98 @@ class DclOtaUpdateService {
     });
     return results;
   }
+  async #findEntries(context, options) {
+    const { vendorId } = options;
+    if (vendorId !== void 0) {
+      const vendorEntries = await this.#findVendorEntries(context.createContext(vendorId.toString(16)), options);
+      return vendorEntries.map((entry) => ({
+        ...entry,
+        vendorId,
+        filename: this.#fileName(vendorId, entry.productId, entry.mode === "prod")
+      }));
+    }
+    const result = new Array();
+    for (const vendorIdHex of await context.contexts()) {
+      const vendorId2 = parseInt(vendorIdHex, 16);
+      const vendorEntries = await this.#findVendorEntries(context.createContext(vendorIdHex), options);
+      result.push(
+        ...vendorEntries.map((entry) => ({
+          ...entry,
+          vendorId: vendorId2,
+          filename: this.#fileName(vendorId2, entry.productId, entry.mode === "prod")
+        }))
+      );
+    }
+    return result;
+  }
+  async #findVendorEntries(vendorContext, options) {
+    const { productId } = options;
+    if (productId !== void 0) {
+      const productEntries = await this.#findVendorProductEntries(
+        vendorContext.createContext(productId.toString(16)),
+        options
+      );
+      return productEntries.map((entry) => ({ ...entry, productId }));
+    }
+    const result = new Array();
+    for (const productIdHex of await vendorContext.contexts()) {
+      const productId2 = parseInt(productIdHex, 16);
+      const productEntries = await this.#findVendorProductEntries(
+        vendorContext.createContext(productIdHex),
+        options
+      );
+      result.push(...productEntries.map((entry) => ({ ...entry, productId: productId2 })));
+    }
+    return result;
+  }
+  async #findVendorProductEntries(productContext, options) {
+    const { isProduction } = options;
+    const result = new Array();
+    if (isProduction !== false && await productContext.has("prod")) {
+      const prodResult = await this.#checkEntry(new PersistedFileDesignator("prod", productContext), options);
+      if (prodResult !== void 0) {
+        result.push({
+          ...prodResult,
+          mode: "prod"
+        });
+      }
+    }
+    if (isProduction !== true && await productContext.has("test")) {
+      const testResult = await this.#checkEntry(new PersistedFileDesignator("test", productContext), options);
+      if (testResult !== void 0) {
+        result.push({
+          ...testResult,
+          mode: "test"
+        });
+      }
+    }
+    return result;
+  }
+  async #checkEntry(fileDesignator, options) {
+    try {
+      const blob = await fileDesignator.openBlob();
+      const reader = blob.stream().getReader();
+      const header = await OtaImageReader.header(reader);
+      const { currentVersion } = options;
+      if (currentVersion !== void 0) {
+        if (header.minApplicableSoftwareVersion !== void 0 && currentVersion < header.minApplicableSoftwareVersion) {
+          return;
+        }
+        if (header.maxApplicableSoftwareVersion !== void 0 && currentVersion > header.maxApplicableSoftwareVersion) {
+          return;
+        }
+      }
+      return {
+        softwareVersion: header.softwareVersion,
+        softwareVersionString: header.softwareVersionString,
+        minApplicableSoftwareVersion: header.minApplicableSoftwareVersion,
+        maxApplicableSoftwareVersion: header.maxApplicableSoftwareVersion,
+        size: blob.size
+      };
+    } catch (error) {
+      logger.warn(`Failed to read OTA file ${fileDesignator.text}:`, error);
+    }
+  }
   /** Get a PersistedFileDesignator for a stored OTA update file by filename. */
   async fileDesignatorForUpdate(filename) {
     if (!OTA_FILENAME_REGEX.test(filename)) {
@@ -454,8 +550,7 @@ class DclOtaUpdateService {
     if (this.#storage === void 0) {
       await this.construction;
     }
-    const storage = this.#storage;
-    const fileDesignator = new PersistedFileDesignator(filename, storage);
+    const fileDesignator = new PersistedFileDesignator(filename, this.#storage);
     if (!await fileDesignator.exists()) {
       throw new OtaUpdateError(`OTA file not found: ${filename}`);
     }
@@ -479,12 +574,12 @@ class DclOtaUpdateService {
       await this.construction;
     }
     const storage = this.#storage;
-    const { vendorId, productId, isProduction = true } = options;
+    const { vendorId, productId, isProduction } = options;
     let { filename } = options;
-    if (!filename && vendorId !== void 0 && productId !== void 0) {
+    if (filename == void 0 && vendorId !== void 0 && productId !== void 0 && isProduction !== void 0) {
       filename = this.#fileName(vendorId, productId, isProduction);
     }
-    if (filename) {
+    if (filename !== void 0) {
       try {
         const fileDesignator = await this.fileDesignatorForUpdate(filename);
         await fileDesignator.delete();
@@ -499,15 +594,18 @@ class DclOtaUpdateService {
       throw new OtaUpdateError("Either filename or vendorId must be provided to delete files");
     }
     const vendorHex = vendorId.toString(16);
-    const mode = isProduction ? "prod" : "test";
-    const pattern = new RegExp(`^${vendorHex}-[0-9a-f]+-${mode}$`, "i");
-    const keys = await storage.keys();
+    const vendorStorage = storage.context.createContext(vendorHex);
     let deletedCount = 0;
-    for (const key of keys) {
-      if (pattern.test(key)) {
-        const fileDesignator = new PersistedFileDesignator(key, storage);
+    for (const key of await vendorStorage.contexts()) {
+      const prodStorage = vendorStorage.createContext(key);
+      if (isProduction !== false && await prodStorage.has("prod")) {
+        const fileDesignator = new PersistedFileDesignator("prod", prodStorage);
+        await fileDesignator.delete();
+        deletedCount++;
+      }
+      if (isProduction !== true && await prodStorage.has("test")) {
+        const fileDesignator = new PersistedFileDesignator("test", prodStorage);
         await fileDesignator.delete();
-        logger.info(`Deleted OTA file: ${key}`);
         deletedCount++;
       }
     }