ember-mug 0.2.0 → 0.3.0

package/dist/components/ConnectionStatus.js

@@ -6,5 +6,5 @@ export function ConnectionStatus({ isScanning, isConnected, foundMugName, error,
     if (isConnected) {
         return _jsx(_Fragment, {});
     }
-    return (_jsx(Box, { justifyContent: "center", marginY: 2, children: _jsx(Panel, { title: error ? "[!] Error" : isScanning ? "[~] Scanning" : "C[_] Welcome", titleColor: error ? "red" : theme.primary, borderColor: error ? "red" : theme.border, width: width, height: height, children: error ? (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginY: 1, children: [_jsx(Text, { color: "red", bold: true, children: error }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.dimText, children: ["Press", " ", _jsx(Text, { color: "yellow", bold: true, children: "[r]" }), " ", "to retry scanning"] }) })] })) : isScanning ? (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginY: 1, children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.primary, children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { color: theme.text, children: " Searching for Ember mug..." })] }), foundMugName && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "green", bold: true, children: ["* Found: ", foundMugName] }) })), foundMugName && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.primary, children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { color: theme.text, children: " Connecting..." })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.dimText, children: "Ensure mug is powered on and nearby" }) })] })) : (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginY: 1, children: [_jsx(Text, { color: theme.text, children: "No Ember mug connected" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.dimText, children: ["Press", " ", _jsx(Text, { color: "green", bold: true, children: "[s]" }), " ", "to start scanning"] }) })] })) }) }));
+    return (_jsx(Box, { justifyContent: "center", marginY: 2, children: _jsx(Panel, { title: error ? "[!] Error" : isScanning ? "[~] Scanning" : "C[_] Welcome", titleColor: error ? "red" : theme.primary, borderColor: error ? "red" : theme.border, width: width, height: height, children: error ? (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginY: 1, children: [_jsx(Text, { color: "red", bold: true, children: error }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.dimText, children: "Note: Mug must be set up with the official Ember app first." }) }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.dimText, children: ["Press", " ", _jsx(Text, { color: "yellow", bold: true, children: "[r]" }), " ", "to retry scanning"] }) })] })) : isScanning ? (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginY: 1, children: [_jsxs(Box, { children: [_jsx(Text, { color: theme.primary, children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { color: theme.text, children: " Searching for Ember mug..." })] }), foundMugName && (_jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: "green", bold: true, children: ["* Found: ", foundMugName] }) })), foundMugName && (_jsxs(Box, { marginTop: 1, children: [_jsx(Text, { color: theme.primary, children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { color: theme.text, children: " Connecting..." })] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: theme.dimText, children: "Ensure mug is powered on and nearby" }) })] })) : (_jsxs(Box, { flexDirection: "column", alignItems: "center", marginY: 1, children: [_jsx(Text, { color: theme.text, children: "No Ember mug connected" }), _jsx(Box, { marginTop: 1, children: _jsxs(Text, { color: theme.dimText, children: ["Press", " ", _jsx(Text, { color: "green", bold: true, children: "[s]" }), " ", "to start scanning"] }) })] })) }) }));
 }

package/dist/lib/bluetooth.d.ts

@@ -16,6 +16,7 @@ export declare class BluetoothManager extends EventEmitter {
     private state;
     constructor();
     private setupNobleListeners;
+    private connectWithRetry;
     startScanning(): Promise<void>;
     stopScanning(): Promise<void>;
     private connect;

package/dist/lib/bluetooth.js

@@ -38,20 +38,36 @@ export class BluetoothManager extends EventEmitter {
                 this.emit('mugFound', name);
                 await this.stopScanning();
                 this.peripheral = peripheral;
-                try {
-                    await this.connect();
-                }
-                catch (err) {
-                    this.emit('error', err instanceof Error ? err : new Error(String(err)));
-                }
+                await this.connectWithRetry();
             }
         });
     }
+    async connectWithRetry(maxRetries = 3) {
+        let lastError = null;
+        for (let attempt = 1; attempt <= maxRetries; attempt++) {
+            try {
+                await this.connect();
+                return; // Success
+            }
+            catch (err) {
+                lastError = err instanceof Error ? err : new Error(String(err));
+                if (attempt < maxRetries) {
+                    // Wait before retrying (exponential backoff: 1s, 2s, 4s)
+                    const delay = Math.pow(2, attempt - 1) * 1000;
+                    await new Promise(resolve => setTimeout(resolve, delay));
+                }
+            }
+        }
+        // All retries failed
+        this.emit('error', lastError || new Error('Connection failed after multiple attempts'));
+    }
     async startScanning() {
         return new Promise((resolve, reject) => {
-            if (getNobleState() === 'poweredOn') {
+            // Scan without service UUID filter - Ember mugs don't always advertise
+            // the service UUID in their advertisement packets. We filter by name instead.
+            const startScan = () => {
                 this.emit('scanning', true);
-                noble.startScanning([EMBER_SERVICE_UUID], false, (error) => {
+                noble.startScanning([], false, (error) => {
                     if (error) {
                         reject(error);
                     }
@@ -59,19 +75,14 @@ export class BluetoothManager extends EventEmitter {
                         resolve();
                     }
                 });
+            };
+            if (getNobleState() === 'poweredOn') {
+                startScan();
             }
             else {
                 noble.once('stateChange', (state) => {
                     if (state === 'poweredOn') {
-                        this.emit('scanning', true);
-                        noble.startScanning([EMBER_SERVICE_UUID], false, (error) => {
-                            if (error) {
-                                reject(error);
-                            }
-                            else {
-                                resolve();
-                            }
-                        });
+                        startScan();
                     }
                     else {
                         reject(new Error(`Bluetooth not available: ${state}`));
@@ -90,12 +101,37 @@ export class BluetoothManager extends EventEmitter {
         if (!this.peripheral) {
             throw new Error('No peripheral to connect to');
         }
+        const CONNECTION_TIMEOUT = 10000; // 10 seconds timeout
         return new Promise((resolve, reject) => {
+            let timeoutId = null;
+            let connected = false;
+            const cleanup = () => {
+                if (timeoutId) {
+                    clearTimeout(timeoutId);
+                    timeoutId = null;
+                }
+            };
+            timeoutId = setTimeout(() => {
+                if (!connected) {
+                    cleanup();
+                    // Try to cancel the connection attempt
+                    try {
+                        this.peripheral?.disconnect();
+                    }
+                    catch {
+                        // Ignore disconnect errors during timeout
+                    }
+                    reject(new Error('Connection timed out. Make sure your mug is nearby and awake.'));
+                }
+            }, CONNECTION_TIMEOUT);
             this.peripheral.connect(async (error) => {
                 if (error) {
-                    reject(error);
+                    cleanup();
+                    reject(new Error(`Failed to connect: ${error}`));
                     return;
                 }
+                connected = true;
+                cleanup();
                 this.isConnected = true;
                 this.state.connected = true;
                 this.state.mugName = this.peripheral.advertisement.localName || 'Ember Mug';
@@ -112,14 +148,30 @@ export class BluetoothManager extends EventEmitter {
                     resolve();
                 }
                 catch (err) {
-                    reject(err);
+                    this.handleDisconnect();
+                    reject(err instanceof Error ? err : new Error(String(err)));
                 }
             });
         });
     }
     async discoverCharacteristics() {
+        // First discover the Ember service specifically
+        const services = await new Promise((resolve, reject) => {
+            this.peripheral.discoverServices([EMBER_SERVICE_UUID], (error, services) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                resolve(services || []);
+            });
+        });
+        if (services.length === 0) {
+            throw new Error('Ember service not found on device');
+        }
+        // Then discover characteristics for that service
+        const emberService = services[0];
         return new Promise((resolve, reject) => {
-            this.peripheral.discoverAllServicesAndCharacteristics((error, services, characteristics) => {
+            emberService.discoverCharacteristics([], (error, characteristics) => {
                 if (error) {
                     reject(error);
                     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-mug",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "A CLI app for controlling Ember mugs via Bluetooth",
   "type": "module",
   "main": "dist/index.js",