node-switchbot 4.0.0-beta.1 → 4.0.0-beta.10

package/dist/ble.js

@@ -2,10 +2,12 @@
  *
  * ble.ts: SwitchBot v4.0.0 - BLE Discovery and Communication
  */
+import { Buffer } from 'node:buffer';
+import { createCipheriv } from 'node:crypto';
 import { EventEmitter } from 'node:events';
-import { BLENotAvailableError, DeviceNotFoundError } from './errors.js';
+import { BLENotAvailableError, CommandFailedError, DeviceNotFoundError } from './errors.js';
 import { BLE_COMMAND_TIMEOUT, BLE_CONNECT_TIMEOUT, BLE_NOTIFY_CHARACTERISTIC_UUID, BLE_SCAN_TIMEOUT, BLE_SERVICE_UUID, BLE_WRITE_CHARACTERISTIC_UUID, DEVICE_MODEL_MAP } from './settings.js';
-import { Logger, normalizeMAC, withTimeout } from './utils/index.js';
+import { Logger, macToDeviceId, normalizeMAC, withTimeout, extractMacFromManufacturerData } from './utils/index.js';
 /**
  * BLE Scanner for discovering SwitchBot devices
  */
@@ -14,6 +16,11 @@ export class BLEScanner extends EventEmitter {
     logger;
     scanning = false;
     discoveredDevices = new Map();
+    discoveredModelCache = new Map();
+    nobleStateHandler;
+    nobleDiscoverHandler;
+    nobleScanStartHandler;
+    nobleScanStopHandler;
     noblePromise = null;
     constructor(options = {}) {
         super();
@@ -32,20 +39,23 @@ export class BLEScanner extends EventEmitter {
      * Initialize Noble lazily
      */
     async initializeNoble() {
-        if (this.noble || this.noblePromise) {
+        if (this.noble) {
             return;
         }
-        if (!this.noblePromise) {
-            this.noblePromise = (async () => {
-                try {
-                    const module = await import('@stoprocent/noble');
-                    return module.default;
-                }
-                catch (error) {
-                    throw new BLENotAvailableError('BLE not supported on this platform or @stoprocent/noble not installed');
-                }
-            })();
+        if (this.noblePromise) {
+            // Wait for existing initialization to complete
+            this.noble = await this.noblePromise;
+            return;
         }
+        this.noblePromise = (async () => {
+            try {
+                const module = await import('@stoprocent/noble');
+                return module.default;
+            }
+            catch (error) {
+                throw new BLENotAvailableError('BLE not supported on this platform or @stoprocent/noble not installed');
+            }
+        })();
         try {
             this.noble = await this.noblePromise;
             this.setupNobleHandlers();
@@ -61,61 +71,133 @@ export class BLEScanner extends EventEmitter {
         if (!this.noble) {
             await this.initializeNoble();
         }
+        if (!this.noble) {
+            throw new BLENotAvailableError('BLE not available - noble failed to initialize');
+        }
     }
     /**
      * Setup Noble event handlers
      */
     setupNobleHandlers() {
-        this.noble.on('stateChange', (state) => {
+        // Prevent duplicate listeners if handlers are re-initialized
+        this.removeNobleHandlers();
+        // Store handlers as properties for later cleanup
+        this.nobleStateHandler = (state) => {
             this.logger.debug('Noble state changed:', state);
             this.emit('state-change', state);
             if (state === 'poweredOn') {
                 this.emit('ready');
             }
-        });
-        this.noble.on('discover', (peripheral) => {
+        };
+        this.nobleDiscoverHandler = (peripheral) => {
             this.handleDiscovery(peripheral);
-        });
-        this.noble.on('scanStart', () => {
+        };
+        this.nobleScanStartHandler = () => {
             this.scanning = true;
             this.logger.info('BLE scan started');
             this.emit('scan-start');
-        });
-        this.noble.on('scanStop', () => {
+        };
+        this.nobleScanStopHandler = () => {
             this.scanning = false;
             this.logger.info('BLE scan stopped');
             this.emit('scan-stop');
-        });
+        };
+        this.noble.on('stateChange', this.nobleStateHandler);
+        this.noble.on('discover', this.nobleDiscoverHandler);
+        this.noble.on('scanStart', this.nobleScanStartHandler);
+        this.noble.on('scanStop', this.nobleScanStopHandler);
+    }
+    /**
+     * Remove Noble event handlers
+     */
+    removeNobleHandlers() {
+        if (this.nobleStateHandler) {
+            this.noble.off('stateChange', this.nobleStateHandler);
+        }
+        if (this.nobleDiscoverHandler) {
+            this.noble.off('discover', this.nobleDiscoverHandler);
+        }
+        if (this.nobleScanStartHandler) {
+            this.noble.off('scanStart', this.nobleScanStartHandler);
+        }
+        if (this.nobleScanStopHandler) {
+            this.noble.off('scanStop', this.nobleScanStopHandler);
+        }
+        this.nobleStateHandler = undefined;
+        this.nobleDiscoverHandler = undefined;
+        this.nobleScanStartHandler = undefined;
+        this.nobleScanStopHandler = undefined;
     }
     /**
      * Handle device discovery
      */
     handleDiscovery(peripheral) {
         try {
-            const { advertisement, address, rssi } = peripheral;
-            // Check if this is a SwitchBot device
-            if (!advertisement.serviceData || advertisement.serviceData.length === 0) {
+            // Validate peripheral has required properties
+            if (!peripheral || typeof peripheral !== 'object') {
+                return;
+            }
+            const { advertisement, address, rssi, connectable } = peripheral;
+            // Skip non-connectable devices
+            if (connectable === false) {
+                return;
+            }
+            // Skip devices with invalid RSSI (typical range: -120 to 0 dBm)
+            if (typeof rssi !== 'number' || rssi < -120 || rssi > 0) {
+                return;
+            }
+            // Validate advertisement object exists and has service data
+            if (!advertisement || typeof advertisement !== 'object') {
+                return;
+            }
+            if (!Array.isArray(advertisement.serviceData) || advertisement.serviceData.length === 0) {
                 return;
             }
             for (const serviceDataItem of advertisement.serviceData) {
-                // SwitchBot service UUID
-                if (serviceDataItem.uuid !== 'fd3d' && serviceDataItem.uuid !== '0000fd3d-0000-1000-8000-00805f9b34fb') {
+                // Validate service data item has required properties
+                if (!serviceDataItem || typeof serviceDataItem !== 'object') {
+                    continue;
+                }
+                // SwitchBot service UUID (current: fd3d, legacy: 000d)
+                const uuid = typeof serviceDataItem.uuid === 'string' ? serviceDataItem.uuid.toLowerCase() : '';
+                const isSwitchBotUUID = uuid === 'fd3d' ||
+                    uuid === '0000fd3d-0000-1000-8000-00805f9b34fb' ||
+                    uuid === '000d' ||
+                    uuid === '0000000d-0000-1000-8000-00805f9b34fb';
+                if (!isSwitchBotUUID) {
                     continue;
                 }
                 const serviceData = this.parseServiceData(serviceDataItem.data);
                 if (!serviceData) {
                     continue;
                 }
-                const mac = normalizeMAC(address);
+                let normalizedAddress = typeof address === 'string' && address.length > 0 ? normalizeMAC(address) : undefined;
+                // Fallback to manufacturer data MAC if service data address is empty
+                if (!normalizedAddress) {
+                    const manufacturerMac = extractMacFromManufacturerData(peripheral.advertisement?.manufacturerData);
+                    if (manufacturerMac) {
+                        normalizedAddress = manufacturerMac;
+                    }
+                }
+                const fallbackId = typeof peripheral.id === 'string' && peripheral.id.length > 0
+                    ? peripheral.id
+                    : (normalizedAddress ? macToDeviceId(normalizedAddress) : undefined);
+                if (!fallbackId) {
+                    this.logger.debug('Skipping BLE discovery with no address and no peripheral id');
+                    continue;
+                }
                 const advertisement = {
-                    id: peripheral.id,
-                    address: mac,
+                    id: fallbackId,
+                    address: normalizedAddress,
+                    isAddressable: normalizedAddress !== undefined,
                     rssi,
                     serviceData,
                 };
-                this.discoveredDevices.set(mac, advertisement);
+                const discoveryKey = normalizedAddress ?? `id:${fallbackId}`;
+                this.discoveredDevices.set(discoveryKey, advertisement);
+                this.discoveredModelCache.set(discoveryKey, serviceData.model);
                 this.emit('discover', advertisement);
-                this.logger.debug(`Discovered ${serviceData.modelName} at ${mac}`);
+                this.logger.debug(`Discovered ${serviceData.modelName} at ${normalizedAddress ?? fallbackId}`);
             }
         }
         catch (error) {
@@ -146,6 +228,45 @@ export class BLEScanner extends EventEmitter {
             if (data.length > 2) {
                 serviceData.battery = data[2] & 0x7F;
             }
+            // Model-specific advertisement parsing for status without active connection
+            if (model === 'H' && data.length > 1) {
+                // Bot (WoHand): infer mode/state from status bits
+                serviceData.mode = (data[1] & 0x80) ? 'switch' : 'press';
+                serviceData.state = (data[1] & 0x40) !== 0;
+            }
+            if ((model === 'c' || model === '{') && data.length > 4) {
+                // Curtain/Curtain3
+                serviceData.inMotion = (data[1] & 0x40) !== 0;
+                serviceData.position = Math.min(100, Math.max(0, data[3] & 0x7F));
+                serviceData.lightLevel = data[4] & 0x7F;
+                serviceData.calibration = (data[1] & 0x20) !== 0;
+                if (data.length > 5) {
+                    serviceData.deviceChain = data[5] & 0x03;
+                }
+            }
+            if ((model === 'o' || model === '\x11') && data.length > 1) {
+                // Lock / Lock Pro
+                const lockStatus = data[1] & 0x0F;
+                serviceData.status = lockStatus;
+                serviceData.doorOpen = (data[1] & 0x10) !== 0;
+                serviceData.calibration = (data[1] & 0x80) !== 0;
+                serviceData.lockState = lockStatus === 1
+                    ? 'unlocked'
+                    : lockStatus === 2
+                        ? 'jammed'
+                        : 'locked';
+                if (data.length > 3) {
+                    serviceData.sequenceNumber = data[3];
+                }
+            }
+            if ((model === '\x0D' || model === '\x0E') && data.length > 1) {
+                // Relay Switch 1PM / Relay Switch 1
+                serviceData.state = (data[1] & 0x01) === 0x01;
+                serviceData.channel2State = (data[1] & 0x02) === 0x02;
+                if (data.length > 3) {
+                    serviceData.sequenceNumber = data[3];
+                }
+            }
             return serviceData;
         }
         catch (error) {
@@ -160,6 +281,9 @@ export class BLEScanner extends EventEmitter {
         await this.ensureNoble();
         const { duration = BLE_SCAN_TIMEOUT, active = true } = options;
         this.logger.info('Starting BLE scan', { duration, active });
+        if (!this.noble) {
+            throw new BLENotAvailableError('BLE not available - noble failed to initialize');
+        }
         if (this.noble.state !== 'poweredOn') {
             await new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
@@ -173,6 +297,7 @@ export class BLEScanner extends EventEmitter {
         }
         // Clear previous discoveries if starting fresh
         this.discoveredDevices.clear();
+        this.discoveredModelCache.clear();
         // Start scanning
         this.noble.startScanning([], active);
         // Auto-stop after duration
@@ -192,6 +317,15 @@ export class BLEScanner extends EventEmitter {
             this.noble.stopScanning();
         }
     }
+    /**
+     * Cleanup all resources
+     */
+    destroy() {
+        this.stopScan();
+        this.removeNobleHandlers();
+        this.discoveredDevices.clear();
+        this.discoveredModelCache.clear();
+    }
     /**
      * Get all discovered devices
      */
@@ -199,10 +333,19 @@ export class BLEScanner extends EventEmitter {
         return Array.from(this.discoveredDevices.values());
     }
     /**
-     * Get discovered device by MAC
+     * Get discovered device by MAC or BLE ID
      */
-    getDevice(mac) {
-        return this.discoveredDevices.get(normalizeMAC(mac));
+    getDevice(mac, bleId) {
+        // Try MAC lookup first
+        const byMac = this.discoveredDevices.get(normalizeMAC(mac));
+        if (byMac) {
+            return byMac;
+        }
+        // Fall back to ID-based lookup
+        if (bleId) {
+            return this.discoveredDevices.get(`id:${bleId}`);
+        }
+        return undefined;
     }
     /**
      * Check if currently scanning
@@ -213,17 +356,20 @@ export class BLEScanner extends EventEmitter {
     /**
      * Wait for specific device
      */
-    async waitForDevice(mac, timeoutMs = BLE_SCAN_TIMEOUT) {
+    async waitForDevice(mac, timeoutMs = BLE_SCAN_TIMEOUT, bleId) {
         const normalizedMac = normalizeMAC(mac);
-        // Check if already discovered
-        const existing = this.discoveredDevices.get(normalizedMac);
+        // Check if already discovered (try MAC first, then ID)
+        const existing = this.discoveredDevices.get(normalizedMac) || (bleId ? this.discoveredDevices.get(`id:${bleId}`) : undefined);
         if (existing) {
             return existing;
         }
         // Wait for discovery
         return withTimeout(new Promise((resolve) => {
             const handler = (advertisement) => {
-                if (normalizeMAC(advertisement.address) === normalizedMac) {
+                // Match by address (if available) or by ID
+                const matches = (advertisement.address && normalizeMAC(advertisement.address) === normalizedMac) ||
+                    (bleId && advertisement.id === bleId);
+                if (matches) {
                     this.off('discover', handler);
                     resolve(advertisement);
                 }
@@ -240,6 +386,11 @@ export class BLEConnection {
     logger;
     connections = new Map(); // Map of MAC -> Peripheral
     characteristics = new Map();
+    disconnectTimers = new Map();
+    operationLocks = new Map();
+    encryptionConfig = new Map();
+    notificationHandlers = new Map();
+    persistentConnectionMs = 8500;
     noblePromise = null;
     constructor(options = {}) {
         this.logger = new Logger('BLEConnection', options.logLevel);
@@ -254,20 +405,23 @@ export class BLEConnection {
      * Initialize Noble lazily
      */
     async initializeNoble() {
-        if (this.noble || this.noblePromise) {
+        if (this.noble) {
             return;
         }
-        if (!this.noblePromise) {
-            this.noblePromise = (async () => {
-                try {
-                    const module = await import('@stoprocent/noble');
-                    return module.default;
-                }
-                catch (error) {
-                    throw new BLENotAvailableError('BLE not supported on this platform or @stoprocent/noble not installed');
-                }
-            })();
+        if (this.noblePromise) {
+            // Wait for existing initialization to complete
+            this.noble = await this.noblePromise;
+            return;
         }
+        this.noblePromise = (async () => {
+            try {
+                const module = await import('@stoprocent/noble');
+                return module.default;
+            }
+            catch (error) {
+                throw new BLENotAvailableError('BLE not supported on this platform or @stoprocent/noble not installed');
+            }
+        })();
         try {
             this.noble = await this.noblePromise;
         }
@@ -282,6 +436,178 @@ export class BLEConnection {
         if (!this.noble) {
             await this.initializeNoble();
         }
+        if (!this.noble) {
+            throw new BLENotAvailableError('BLE not available - noble failed to initialize');
+        }
+    }
+    async withMacLock(mac, fn) {
+        const normalizedMac = normalizeMAC(mac);
+        const previousLock = this.operationLocks.get(normalizedMac) ?? Promise.resolve();
+        let releaseCurrent = () => { };
+        const currentLock = new Promise((resolve) => {
+            releaseCurrent = resolve;
+        });
+        const chainedLock = previousLock.then(() => currentLock);
+        this.operationLocks.set(normalizedMac, chainedLock);
+        await previousLock;
+        try {
+            return await fn();
+        }
+        finally {
+            releaseCurrent();
+            if (this.operationLocks.get(normalizedMac) === chainedLock) {
+                this.operationLocks.delete(normalizedMac);
+            }
+        }
+    }
+    clearDisconnectTimer(mac) {
+        const existingTimer = this.disconnectTimers.get(mac);
+        if (existingTimer) {
+            clearTimeout(existingTimer);
+            this.disconnectTimers.delete(mac);
+        }
+    }
+    scheduleDisconnect(mac) {
+        this.clearDisconnectTimer(mac);
+        const timer = setTimeout(() => {
+            this.disconnect(mac).catch((error) => {
+                this.logger.debug(`Auto-disconnect failed for ${mac}`, error);
+            });
+        }, this.persistentConnectionMs);
+        this.disconnectTimers.set(mac, timer);
+    }
+    setPersistentConnectionTimeout(timeoutMs) {
+        this.persistentConnectionMs = Math.max(1000, timeoutMs);
+    }
+    setEncryption(mac, keyHex, ivHex, mode = 'auto') {
+        const normalizedMac = normalizeMAC(mac);
+        const key = Buffer.from(keyHex, 'hex');
+        const iv = Buffer.from(ivHex, 'hex');
+        if (key.length !== 16) {
+            throw new CommandFailedError('Invalid BLE encryption key length (expected 16 bytes)', 'ble');
+        }
+        const resolvedMode = mode === 'auto'
+            ? (iv.length === 12 ? 'gcm' : 'ctr')
+            : mode;
+        const expectedIvLength = resolvedMode === 'gcm' ? 12 : 16;
+        if (iv.length !== expectedIvLength) {
+            throw new CommandFailedError(`Invalid IV length for ${resolvedMode.toUpperCase()} mode`, 'ble');
+        }
+        this.encryptionConfig.set(normalizedMac, { key, iv: Buffer.from(iv), mode: resolvedMode });
+    }
+    clearEncryption(mac) {
+        this.encryptionConfig.delete(normalizeMAC(mac));
+    }
+    incrementIv(iv) {
+        const nextIv = Buffer.from(iv);
+        for (let i = nextIv.length - 1; i >= 0; i--) {
+            if ((nextIv[i] ?? 0) === 0xFF) {
+                nextIv[i] = 0x00;
+            }
+            else {
+                nextIv[i] = (nextIv[i] ?? 0) + 1;
+                break;
+            }
+        }
+        return nextIv;
+    }
+    encryptIfConfigured(mac, data) {
+        const normalizedMac = normalizeMAC(mac);
+        const config = this.encryptionConfig.get(normalizedMac);
+        if (!config) {
+            return data;
+        }
+        if (config.mode === 'gcm') {
+            const cipher = createCipheriv('aes-128-gcm', config.key, config.iv);
+            const encrypted = Buffer.concat([cipher.update(data), cipher.final()]);
+            const tag = cipher.getAuthTag().subarray(0, 2);
+            this.encryptionConfig.set(normalizedMac, {
+                ...config,
+                iv: this.incrementIv(config.iv),
+            });
+            return Buffer.concat([encrypted, tag]);
+        }
+        const cipher = createCipheriv('aes-128-ctr', config.key, config.iv);
+        return Buffer.concat([cipher.update(data), cipher.final()]);
+    }
+    validateCommandResult(response, mac) {
+        if (!response || response.length === 0) {
+            throw new CommandFailedError(`Empty BLE response from ${mac}`, 'ble');
+        }
+        if (response.includes(0x07)) {
+            throw new CommandFailedError(`BLE command rejected by ${mac}: password required`, 'ble');
+        }
+        if (response.includes(0x09)) {
+            throw new CommandFailedError(`BLE command rejected by ${mac}: password incorrect`, 'ble');
+        }
+        const acknowledged = response.some(byte => byte === 0x01 || byte === 0x05 || byte === 0x06);
+        if (!acknowledged) {
+            throw new CommandFailedError(`Unexpected BLE response from ${mac}: ${response.toString('hex')}`, 'ble');
+        }
+    }
+    async sendCommand(mac, data, options = {}) {
+        const normalizedMac = normalizeMAC(mac);
+        const { expectResponse = true, validateResponse = true, responseTimeoutMs = 1200, } = options;
+        return this.withMacLock(normalizedMac, async () => {
+            const payload = this.encryptIfConfigured(normalizedMac, data);
+            await this.write(normalizedMac, payload);
+            if (!expectResponse && !validateResponse) {
+                return undefined;
+            }
+            const response = await withTimeout(this.read(normalizedMac), responseTimeoutMs, `BLE response timeout from ${normalizedMac}`);
+            if (validateResponse) {
+                this.validateCommandResult(response, normalizedMac);
+            }
+            return response;
+        });
+    }
+    async subscribeNotifications(mac, handler) {
+        const normalizedMac = normalizeMAC(mac);
+        if (!this.connections.has(normalizedMac)) {
+            await this.connect(normalizedMac);
+        }
+        const chars = this.characteristics.get(normalizedMac);
+        if (!chars?.notify) {
+            throw new CommandFailedError(`Notify characteristic not available for ${normalizedMac}`, 'ble');
+        }
+        if (!this.notificationHandlers.has(normalizedMac)) {
+            this.notificationHandlers.set(normalizedMac, new Set());
+            if (typeof chars.notify.on === 'function') {
+                chars.notify.on('data', (payload) => {
+                    const handlers = this.notificationHandlers.get(normalizedMac);
+                    if (!handlers) {
+                        return;
+                    }
+                    for (const listener of handlers) {
+                        listener(payload);
+                    }
+                });
+            }
+        }
+        this.notificationHandlers.get(normalizedMac).add(handler);
+        if (typeof chars.notify.subscribe === 'function') {
+            await new Promise((resolve, reject) => {
+                chars.notify.subscribe((error) => {
+                    if (error) {
+                        reject(error);
+                    }
+                    else {
+                        resolve();
+                    }
+                });
+            });
+        }
+    }
+    unsubscribeNotifications(mac, handler) {
+        const normalizedMac = normalizeMAC(mac);
+        const handlers = this.notificationHandlers.get(normalizedMac);
+        if (!handlers) {
+            return;
+        }
+        handlers.delete(handler);
+        if (handlers.size === 0) {
+            this.notificationHandlers.delete(normalizedMac);
+        }
     }
     /**
      * Connect to a device
@@ -291,13 +617,25 @@ export class BLEConnection {
         const normalizedMac = normalizeMAC(mac);
         // Already connected?
         if (this.connections.has(normalizedMac)) {
+            this.clearDisconnectTimer(normalizedMac);
             this.logger.debug(`Already connected to ${mac}`);
             return;
         }
         this.logger.info(`Connecting to ${mac}`);
-        // Find peripheral
+        // Find peripheral (by address or ID)
         const peripherals = await this.noble.peripherals || [];
-        const peripheral = peripherals.find((p) => normalizeMAC(p.address) === normalizedMac);
+        let peripheral;
+        // Try to find by normalized MAC first
+        if (mac.startsWith('id:')) {
+            // ID-based lookup: extract the ID and find by peripheral.id
+            const bleId = mac.substring(3);
+            // Look through peripherals to find matching ID
+            peripheral = peripherals.find((p) => p.id === bleId);
+        }
+        else {
+            // MAC-based lookup
+            peripheral = peripherals.find((p) => p.address && normalizeMAC(p.address) === normalizedMac);
+        }
         if (!peripheral) {
             throw new DeviceNotFoundError(mac);
         }
@@ -313,9 +651,22 @@ export class BLEConnection {
             });
         }), BLE_CONNECT_TIMEOUT, `Connection to ${mac} timed out`);
         this.connections.set(normalizedMac, peripheral);
+        this.clearDisconnectTimer(normalizedMac);
         this.logger.info(`Connected to ${mac}`);
-        // Discover characteristics
-        await this.discoverCharacteristics(normalizedMac, peripheral);
+        // Discover characteristics (may throw)
+        try {
+            await this.discoverCharacteristics(normalizedMac, peripheral);
+        }
+        catch (error) {
+            // Clean up partial connection if characteristic discovery fails
+            this.connections.delete(normalizedMac);
+            this.characteristics.delete(normalizedMac);
+            // Best effort disconnect to avoid leaked active BLE links
+            await new Promise((resolve) => {
+                peripheral.disconnect(() => resolve());
+            });
+            throw error;
+        }
     }
     /**
      * Discover service characteristics
@@ -345,6 +696,9 @@ export class BLEConnection {
     async disconnect(mac) {
         const normalizedMac = normalizeMAC(mac);
         const peripheral = this.connections.get(normalizedMac);
+        this.clearDisconnectTimer(normalizedMac);
+        this.clearEncryption(normalizedMac);
+        this.notificationHandlers.delete(normalizedMac);
         if (!peripheral) {
             return;
         }
@@ -377,6 +731,7 @@ export class BLEConnection {
                     reject(error);
                 }
                 else {
+                    this.scheduleDisconnect(normalizedMac);
                     resolve();
                 }
             });
@@ -402,6 +757,7 @@ export class BLEConnection {
                     reject(error);
                 }
                 else {
+                    this.scheduleDisconnect(normalizedMac);
                     resolve(data);
                 }
             });