@matter/react-native 0.17.0-alpha.0-20260312-920b3a4ec → 0.17.0-alpha.0-20260315-65cdcd993

package/dist/cjs/environment/ReactNativeEnvironment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/ReactNativeEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAA2B,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKxF;;;;GAIG;AACH,wBAAgB,sBAAsB,gBASrC;AA2BD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;EAMhD"}
+{"version":3,"file":"ReactNativeEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/ReactNativeEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAA2B,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKxF;;;;GAIG;AACH,wBAAgB,sBAAsB,gBASrC;AAuBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;EAMhD"}

package/dist/cjs/environment/ReactNativeEnvironment.js

@@ -26,7 +26,7 @@ var import_ReactNativeBle = require("#ble/ReactNativeBle.js");
 var import_general = require("@matter/general");
 var import_protocol = require("@matter/protocol");
 var import_NetworkReactNative = require("../net/NetworkReactNative.js");
-var import_StorageBackendAsyncStorage = require("../storage/StorageBackendAsyncStorage.js");
+var import_ReactNativeWebStorageDriver = require("../storage/ReactNativeWebStorageDriver.js");
 /**
  * @license
  * Copyright 2022-2026 Matter.js Authors
@@ -46,10 +46,8 @@ function loadVariables(env) {
 }
 function configureStorage(env) {
   const service = env.get(import_general.StorageService);
-  env.vars.use(() => {
-    service.location = "Memory";
-  });
-  service.factory = (namespace) => new import_StorageBackendAsyncStorage.StorageBackendAsyncStorage(namespace);
+  service.registerDriver(import_ReactNativeWebStorageDriver.ReactNativeWebStorageDriver);
+  service.defaultDriver = "async-storage";
 }
 function configureNetwork(env) {
   env.set(import_general.Network, new import_NetworkReactNative.NetworkReactNative());

package/dist/cjs/environment/ReactNativeEnvironment.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/environment/ReactNativeEnvironment.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,4BAA+B;AAC/B,qBAAsE;AACtE,sBAAoB;AACpB,gCAAmC;AACnC,wCAA2C;AAV3C;AAAA;AAAA;AAAA;AAAA;AAiBO,SAAS,yBAAyB;AACrC,QAAM,MAAM,IAAI,2BAAY,SAAS;AAErC,gBAAc,GAAG;AACjB,mBAAiB,GAAG;AACpB,mBAAiB,GAAG;AACpB,eAAa,GAAG;AAEhB,SAAO;AACX;AAEA,SAAS,cAAc,KAAkB;AACrC,QAAM,OAAO,IAAI;AAGjB,OAAK,eAAe,YAAY,IAAI,CAAC;AACzC;AAEA,SAAS,iBAAiB,KAAkB;AACxC,QAAM,UAAU,IAAI,IAAI,6BAAc;AAEtC,MAAI,KAAK,IAAI,MAAM;AACf,YAAQ,WAAW;AAAA,EACvB,CAAC;AAED,UAAQ,UAAU,eAAa,IAAI,6DAA2B,SAAS;AAC3E;AAEA,SAAS,iBAAiB,KAAkB;AACxC,MAAI,IAAI,wBAAS,IAAI,6CAAmB,CAAC;AAC7C;AAEA,SAAS,aAAa,KAAkB;AACpC,MAAI,IAAI,qBAAK,IAAI,qCAAe,CAAC;AACrC;AAEO,SAAS,YAAY,MAAuB;AAC/C,QAAM,UAAU,KAAK,IAAI,eAAe,SAAS;AAEjD,SAAO;AAAA,IACH,aAAa;AAAA,EACjB;AACJ;",
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,4BAA+B;AAC/B,qBAAsE;AACtE,sBAAoB;AACpB,gCAAmC;AACnC,yCAA4C;AAV5C;AAAA;AAAA;AAAA;AAAA;AAiBO,SAAS,yBAAyB;AACrC,QAAM,MAAM,IAAI,2BAAY,SAAS;AAErC,gBAAc,GAAG;AACjB,mBAAiB,GAAG;AACpB,mBAAiB,GAAG;AACpB,eAAa,GAAG;AAEhB,SAAO;AACX;AAEA,SAAS,cAAc,KAAkB;AACrC,QAAM,OAAO,IAAI;AAGjB,OAAK,eAAe,YAAY,IAAI,CAAC;AACzC;AAEA,SAAS,iBAAiB,KAAkB;AACxC,QAAM,UAAU,IAAI,IAAI,6BAAc;AACtC,UAAQ,eAAe,8DAA2B;AAClD,UAAQ,gBAAgB;AAC5B;AAEA,SAAS,iBAAiB,KAAkB;AACxC,MAAI,IAAI,wBAAS,IAAI,6CAAmB,CAAC;AAC7C;AAEA,SAAS,aAAa,KAAkB;AACpC,MAAI,IAAI,qBAAK,IAAI,qCAAe,CAAC;AACrC;AAEO,SAAS,YAAY,MAAuB;AAC/C,QAAM,UAAU,KAAK,IAAI,eAAe,SAAS;AAEjD,SAAO;AAAA,IACH,aAAa;AAAA,EACjB;AACJ;",
   "names": []
 }

package/dist/cjs/storage/ReactNativeWebStorageDriver.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { WebStorageDriver, type DataNamespace } from "@matter/general";
+/**
+ * AsyncStorage backend based on AsyncStorage v3 scoped instances.
+ *
+ * This backend uses `createAsyncStorage(...)`, so each backend instance stores
+ * data in its own scoped storage area. It is the default backend for
+ * `@matter/react-native` with async-storage `3.x`.
+ *
+ * For migration scenarios that need legacy v2-compatible singleton storage
+ * behavior, use {@link ReactNativeWebStorageDriverV2} from
+ * `@matter/react-native/storage` instead.
+ */
+export declare class ReactNativeWebStorageDriver extends WebStorageDriver {
+    static readonly id = "react-native-web";
+    static create(namespace: DataNamespace): ReactNativeWebStorageDriver;
+    constructor(namespace?: string);
+}
+//# sourceMappingURL=ReactNativeWebStorageDriver.d.ts.map

package/dist/cjs/storage/ReactNativeWebStorageDriver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReactNativeWebStorageDriver.d.ts","sourceRoot":"","sources":["../../../src/storage/ReactNativeWebStorageDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGvE;;;;;;;;;;GAUG;AACH,qBAAa,2BAA4B,SAAQ,gBAAgB;IAC7D,MAAM,CAAC,QAAQ,CAAC,EAAE,sBAAsB;IAExC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa;gBAI1B,SAAS,CAAC,EAAE,MAAM;CAGjC"}

package/dist/cjs/storage/ReactNativeWebStorageDriver.js

@@ -0,0 +1,40 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ReactNativeWebStorageDriver_exports = {};
+__export(ReactNativeWebStorageDriver_exports, {
+  ReactNativeWebStorageDriver: () => ReactNativeWebStorageDriver
+});
+module.exports = __toCommonJS(ReactNativeWebStorageDriver_exports);
+var import_general = require("@matter/general");
+var import_async_storage = require("@react-native-async-storage/async-storage");
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class ReactNativeWebStorageDriver extends import_general.WebStorageDriver {
+  static id = "react-native-web";
+  static create(namespace) {
+    return new ReactNativeWebStorageDriver(namespace.namespace);
+  }
+  constructor(namespace) {
+    super((0, import_async_storage.createAsyncStorage)(namespace ?? "matterjs"));
+  }
+}
+//# sourceMappingURL=ReactNativeWebStorageDriver.js.map

package/dist/cjs/storage/ReactNativeWebStorageDriver.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/storage/ReactNativeWebStorageDriver.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAAqD;AACrD,2BAAmC;AAPnC;AAAA;AAAA;AAAA;AAAA;AAoBO,MAAM,oCAAoC,gCAAiB;AAAA,EAC9D,OAAgB,KAAK;AAAA,EAErB,OAAO,OAAO,WAA0B;AACpC,WAAO,IAAI,4BAA4B,UAAU,SAAS;AAAA,EAC9D;AAAA,EAEA,YAAY,WAAoB;AAC5B,cAAM,yCAAmB,aAAa,UAAU,CAAC;AAAA,EACrD;AACJ;",
+  "names": []
+}

package/dist/cjs/storage/ReactNativeWebStorageDriverV2.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { WebStorageDriver, type DataNamespace } from "@matter/general";
+/**
+ * V2-compatible AsyncStorage backend using the package default export.
+ *
+ * This backend exists as migration path when apps need to keep using the legacy
+ * singleton storage behavior before switching to the v3 scoped storage backend.
+ */
+export declare class ReactNativeWebStorageDriverV2 extends WebStorageDriver {
+    static readonly id = "react-native-web-v2";
+    static create(namespace: DataNamespace): ReactNativeWebStorageDriverV2;
+    /**
+     * Creates a new instance of the v2-compatible AsyncStorage backend. If a
+     * namespace is provided, keys are prefixed with "<namespace>#".
+     */
+    constructor(namespace?: string);
+}
+//# sourceMappingURL=ReactNativeWebStorageDriverV2.d.ts.map

package/dist/cjs/storage/ReactNativeWebStorageDriverV2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReactNativeWebStorageDriverV2.d.ts","sourceRoot":"","sources":["../../../src/storage/ReactNativeWebStorageDriverV2.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAA2B,MAAM,iBAAiB,CAAC;AAGhG;;;;;GAKG;AACH,qBAAa,6BAA8B,SAAQ,gBAAgB;IAC/D,MAAM,CAAC,QAAQ,CAAC,EAAE,yBAAyB;IAE3C,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa;IAItC;;;OAGG;gBACS,SAAS,CAAC,EAAE,MAAM;CAGjC"}

package/dist/cjs/storage/ReactNativeWebStorageDriverV2.js

@@ -0,0 +1,106 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var ReactNativeWebStorageDriverV2_exports = {};
+__export(ReactNativeWebStorageDriverV2_exports, {
+  ReactNativeWebStorageDriverV2: () => ReactNativeWebStorageDriverV2
+});
+module.exports = __toCommonJS(ReactNativeWebStorageDriverV2_exports);
+var import_general = require("@matter/general");
+var import_async_storage = __toESM(require("@react-native-async-storage/async-storage"), 1);
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+class ReactNativeWebStorageDriverV2 extends import_general.WebStorageDriver {
+  static id = "react-native-web-v2";
+  static create(namespace) {
+    return new ReactNativeWebStorageDriverV2(namespace.namespace);
+  }
+  /**
+   * Creates a new instance of the v2-compatible AsyncStorage backend. If a
+   * namespace is provided, keys are prefixed with "<namespace>#".
+   */
+  constructor(namespace) {
+    super(createV2Provider(namespace ?? ""));
+  }
+}
+function createV2Provider(namespace) {
+  const prefix = namespace.length ? `${namespace}#` : "";
+  function prefixKey(key) {
+    return `${prefix}${key}`;
+  }
+  return {
+    getItem(key) {
+      return import_async_storage.default.getItem(prefixKey(key));
+    },
+    setItem(key, value) {
+      return import_async_storage.default.setItem(prefixKey(key), value);
+    },
+    removeItem(key) {
+      return import_async_storage.default.removeItem(prefixKey(key));
+    },
+    async getAllKeys() {
+      const allKeys = await import_async_storage.default.getAllKeys();
+      if (!prefix.length) return allKeys;
+      return allKeys.filter((k) => k.startsWith(prefix)).map((k) => k.substring(prefix.length));
+    },
+    async getMany(keys) {
+      const prefixed = keys.map(prefixKey);
+      const raw = await import_async_storage.default.getMany(prefixed);
+      const result = {};
+      for (const [i, key] of keys.entries()) {
+        result[key] = raw[prefixed[i]];
+      }
+      return result;
+    },
+    async setMany(entries) {
+      const prefixed = {};
+      for (const [key, value] of Object.entries(entries)) {
+        prefixed[prefixKey(key)] = value;
+      }
+      await import_async_storage.default.setMany(prefixed);
+    },
+    async removeMany(keys) {
+      await import_async_storage.default.removeMany(keys.map(prefixKey));
+    },
+    async clear() {
+      if (!prefix.length) {
+        await import_async_storage.default.clear();
+        return;
+      }
+      const allKeys = await import_async_storage.default.getAllKeys();
+      const keysToDelete = allKeys.filter((k) => k.startsWith(prefix));
+      if (keysToDelete.length) {
+        await import_async_storage.default.removeMany(keysToDelete);
+      }
+    }
+  };
+}
+//# sourceMappingURL=ReactNativeWebStorageDriverV2.js.map

package/dist/cjs/storage/ReactNativeWebStorageDriverV2.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/storage/ReactNativeWebStorageDriverV2.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,qBAA8E;AAC9E,2BAAyB;AAPzB;AAAA;AAAA;AAAA;AAAA;AAeO,MAAM,sCAAsC,gCAAiB;AAAA,EAChE,OAAgB,KAAK;AAAA,EAErB,OAAO,OAAO,WAA0B;AACpC,WAAO,IAAI,8BAA8B,UAAU,SAAS;AAAA,EAChE;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,YAAY,WAAoB;AAC5B,UAAM,iBAAiB,aAAa,EAAE,CAAC;AAAA,EAC3C;AACJ;AAMA,SAAS,iBAAiB,WAAuC;AAC7D,QAAM,SAAS,UAAU,SAAS,GAAG,SAAS,MAAM;AAEpD,WAAS,UAAU,KAAa;AAC5B,WAAO,GAAG,MAAM,GAAG,GAAG;AAAA,EAC1B;AAEA,SAAO;AAAA,IACH,QAAQ,KAAK;AACT,aAAO,qBAAAA,QAAa,QAAQ,UAAU,GAAG,CAAC;AAAA,IAC9C;AAAA,IAEA,QAAQ,KAAK,OAAO;AAChB,aAAO,qBAAAA,QAAa,QAAQ,UAAU,GAAG,GAAG,KAAK;AAAA,IACrD;AAAA,IAEA,WAAW,KAAK;AACZ,aAAO,qBAAAA,QAAa,WAAW,UAAU,GAAG,CAAC;AAAA,IACjD;AAAA,IAEA,MAAM,aAAa;AACf,YAAM,UAAU,MAAM,qBAAAA,QAAa,WAAW;AAC9C,UAAI,CAAC,OAAO,OAAQ,QAAO;AAC3B,aAAO,QAAQ,OAAO,CAAC,MAAc,EAAE,WAAW,MAAM,CAAC,EAAE,IAAI,CAAC,MAAc,EAAE,UAAU,OAAO,MAAM,CAAC;AAAA,IAC5G;AAAA,IAEA,MAAM,QAAQ,MAAM;AAChB,YAAM,WAAW,KAAK,IAAI,SAAS;AACnC,YAAM,MAAM,MAAM,qBAAAA,QAAa,QAAQ,QAAQ;AAC/C,YAAM,SAAS,CAAC;AAChB,iBAAW,CAAC,GAAG,GAAG,KAAK,KAAK,QAAQ,GAAG;AACnC,eAAO,GAAG,IAAI,IAAI,SAAS,CAAC,CAAC;AAAA,MACjC;AACA,aAAO;AAAA,IACX;AAAA,IAEA,MAAM,QAAQ,SAAS;AACnB,YAAM,WAAW,CAAC;AAClB,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,OAAO,GAAG;AAChD,iBAAS,UAAU,GAAG,CAAC,IAAI;AAAA,MAC/B;AACA,YAAM,qBAAAA,QAAa,QAAQ,QAAQ;AAAA,IACvC;AAAA,IAEA,MAAM,WAAW,MAAM;AACnB,YAAM,qBAAAA,QAAa,WAAW,KAAK,IAAI,SAAS,CAAC;AAAA,IACrD;AAAA,IAEA,MAAM,QAAQ;AACV,UAAI,CAAC,OAAO,QAAQ;AAChB,cAAM,qBAAAA,QAAa,MAAM;AACzB;AAAA,MACJ;AAEA,YAAM,UAAU,MAAM,qBAAAA,QAAa,WAAW;AAC9C,YAAM,eAAe,QAAQ,OAAO,CAAC,MAAc,EAAE,WAAW,MAAM,CAAC;AACvE,UAAI,aAAa,QAAQ;AACrB,cAAM,qBAAAA,QAAa,WAAW,YAAY;AAAA,MAC9C;AAAA,IACJ;AAAA,EACJ;AACJ;",
+  "names": ["AsyncStorage"]
+}

package/dist/cjs/storage/index.d.ts

@@ -3,6 +3,12 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-export * from "./StorageBackendAsyncStorage.js";
-export * from "./StorageBackendAsyncStorageV2.js";
+export * from "./ReactNativeWebStorageDriver.js";
+export * from "./ReactNativeWebStorageDriverV2.js";
+import { ReactNativeWebStorageDriver } from "./ReactNativeWebStorageDriver.js";
+import { ReactNativeWebStorageDriverV2 } from "./ReactNativeWebStorageDriverV2.js";
+/** @deprecated Use {@link ReactNativeWebStorageDriver} */
+export declare const StorageBackendAsyncStorage: typeof ReactNativeWebStorageDriver;
+/** @deprecated Use {@link ReactNativeWebStorageDriverV2} */
+export declare const StorageBackendAsyncStorageV2: typeof ReactNativeWebStorageDriverV2;
 //# sourceMappingURL=index.d.ts.map

package/dist/cjs/storage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,kCAAkC,CAAC;AACjD,cAAc,oCAAoC,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF,0DAA0D;AAC1D,eAAO,MAAM,0BAA0B,oCAA8B,CAAC;AAEtE,4DAA4D;AAC5D,eAAO,MAAM,4BAA4B,sCAAgC,CAAC"}

package/dist/cjs/storage/index.js

@@ -3,6 +3,10 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
@@ -14,12 +18,20 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var storage_exports = {};
+__export(storage_exports, {
+  StorageBackendAsyncStorage: () => StorageBackendAsyncStorage,
+  StorageBackendAsyncStorageV2: () => StorageBackendAsyncStorageV2
+});
 module.exports = __toCommonJS(storage_exports);
-__reExport(storage_exports, require("./StorageBackendAsyncStorage.js"), module.exports);
-__reExport(storage_exports, require("./StorageBackendAsyncStorageV2.js"), module.exports);
+__reExport(storage_exports, require("./ReactNativeWebStorageDriver.js"), module.exports);
+__reExport(storage_exports, require("./ReactNativeWebStorageDriverV2.js"), module.exports);
+var import_ReactNativeWebStorageDriver = require("./ReactNativeWebStorageDriver.js");
+var import_ReactNativeWebStorageDriverV2 = require("./ReactNativeWebStorageDriverV2.js");
 /**
  * @license
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
+const StorageBackendAsyncStorage = import_ReactNativeWebStorageDriver.ReactNativeWebStorageDriver;
+const StorageBackendAsyncStorageV2 = import_ReactNativeWebStorageDriverV2.ReactNativeWebStorageDriverV2;
 //# sourceMappingURL=index.js.map

package/dist/cjs/storage/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/storage/index.ts"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAMA,4BAAc,4CANd;AAOA,4BAAc,8CAPd;AAAA;AAAA;AAAA;AAAA;AAAA;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,4BAAc,6CANd;AAOA,4BAAc,+CAPd;AAQA,yCAA4C;AAC5C,2CAA8C;AAT9C;AAAA;AAAA;AAAA;AAAA;AAYO,MAAM,6BAA6B;AAGnC,MAAM,+BAA+B;",
   "names": []
 }

package/dist/esm/environment/ReactNativeEnvironment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/ReactNativeEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAA2B,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKxF;;;;GAIG;AACH,wBAAgB,sBAAsB,gBASrC;AA2BD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;EAMhD"}
+{"version":3,"file":"ReactNativeEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/ReactNativeEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,WAAW,EAA2B,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKxF;;;;GAIG;AACH,wBAAgB,sBAAsB,gBASrC;AAuBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;EAMhD"}

package/dist/esm/environment/ReactNativeEnvironment.js

@@ -7,7 +7,7 @@ import { ReactNativeBle } from "#ble/ReactNativeBle.js";
 import { Environment, Network, StorageService } from "@matter/general";
 import { Ble } from "@matter/protocol";
 import { NetworkReactNative } from "../net/NetworkReactNative.js";
-import { StorageBackendAsyncStorage } from "../storage/StorageBackendAsyncStorage.js";
+import { ReactNativeWebStorageDriver } from "../storage/ReactNativeWebStorageDriver.js";
 function ReactNativeEnvironment() {
   const env = new Environment("default");
   loadVariables(env);
@@ -22,10 +22,8 @@ function loadVariables(env) {
 }
 function configureStorage(env) {
   const service = env.get(StorageService);
-  env.vars.use(() => {
-    service.location = "Memory";
-  });
-  service.factory = (namespace) => new StorageBackendAsyncStorage(namespace);
+  service.registerDriver(ReactNativeWebStorageDriver);
+  service.defaultDriver = "async-storage";
 }
 function configureNetwork(env) {
   env.set(Network, new NetworkReactNative());

package/dist/esm/environment/ReactNativeEnvironment.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/environment/ReactNativeEnvironment.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,sBAAsB;AAC/B,SAAS,aAAa,SAAS,sBAAuC;AACtE,SAAS,WAAW;AACpB,SAAS,0BAA0B;AACnC,SAAS,kCAAkC;AAOpC,SAAS,yBAAyB;AACrC,QAAM,MAAM,IAAI,YAAY,SAAS;AAErC,gBAAc,GAAG;AACjB,mBAAiB,GAAG;AACpB,mBAAiB,GAAG;AACpB,eAAa,GAAG;AAEhB,SAAO;AACX;AAEA,SAAS,cAAc,KAAkB;AACrC,QAAM,OAAO,IAAI;AAGjB,OAAK,eAAe,YAAY,IAAI,CAAC;AACzC;AAEA,SAAS,iBAAiB,KAAkB;AACxC,QAAM,UAAU,IAAI,IAAI,cAAc;AAEtC,MAAI,KAAK,IAAI,MAAM;AACf,YAAQ,WAAW;AAAA,EACvB,CAAC;AAED,UAAQ,UAAU,eAAa,IAAI,2BAA2B,SAAS;AAC3E;AAEA,SAAS,iBAAiB,KAAkB;AACxC,MAAI,IAAI,SAAS,IAAI,mBAAmB,CAAC;AAC7C;AAEA,SAAS,aAAa,KAAkB;AACpC,MAAI,IAAI,KAAK,IAAI,eAAe,CAAC;AACrC;AAEO,SAAS,YAAY,MAAuB;AAC/C,QAAM,UAAU,KAAK,IAAI,eAAe,SAAS;AAEjD,SAAO;AAAA,IACH,aAAa;AAAA,EACjB;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,sBAAsB;AAC/B,SAAS,aAAa,SAAS,sBAAuC;AACtE,SAAS,WAAW;AACpB,SAAS,0BAA0B;AACnC,SAAS,mCAAmC;AAOrC,SAAS,yBAAyB;AACrC,QAAM,MAAM,IAAI,YAAY,SAAS;AAErC,gBAAc,GAAG;AACjB,mBAAiB,GAAG;AACpB,mBAAiB,GAAG;AACpB,eAAa,GAAG;AAEhB,SAAO;AACX;AAEA,SAAS,cAAc,KAAkB;AACrC,QAAM,OAAO,IAAI;AAGjB,OAAK,eAAe,YAAY,IAAI,CAAC;AACzC;AAEA,SAAS,iBAAiB,KAAkB;AACxC,QAAM,UAAU,IAAI,IAAI,cAAc;AACtC,UAAQ,eAAe,2BAA2B;AAClD,UAAQ,gBAAgB;AAC5B;AAEA,SAAS,iBAAiB,KAAkB;AACxC,MAAI,IAAI,SAAS,IAAI,mBAAmB,CAAC;AAC7C;AAEA,SAAS,aAAa,KAAkB;AACpC,MAAI,IAAI,KAAK,IAAI,eAAe,CAAC;AACrC;AAEO,SAAS,YAAY,MAAuB;AAC/C,QAAM,UAAU,KAAK,IAAI,eAAe,SAAS;AAEjD,SAAO;AAAA,IACH,aAAa;AAAA,EACjB;AACJ;",
   "names": []
 }

package/dist/esm/storage/ReactNativeWebStorageDriver.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { WebStorageDriver, type DataNamespace } from "@matter/general";
+/**
+ * AsyncStorage backend based on AsyncStorage v3 scoped instances.
+ *
+ * This backend uses `createAsyncStorage(...)`, so each backend instance stores
+ * data in its own scoped storage area. It is the default backend for
+ * `@matter/react-native` with async-storage `3.x`.
+ *
+ * For migration scenarios that need legacy v2-compatible singleton storage
+ * behavior, use {@link ReactNativeWebStorageDriverV2} from
+ * `@matter/react-native/storage` instead.
+ */
+export declare class ReactNativeWebStorageDriver extends WebStorageDriver {
+    static readonly id = "react-native-web";
+    static create(namespace: DataNamespace): ReactNativeWebStorageDriver;
+    constructor(namespace?: string);
+}
+//# sourceMappingURL=ReactNativeWebStorageDriver.d.ts.map

package/dist/esm/storage/ReactNativeWebStorageDriver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReactNativeWebStorageDriver.d.ts","sourceRoot":"","sources":["../../../src/storage/ReactNativeWebStorageDriver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGvE;;;;;;;;;;GAUG;AACH,qBAAa,2BAA4B,SAAQ,gBAAgB;IAC7D,MAAM,CAAC,QAAQ,CAAC,EAAE,sBAAsB;IAExC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa;gBAI1B,SAAS,CAAC,EAAE,MAAM;CAGjC"}

package/dist/esm/storage/ReactNativeWebStorageDriver.js

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { WebStorageDriver } from "@matter/general";
+import { createAsyncStorage } from "@react-native-async-storage/async-storage";
+class ReactNativeWebStorageDriver extends WebStorageDriver {
+  static id = "react-native-web";
+  static create(namespace) {
+    return new ReactNativeWebStorageDriver(namespace.namespace);
+  }
+  constructor(namespace) {
+    super(createAsyncStorage(namespace ?? "matterjs"));
+  }
+}
+export {
+  ReactNativeWebStorageDriver
+};
+//# sourceMappingURL=ReactNativeWebStorageDriver.js.map

package/dist/esm/storage/ReactNativeWebStorageDriver.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/storage/ReactNativeWebStorageDriver.ts"],
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,wBAA4C;AACrD,SAAS,0BAA0B;AAa5B,MAAM,oCAAoC,iBAAiB;AAAA,EAC9D,OAAgB,KAAK;AAAA,EAErB,OAAO,OAAO,WAA0B;AACpC,WAAO,IAAI,4BAA4B,UAAU,SAAS;AAAA,EAC9D;AAAA,EAEA,YAAY,WAAoB;AAC5B,UAAM,mBAAmB,aAAa,UAAU,CAAC;AAAA,EACrD;AACJ;",
+  "names": []
+}

package/dist/esm/storage/ReactNativeWebStorageDriverV2.d.ts

@@ -0,0 +1,22 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { WebStorageDriver, type DataNamespace } from "@matter/general";
+/**
+ * V2-compatible AsyncStorage backend using the package default export.
+ *
+ * This backend exists as migration path when apps need to keep using the legacy
+ * singleton storage behavior before switching to the v3 scoped storage backend.
+ */
+export declare class ReactNativeWebStorageDriverV2 extends WebStorageDriver {
+    static readonly id = "react-native-web-v2";
+    static create(namespace: DataNamespace): ReactNativeWebStorageDriverV2;
+    /**
+     * Creates a new instance of the v2-compatible AsyncStorage backend. If a
+     * namespace is provided, keys are prefixed with "<namespace>#".
+     */
+    constructor(namespace?: string);
+}
+//# sourceMappingURL=ReactNativeWebStorageDriverV2.d.ts.map

package/dist/esm/storage/ReactNativeWebStorageDriverV2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ReactNativeWebStorageDriverV2.d.ts","sourceRoot":"","sources":["../../../src/storage/ReactNativeWebStorageDriverV2.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,gBAAgB,EAAE,KAAK,aAAa,EAA2B,MAAM,iBAAiB,CAAC;AAGhG;;;;;GAKG;AACH,qBAAa,6BAA8B,SAAQ,gBAAgB;IAC/D,MAAM,CAAC,QAAQ,CAAC,EAAE,yBAAyB;IAE3C,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa;IAItC;;;OAGG;gBACS,SAAS,CAAC,EAAE,MAAM;CAGjC"}

package/dist/esm/storage/ReactNativeWebStorageDriverV2.js

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright 2022-2026 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { WebStorageDriver } from "@matter/general";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+class ReactNativeWebStorageDriverV2 extends WebStorageDriver {
+  static id = "react-native-web-v2";
+  static create(namespace) {
+    return new ReactNativeWebStorageDriverV2(namespace.namespace);
+  }
+  /**
+   * Creates a new instance of the v2-compatible AsyncStorage backend. If a
+   * namespace is provided, keys are prefixed with "<namespace>#".
+   */
+  constructor(namespace) {
+    super(createV2Provider(namespace ?? ""));
+  }
+}
+function createV2Provider(namespace) {
+  const prefix = namespace.length ? `${namespace}#` : "";
+  function prefixKey(key) {
+    return `${prefix}${key}`;
+  }
+  return {
+    getItem(key) {
+      return AsyncStorage.getItem(prefixKey(key));
+    },
+    setItem(key, value) {
+      return AsyncStorage.setItem(prefixKey(key), value);
+    },
+    removeItem(key) {
+      return AsyncStorage.removeItem(prefixKey(key));
+    },
+    async getAllKeys() {
+      const allKeys = await AsyncStorage.getAllKeys();
+      if (!prefix.length) return allKeys;
+      return allKeys.filter((k) => k.startsWith(prefix)).map((k) => k.substring(prefix.length));
+    },
+    async getMany(keys) {
+      const prefixed = keys.map(prefixKey);
+      const raw = await AsyncStorage.getMany(prefixed);
+      const result = {};
+      for (const [i, key] of keys.entries()) {
+        result[key] = raw[prefixed[i]];
+      }
+      return result;
+    },
+    async setMany(entries) {
+      const prefixed = {};
+      for (const [key, value] of Object.entries(entries)) {
+        prefixed[prefixKey(key)] = value;
+      }
+      await AsyncStorage.setMany(prefixed);
+    },
+    async removeMany(keys) {
+      await AsyncStorage.removeMany(keys.map(prefixKey));
+    },
+    async clear() {
+      if (!prefix.length) {
+        await AsyncStorage.clear();
+        return;
+      }
+      const allKeys = await AsyncStorage.getAllKeys();
+      const keysToDelete = allKeys.filter((k) => k.startsWith(prefix));
+      if (keysToDelete.length) {
+        await AsyncStorage.removeMany(keysToDelete);
+      }
+    }
+  };
+}
+export {
+  ReactNativeWebStorageDriverV2
+};
+//# sourceMappingURL=ReactNativeWebStorageDriverV2.js.map

package/dist/esm/storage/ReactNativeWebStorageDriverV2.js.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../../../src/storage/ReactNativeWebStorageDriverV2.ts"],
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,wBAAqE;AAC9E,OAAO,kBAAkB;AAQlB,MAAM,sCAAsC,iBAAiB;AAAA,EAChE,OAAgB,KAAK;AAAA,EAErB,OAAO,OAAO,WAA0B;AACpC,WAAO,IAAI,8BAA8B,UAAU,SAAS;AAAA,EAChE;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,YAAY,WAAoB;AAC5B,UAAM,iBAAiB,aAAa,EAAE,CAAC;AAAA,EAC3C;AACJ;AAMA,SAAS,iBAAiB,WAAuC;AAC7D,QAAM,SAAS,UAAU,SAAS,GAAG,SAAS,MAAM;AAEpD,WAAS,UAAU,KAAa;AAC5B,WAAO,GAAG,MAAM,GAAG,GAAG;AAAA,EAC1B;AAEA,SAAO;AAAA,IACH,QAAQ,KAAK;AACT,aAAO,aAAa,QAAQ,UAAU,GAAG,CAAC;AAAA,IAC9C;AAAA,IAEA,QAAQ,KAAK,OAAO;AAChB,aAAO,aAAa,QAAQ,UAAU,GAAG,GAAG,KAAK;AAAA,IACrD;AAAA,IAEA,WAAW,KAAK;AACZ,aAAO,aAAa,WAAW,UAAU,GAAG,CAAC;AAAA,IACjD;AAAA,IAEA,MAAM,aAAa;AACf,YAAM,UAAU,MAAM,aAAa,WAAW;AAC9C,UAAI,CAAC,OAAO,OAAQ,QAAO;AAC3B,aAAO,QAAQ,OAAO,CAAC,MAAc,EAAE,WAAW,MAAM,CAAC,EAAE,IAAI,CAAC,MAAc,EAAE,UAAU,OAAO,MAAM,CAAC;AAAA,IAC5G;AAAA,IAEA,MAAM,QAAQ,MAAM;AAChB,YAAM,WAAW,KAAK,IAAI,SAAS;AACnC,YAAM,MAAM,MAAM,aAAa,QAAQ,QAAQ;AAC/C,YAAM,SAAS,CAAC;AAChB,iBAAW,CAAC,GAAG,GAAG,KAAK,KAAK,QAAQ,GAAG;AACnC,eAAO,GAAG,IAAI,IAAI,SAAS,CAAC,CAAC;AAAA,MACjC;AACA,aAAO;AAAA,IACX;AAAA,IAEA,MAAM,QAAQ,SAAS;AACnB,YAAM,WAAW,CAAC;AAClB,iBAAW,CAAC,KAAK,KAAK,KAAK,OAAO,QAAQ,OAAO,GAAG;AAChD,iBAAS,UAAU,GAAG,CAAC,IAAI;AAAA,MAC/B;AACA,YAAM,aAAa,QAAQ,QAAQ;AAAA,IACvC;AAAA,IAEA,MAAM,WAAW,MAAM;AACnB,YAAM,aAAa,WAAW,KAAK,IAAI,SAAS,CAAC;AAAA,IACrD;AAAA,IAEA,MAAM,QAAQ;AACV,UAAI,CAAC,OAAO,QAAQ;AAChB,cAAM,aAAa,MAAM;AACzB;AAAA,MACJ;AAEA,YAAM,UAAU,MAAM,aAAa,WAAW;AAC9C,YAAM,eAAe,QAAQ,OAAO,CAAC,MAAc,EAAE,WAAW,MAAM,CAAC;AACvE,UAAI,aAAa,QAAQ;AACrB,cAAM,aAAa,WAAW,YAAY;AAAA,MAC9C;AAAA,IACJ;AAAA,EACJ;AACJ;",
+  "names": []
+}

package/dist/esm/storage/index.d.ts

@@ -3,6 +3,12 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-export * from "./StorageBackendAsyncStorage.js";
-export * from "./StorageBackendAsyncStorageV2.js";
+export * from "./ReactNativeWebStorageDriver.js";
+export * from "./ReactNativeWebStorageDriverV2.js";
+import { ReactNativeWebStorageDriver } from "./ReactNativeWebStorageDriver.js";
+import { ReactNativeWebStorageDriverV2 } from "./ReactNativeWebStorageDriverV2.js";
+/** @deprecated Use {@link ReactNativeWebStorageDriver} */
+export declare const StorageBackendAsyncStorage: typeof ReactNativeWebStorageDriver;
+/** @deprecated Use {@link ReactNativeWebStorageDriverV2} */
+export declare const StorageBackendAsyncStorageV2: typeof ReactNativeWebStorageDriverV2;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/storage/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,iCAAiC,CAAC;AAChD,cAAc,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/storage/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,cAAc,kCAAkC,CAAC;AACjD,cAAc,oCAAoC,CAAC;AACnD,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,6BAA6B,EAAE,MAAM,oCAAoC,CAAC;AAEnF,0DAA0D;AAC1D,eAAO,MAAM,0BAA0B,oCAA8B,CAAC;AAEtE,4DAA4D;AAC5D,eAAO,MAAM,4BAA4B,sCAAgC,CAAC"}

package/dist/esm/storage/index.js

@@ -3,6 +3,14 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-export * from "./StorageBackendAsyncStorage.js";
-export * from "./StorageBackendAsyncStorageV2.js";
+export * from "./ReactNativeWebStorageDriver.js";
+export * from "./ReactNativeWebStorageDriverV2.js";
+import { ReactNativeWebStorageDriver } from "./ReactNativeWebStorageDriver.js";
+import { ReactNativeWebStorageDriverV2 } from "./ReactNativeWebStorageDriverV2.js";
+const StorageBackendAsyncStorage = ReactNativeWebStorageDriver;
+const StorageBackendAsyncStorageV2 = ReactNativeWebStorageDriverV2;
+export {
+  StorageBackendAsyncStorage,
+  StorageBackendAsyncStorageV2
+};
 //# sourceMappingURL=index.js.map

package/dist/esm/storage/index.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/storage/index.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,cAAc;AACd,cAAc;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,cAAc;AACd,cAAc;AACd,SAAS,mCAAmC;AAC5C,SAAS,qCAAqC;AAGvC,MAAM,6BAA6B;AAGnC,MAAM,+BAA+B;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/react-native",
-    "version": "0.17.0-alpha.0-20260312-920b3a4ec",
+    "version": "0.17.0-alpha.0-20260315-65cdcd993",
     "description": "Experimental React Native support for matter.js",
     "keywords": [
         "iot",
@@ -32,9 +32,9 @@
     },
     "dependencies": {
         "@craftzdog/react-native-buffer": "6.1.1",
-        "@matter/general": "0.17.0-alpha.0-20260312-920b3a4ec",
-        "@matter/nodejs": "0.17.0-alpha.0-20260312-920b3a4ec",
-        "@matter/protocol": "0.17.0-alpha.0-20260312-920b3a4ec",
+        "@matter/general": "0.17.0-alpha.0-20260315-65cdcd993",
+        "@matter/nodejs": "0.17.0-alpha.0-20260315-65cdcd993",
+        "@matter/protocol": "0.17.0-alpha.0-20260315-65cdcd993",
         "@react-native-async-storage/async-storage": "^3.0.1",
         "@react-native-community/netinfo": "^12.0.1",
         "@types/node": "^25.3.5",
@@ -44,7 +44,7 @@
         "react-native-udp": "^4.1.7"
     },
     "devDependencies": {
-        "@matter/tools": "0.17.0-alpha.0-20260312-920b3a4ec"
+        "@matter/tools": "0.17.0-alpha.0-20260315-65cdcd993"
     },
     "overrides": {
         "brorand": "npm:@matter.js/brorand@1.1.0"

package/src/environment/ReactNativeEnvironment.ts

@@ -8,7 +8,7 @@ import { ReactNativeBle } from "#ble/ReactNativeBle.js";
 import { Environment, Network, StorageService, VariableService } from "@matter/general";
 import { Ble } from "@matter/protocol";
 import { NetworkReactNative } from "../net/NetworkReactNative.js";
-import { StorageBackendAsyncStorage } from "../storage/StorageBackendAsyncStorage.js";
+import { ReactNativeWebStorageDriver } from "../storage/ReactNativeWebStorageDriver.js";
 
 /**
  * This is the default environment implementation for React-native:
@@ -35,12 +35,8 @@ function loadVariables(env: Environment) {
 
 function configureStorage(env: Environment) {
     const service = env.get(StorageService);
-
-    env.vars.use(() => {
-        service.location = "Memory";
-    });
-
-    service.factory = namespace => new StorageBackendAsyncStorage(namespace);
+    service.registerDriver(ReactNativeWebStorageDriver);
+    service.defaultDriver = "async-storage";
 }
 
 function configureNetwork(env: Environment) {