react-native-ble-mesh 2.0.0 → 2.1.2

package/src/storage/AsyncStorageAdapter.js

@@ -20,9 +20,9 @@ const Storage = require('./Storage');
 class AsyncStorageAdapter extends Storage {
   /**
    * Creates a new AsyncStorageAdapter instance
-   * @param {Object} [options={}] - Storage options
-   * @param {string} [options.prefix='mesh'] - Key prefix for namespacing
-   * @param {Object} [options.AsyncStorage] - AsyncStorage instance (optional)
+   * @param {any} [options={}] - Storage options
+   *
+   *
    */
   constructor(options = {}) {
     super({
@@ -32,7 +32,7 @@ class AsyncStorageAdapter extends Storage {
 
     /**
      * AsyncStorage instance
-     * @type {Object|null}
+     * @type {any}
      * @private
      */
     this._storage = options.AsyncStorage || null;
@@ -58,6 +58,7 @@ class AsyncStorageAdapter extends Storage {
     // Try to load AsyncStorage if not provided
     if (!this._storage) {
       try {
+        // @ts-ignore
         const AsyncStorageModule = require('@react-native-async-storage/async-storage');
         this._storage = AsyncStorageModule.default || AsyncStorageModule;
       } catch (error) {
@@ -117,8 +118,8 @@ class AsyncStorageAdapter extends Storage {
    * Sets a value by key
    * @param {string} key - Key to set
    * @param {any} value - Value to store
-   * @param {Object} [options={}] - Set options
-   * @param {number} [options.ttl] - Time to live in milliseconds
+   * @param {any} [options={}] - Set options
+   *
    * @returns {Promise<void>}
    */
   async set(key, value, options = {}) {
@@ -126,6 +127,7 @@ class AsyncStorageAdapter extends Storage {
 
     const prefixedKey = this._getKey(key);
 
+    /** @type {any} */
     const item = {
       value,
       createdAt: Date.now()
@@ -170,7 +172,7 @@ class AsyncStorageAdapter extends Storage {
 
     const allKeys = await this._storage.getAllKeys();
     const prefix = `${this._options.prefix}:`;
-    const keysToRemove = allKeys.filter(key => key.startsWith(prefix));
+    const keysToRemove = allKeys.filter((/** @type {any} */ key) => key.startsWith(prefix));
 
     if (keysToRemove.length > 0) {
       await this._storage.multiRemove(keysToRemove);
@@ -188,8 +190,8 @@ class AsyncStorageAdapter extends Storage {
     const prefix = `${this._options.prefix}:`;
 
     return allKeys
-      .filter(key => key.startsWith(prefix))
-      .map(key => key.slice(prefix.length));
+      .filter((/** @type {any} */ key) => key.startsWith(prefix))
+      .map((/** @type {any} */ key) => key.slice(prefix.length));
   }
 
   /**
@@ -205,7 +207,7 @@ class AsyncStorageAdapter extends Storage {
     const result = new Map();
     const now = Date.now();
 
-    for (const [prefixedKey, jsonValue] of pairs) {
+    for (const [prefixedKey, jsonValue] of /** @type {any[]} */ (pairs)) {
       if (jsonValue !== null) {
         const key = prefixedKey.slice(this._options.prefix.length + 1);
         try {
@@ -224,9 +226,9 @@ class AsyncStorageAdapter extends Storage {
 
   /**
    * Sets multiple key-value pairs
-   * @param {Map<string, any>|Object} entries - Entries to set
-   * @param {Object} [options={}] - Set options
-   * @param {number} [options.ttl] - Time to live in milliseconds
+   * @param {Map<string, any>|any} entries - Entries to set
+   * @param {any} [options={}] - Set options
+   *
    * @returns {Promise<void>}
    */
   async setMany(entries, options = {}) {
@@ -237,7 +239,8 @@ class AsyncStorageAdapter extends Storage {
       : Object.entries(entries);
 
     const now = Date.now();
-    const keyValuePairs = pairs.map(([key, value]) => {
+    const keyValuePairs = pairs.map((/** @type {any} */ [key, value]) => {
+      /** @type {any} */
       const item = {
         value,
         createdAt: now

package/src/storage/MemoryStorage.js

@@ -18,9 +18,9 @@ const Storage = require('./Storage');
 class MemoryStorage extends Storage {
   /**
    * Creates a new MemoryStorage instance
-   * @param {Object} [options={}] - Storage options
-   * @param {string} [options.prefix=''] - Key prefix for namespacing
-   * @param {number} [options.maxSize=0] - Maximum number of items (0 = unlimited)
+   * @param {any} [options={}] - Storage options
+   *
+   *
    */
   constructor(options = {}) {
     super(options);
@@ -66,8 +66,8 @@ class MemoryStorage extends Storage {
    * Sets a value by key
    * @param {string} key - Key to set
    * @param {any} value - Value to store
-   * @param {Object} [options={}] - Set options
-   * @param {number} [options.ttl] - Time to live in milliseconds
+   * @param {any} [options={}] - Set options
+   *
    * @returns {Promise<void>}
    */
   async set(key, value, options = {}) {
@@ -79,9 +79,12 @@ class MemoryStorage extends Storage {
         this._store.size >= this._maxSize) {
       // Remove oldest entry (first entry in Map)
       const firstKey = this._store.keys().next().value;
-      this._store.delete(firstKey);
+      if (firstKey !== undefined) {
+        this._store.delete(firstKey);
+      }
     }
 
+    /** @type {any} */
     const item = {
       value,
       createdAt: Date.now()
@@ -156,7 +159,7 @@ class MemoryStorage extends Storage {
         const unprefixedKey = prefix ? key.slice(prefix.length) : key;
         // Check expiration before including
         const item = this._store.get(key);
-        if (!item.expiresAt || Date.now() <= item.expiresAt) {
+        if (item && (!item.expiresAt || Date.now() <= item.expiresAt)) {
           result.push(unprefixedKey);
         }
       }
@@ -196,7 +199,7 @@ class MemoryStorage extends Storage {
 
   /**
    * Gets all entries as an array of [key, value] pairs
-   * @returns {Promise<Array>} Array of [key, value] entries
+   * @returns {Promise<any[]>} Array of [key, value] entries
    */
   async entries() {
     const allKeys = await this.keys();

package/src/storage/MessageStore.js

@@ -8,6 +8,60 @@
 const MemoryStorage = require('./MemoryStorage');
 const { MESH_CONFIG } = require('../constants');
 
+/**
+ * Base64 encoding/decoding for compact Uint8Array serialization
+ * @private
+ */
+const BASE64_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+
+/**
+ * @param {Uint8Array} bytes
+ * @returns {string}
+ */
+function uint8ArrayToBase64(bytes) {
+  let result = '';
+  const len = bytes.length;
+  for (let i = 0; i < len; i += 3) {
+    const b0 = bytes[i];
+    const b1 = i + 1 < len ? bytes[i + 1] : 0;
+    const b2 = i + 2 < len ? bytes[i + 2] : 0;
+    result += BASE64_CHARS[b0 >> 2];
+    result += BASE64_CHARS[((b0 & 3) << 4) | (b1 >> 4)];
+    result += (i + 1 < len) ? BASE64_CHARS[((b1 & 15) << 2) | (b2 >> 6)] : '=';
+    result += (i + 2 < len) ? BASE64_CHARS[b2 & 63] : '=';
+  }
+  return result;
+}
+
+const BASE64_LOOKUP = new Uint8Array(128);
+for (let i = 0; i < BASE64_CHARS.length; i++) {
+  BASE64_LOOKUP[BASE64_CHARS.charCodeAt(i)] = i;
+}
+
+/**
+ * @param {string} str
+ * @returns {Uint8Array}
+ */
+function base64ToUint8Array(str) {
+  const len = str.length;
+  let padding = 0;
+  if (str[len - 1] === '=') { padding++; }
+  if (str[len - 2] === '=') { padding++; }
+  const byteLen = (len * 3 / 4) - padding;
+  const bytes = new Uint8Array(byteLen);
+  let j = 0;
+  for (let i = 0; i < len; i += 4) {
+    const a = BASE64_LOOKUP[str.charCodeAt(i)];
+    const b = BASE64_LOOKUP[str.charCodeAt(i + 1)];
+    const c = BASE64_LOOKUP[str.charCodeAt(i + 2)];
+    const d = BASE64_LOOKUP[str.charCodeAt(i + 3)];
+    bytes[j++] = (a << 2) | (b >> 4);
+    if (j < byteLen) { bytes[j++] = ((b & 15) << 4) | (c >> 2); }
+    if (j < byteLen) { bytes[j++] = ((c & 3) << 6) | d; }
+  }
+  return bytes;
+}
+
 /**
  * Message store for persisting and retrieving mesh network messages.
  * Provides message caching, deduplication support, and cleanup functionality.
@@ -17,15 +71,12 @@ const { MESH_CONFIG } = require('../constants');
 class MessageStore {
   /**
    * Creates a new MessageStore instance
-   * @param {Object} [options={}] - Store options
-   * @param {Object} [options.storage] - Storage backend (defaults to MemoryStorage)
-   * @param {number} [options.maxMessages=1000] - Maximum messages to store
-   * @param {number} [options.messageTtlMs] - Message TTL in milliseconds
+   * @param {any} [options={}] - Store options   *
    */
   constructor(options = {}) {
     /**
      * Storage backend
-     * @type {Object}
+     * @type {any}
      * @private
      */
     this._storage = options.storage || new MemoryStorage({
@@ -42,7 +93,7 @@ class MessageStore {
 
     /**
      * Index storage for queries
-     * @type {Object}
+     * @type {any}
      * @private
      */
     this._indexStorage = options.indexStorage || new MemoryStorage({
@@ -52,13 +103,7 @@ class MessageStore {
 
   /**
    * Saves a message to storage
-   * @param {Object} message - Message to save
-   * @param {string} message.id - Message ID
-   * @param {number} message.type - Message type
-   * @param {Uint8Array} [message.payload] - Message payload
-   * @param {string} [message.senderId] - Sender peer ID
-   * @param {string} [message.recipientId] - Recipient peer ID
-   * @param {number} [message.timestamp] - Message timestamp
+   * @param {any} message - Message to save   *
    * @returns {Promise<void>}
    */
   async saveMessage(message) {
@@ -69,8 +114,9 @@ class MessageStore {
     const storedMessage = {
       ...message,
       payload: message.payload
-        ? Array.from(message.payload)
+        ? uint8ArrayToBase64(message.payload)
         : undefined,
+      payloadEncoding: message.payload ? 'base64' : undefined,
       storedAt: Date.now()
     };
 
@@ -85,7 +131,7 @@ class MessageStore {
   /**
    * Gets a message by ID
    * @param {string} id - Message ID
-   * @returns {Promise<Object|null>} Message or null if not found
+   * @returns {Promise<any>} Message or null if not found
    */
   async getMessage(id) {
     const message = await this._storage.get(id);
@@ -96,7 +142,13 @@ class MessageStore {
 
     // Convert payload back to Uint8Array
     if (message.payload) {
-      message.payload = new Uint8Array(message.payload);
+      if (message.payloadEncoding === 'base64') {
+        message.payload = base64ToUint8Array(message.payload);
+      } else if (Array.isArray(message.payload)) {
+        // Backwards compatibility with old Array.from() format
+        message.payload = new Uint8Array(message.payload);
+      }
+      delete message.payloadEncoding;
     }
 
     return message;
@@ -104,15 +156,8 @@ class MessageStore {
 
   /**
    * Gets messages matching query options
-   * @param {Object} [options={}] - Query options
-   * @param {string} [options.senderId] - Filter by sender ID
-   * @param {string} [options.recipientId] - Filter by recipient ID
-   * @param {number} [options.type] - Filter by message type
-   * @param {number} [options.since] - Filter messages since timestamp
-   * @param {number} [options.until] - Filter messages until timestamp
-   * @param {number} [options.limit=50] - Maximum messages to return
-   * @param {number} [options.offset=0] - Offset for pagination
-   * @returns {Promise<Object[]>} Array of messages
+   * @param {any} [options={}] - Query options   *
+   * @returns {Promise<any[]>} Array of messages
    */
   async getMessages(options = {}) {
     const {
@@ -217,7 +262,7 @@ class MessageStore {
    * Gets messages by sender
    * @param {string} senderId - Sender peer ID
    * @param {number} [limit=50] - Maximum messages
-   * @returns {Promise<Object[]>} Array of messages
+   * @returns {Promise<any[]>} Array of messages
    */
   async getMessagesBySender(senderId, limit = 50) {
     return this.getMessages({ senderId, limit });
@@ -227,7 +272,7 @@ class MessageStore {
    * Gets messages by recipient
    * @param {string} recipientId - Recipient peer ID
    * @param {number} [limit=50] - Maximum messages
-   * @returns {Promise<Object[]>} Array of messages
+   * @returns {Promise<any[]>} Array of messages
    */
   async getMessagesByRecipient(recipientId, limit = 50) {
     return this.getMessages({ recipientId, limit });
@@ -238,7 +283,7 @@ class MessageStore {
    * @param {string} peerId1 - First peer ID
    * @param {string} peerId2 - Second peer ID
    * @param {number} [limit=50] - Maximum messages
-   * @returns {Promise<Object[]>} Array of messages
+   * @returns {Promise<any[]>} Array of messages
    */
   async getConversation(peerId1, peerId2, limit = 50) {
     const allKeys = await this._storage.keys();
@@ -263,7 +308,7 @@ class MessageStore {
 
   /**
    * Updates indexes for a message
-   * @param {Object} message - Message to index
+   * @param {any} message - Message to index
    * @returns {Promise<void>}
    * @private
    */
@@ -291,7 +336,7 @@ class MessageStore {
 
   /**
    * Removes a message from indexes
-   * @param {Object} message - Message to remove from indexes
+   * @param {any} message - Message to remove from indexes
    * @returns {Promise<void>}
    * @private
    */
@@ -299,14 +344,14 @@ class MessageStore {
     if (message.senderId) {
       const key = `sender:${message.senderId}`;
       const ids = (await this._indexStorage.get(key)) || [];
-      const filtered = ids.filter(id => id !== message.id);
+      const filtered = ids.filter((/** @type {any} */ id) => id !== message.id);
       await this._indexStorage.set(key, filtered);
     }
 
     if (message.recipientId) {
       const key = `recipient:${message.recipientId}`;
       const ids = (await this._indexStorage.get(key)) || [];
-      const filtered = ids.filter(id => id !== message.id);
+      const filtered = ids.filter((/** @type {any} */ id) => id !== message.id);
       await this._indexStorage.set(key, filtered);
     }
   }

package/src/storage/Storage.js

@@ -15,13 +15,13 @@
 class Storage {
   /**
    * Creates a new Storage instance
-   * @param {Object} [options={}] - Storage options
-   * @param {string} [options.prefix=''] - Key prefix for namespacing
+   * @param {any} [options={}] - Storage options
+   *
    */
   constructor(options = {}) {
     /**
      * Storage options
-     * @type {Object}
+     * @type {any}
      * @protected
      */
     this._options = {
@@ -43,7 +43,7 @@ class Storage {
   /**
    * Gets a value by key
    * @abstract
-   * @param {string} key - Key to retrieve
+   * @param {string} _key - Key to retrieve
    * @returns {Promise<any>} Stored value or undefined
    * @throws {Error} If not implemented by subclass
    */
@@ -54,8 +54,8 @@ class Storage {
   /**
    * Sets a value by key
    * @abstract
-   * @param {string} key - Key to set
-   * @param {any} value - Value to store
+   * @param {string} _key - Key to set
+   * @param {any} _value - Value to store
    * @returns {Promise<void>}
    * @throws {Error} If not implemented by subclass
    */
@@ -66,7 +66,7 @@ class Storage {
   /**
    * Deletes a value by key
    * @abstract
-   * @param {string} key - Key to delete
+   * @param {string} _key - Key to delete
    * @returns {Promise<void>}
    * @throws {Error} If not implemented by subclass
    */
@@ -77,7 +77,7 @@ class Storage {
   /**
    * Checks if a key exists
    * @abstract
-   * @param {string} key - Key to check
+   * @param {string} _key - Key to check
    * @returns {Promise<boolean>} True if key exists
    * @throws {Error} If not implemented by subclass
    */
@@ -134,7 +134,7 @@ class Storage {
 
   /**
    * Sets multiple key-value pairs
-   * @param {Map<string, any>|Object} entries - Entries to set
+   * @param {Map<string, any>|any} entries - Entries to set
    * @returns {Promise<void>}
    */
   async setMany(entries) {

package/src/transport/BLETransport.js

@@ -25,7 +25,7 @@ const { ConnectionError } = require('../errors');
 class BLETransport extends Transport {
   /**
    * Creates a new BLETransport instance
-   * @param {Object} adapter - BLE adapter instance (RNBLEAdapter or NodeBLEAdapter)
+   * @param {any} adapter - BLE adapter instance (RNBLEAdapter or NodeBLEAdapter)
    * @param {Object} [options={}] - Transport options
    * @param {string} [options.powerMode='BALANCED'] - Power mode
    * @param {number} [options.maxPeers=8] - Maximum peers
@@ -41,16 +41,17 @@ class BLETransport extends Transport {
 
     /**
      * BLE adapter instance
-     * @type {Object}
+     * @type {any}
      * @private
      */
     this._adapter = adapter;
 
     /**
      * Current power mode
-     * @type {Object}
+     * @type {any}
      * @private
      */
+    // @ts-ignore
     this._powerMode = POWER_MODE[options.powerMode] || POWER_MODE.BALANCED;
 
     /**
@@ -76,7 +77,7 @@ class BLETransport extends Transport {
 
     /**
      * Per-peer write queues for serializing BLE writes
-     * @type {Map<string, Array>}
+     * @type {Map<string, any[]>}
      * @private
      */
     this._writeQueue = new Map();
@@ -90,7 +91,7 @@ class BLETransport extends Transport {
 
     /**
      * Bound event handlers for cleanup
-     * @type {Object}
+     * @type {any}
      * @private
      */
     this._handlers = {
@@ -140,7 +141,7 @@ class BLETransport extends Transport {
 
       // Register disconnect callback if adapter supports it
       if (typeof this._adapter.onDeviceDisconnected === 'function') {
-        this._adapter.onDeviceDisconnected((peerId) => {
+        this._adapter.onDeviceDisconnected((/** @type {any} */ peerId) => {
           this._handleDeviceDisconnected(peerId);
         });
       }
@@ -149,7 +150,7 @@ class BLETransport extends Transport {
 
       // Auto-start scanning for peers
       await this.startScanning();
-    } catch (error) {
+    } catch (/** @type {any} */ error) {
       this._setState(Transport.STATE.ERROR);
       throw error;
     }
@@ -232,12 +233,12 @@ class BLETransport extends Transport {
     }
 
     try {
-      let timeoutId;
+      /** @type {any} */ let timeoutId;
       const timeoutPromise = new Promise((_, reject) => {
         timeoutId = setTimeout(() => reject(new Error('Connection timeout')), this._connectTimeoutMs);
       });
       const device = await Promise.race([
-        this._adapter.connect(peerId).then(d => { clearTimeout(timeoutId); return d; }),
+        this._adapter.connect(peerId).then((/** @type {any} */ d) => { clearTimeout(timeoutId); return d; }),
         timeoutPromise
       ]);
 
@@ -259,7 +260,7 @@ class BLETransport extends Transport {
         peerId,
         BLE_SERVICE_UUID,
         BLE_CHARACTERISTIC_RX,
-        (data) => this._handleData(peerId, data)
+        (/** @type {any} */ data) => this._handleData(peerId, data)
       );
 
       const connectionInfo = {
@@ -271,7 +272,7 @@ class BLETransport extends Transport {
 
       this._peers.set(peerId, connectionInfo);
       this.emit('peerConnected', { peerId, rssi: device.rssi || -50 });
-    } catch (error) {
+    } catch (/** @type {any} */ error) {
       if (error.message === 'Connection timeout') {
         throw ConnectionError.connectionTimeout(peerId);
       }
@@ -293,6 +294,15 @@ class BLETransport extends Transport {
       await this._adapter.disconnect(peerId);
     } finally {
       this._peers.delete(peerId);
+
+      // Clean up write queue and writing state
+      const queue = this._writeQueue.get(peerId);
+      if (queue) {
+        queue.forEach(({ reject }) => reject(new Error('Peer disconnected')));
+        this._writeQueue.delete(peerId);
+      }
+      this._writing.delete(peerId);
+
       this.emit('peerDisconnected', { peerId, reason: 'user_request' });
     }
   }
@@ -325,7 +335,7 @@ class BLETransport extends Transport {
 
     // Chunk data for BLE MTU compliance
     for (let offset = 0; offset < data.length; offset += chunkSize) {
-      const chunk = data.slice(offset, Math.min(offset + chunkSize, data.length));
+      const chunk = data.subarray(offset, Math.min(offset + chunkSize, data.length));
       await this._queuedWrite(peerId, chunk);
     }
   }
@@ -353,7 +363,7 @@ class BLETransport extends Transport {
    * @param {string} modeName - Power mode name (PERFORMANCE, BALANCED, POWER_SAVER)
    */
   setPowerMode(modeName) {
-    const mode = POWER_MODE[modeName];
+    const mode = /** @type {any} */ (POWER_MODE)[modeName];
     if (mode) {
       this._powerMode = mode;
     }
@@ -375,7 +385,7 @@ class BLETransport extends Transport {
 
   /**
    * Handles discovered BLE devices
-   * @param {Object} device - Discovered device info
+   * @param {any} device - Discovered device info
    * @private
    */
   _handleDeviceDiscovered(device) {
@@ -414,7 +424,7 @@ class BLETransport extends Transport {
    * @private
    */
   _handleData(peerId, data) {
-    this.emit('message', { peerId, data: new Uint8Array(data) });
+    this.emit('message', { peerId, data: data instanceof Uint8Array ? data : new Uint8Array(data) });
   }
 
   /**
@@ -443,7 +453,8 @@ class BLETransport extends Transport {
     }
 
     return new Promise((resolve, reject) => {
-      this._writeQueue.get(peerId).push({ data, resolve, reject });
+      // @ts-ignore
+      this?._writeQueue.get(peerId).push({ data, resolve, reject });
       this._processWriteQueue(peerId);
     });
   }

package/src/transport/MockTransport.js

@@ -50,6 +50,7 @@ class MockTransport extends Transport {
      * @type {string|null}
      * @private
      */
+    // @ts-ignore
     this._localPeerId = options.localPeerId || `mock-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
   }
 
@@ -122,7 +123,8 @@ class MockTransport extends Transport {
 
     // Deliver to linked transport if available
     const linkedTransport = this._linkedTransports.get(peerId);
-    if (linkedTransport && linkedTransport.isRunning) {
+    if (linkedTransport && /** @type {any} */ (linkedTransport).isRunning) {
+      // @ts-ignore
       linkedTransport._receiveMessage(this._localPeerId, data);
     }
   }
@@ -157,7 +159,7 @@ class MockTransport extends Transport {
   /**
    * Simulates a peer connection
    * @param {string} peerId - Connecting peer ID
-   * @param {Object} [info={}] - Connection info (rssi, etc.)
+   * @param {any} [info={}] - Connection info (rssi, etc.)
    */
   simulatePeerConnect(peerId, info = {}) {
     if (!this.isRunning || this._peers.has(peerId)) {
@@ -203,6 +205,7 @@ class MockTransport extends Transport {
     }
 
     this._linkedTransports.set(otherPeerId, otherTransport);
+    // @ts-ignore
     otherTransport._linkedTransports.set(this._localPeerId, this);
   }
 
@@ -212,7 +215,9 @@ class MockTransport extends Transport {
    */
   unlinkFrom(otherTransport) {
     const otherPeerId = otherTransport.localPeerId;
+    // @ts-ignore
     this._linkedTransports.delete(otherPeerId);
+    // @ts-ignore
     otherTransport._linkedTransports.delete(this._localPeerId);
   }