ember-mug 0.3.2 → 0.3.4

package/dist/cli.js

@@ -11,7 +11,7 @@ Usage:
   ember-mug [options]
 
 Options:
-  -d, --debug    Enable debug mode (outputs detailed Bluetooth logs)
+  -d, --debug    Enable debug mode (console output with detailed Bluetooth logs)
   -h, --help     Show this help message
 
 Environment variables:
@@ -19,53 +19,111 @@ Environment variables:
 `);
     process.exit(0);
 }
-// ANSI escape codes for alternate screen buffer
-const enterAltScreen = "\x1b[?1049h";
-const exitAltScreen = "\x1b[?1049l";
-const hideCursor = "\x1b[?25l";
-const showCursor = "\x1b[?25h";
-const clearScreen = "\x1b[2J\x1b[H";
-// Enter alternate screen buffer and hide cursor
-process.stdout.write(enterAltScreen + hideCursor + clearScreen);
-// Handle graceful shutdown - restore terminal state
-const cleanup = () => {
-    process.stdout.write(showCursor + exitAltScreen);
-    process.exit(0);
-};
-process.on("SIGINT", cleanup);
-process.on("SIGTERM", cleanup);
-process.on("exit", () => {
-    process.stdout.write(showCursor + exitAltScreen);
-});
-// Handle terminal resize - clear screen to prevent artifacts
-process.stdout.on("resize", () => {
-    process.stdout.write(clearScreen);
-});
-async function main() {
-    // Dynamic imports to avoid initializing Bluetooth for --help
+// Debug mode: run without Ink UI, just console output
+async function runDebugMode() {
     const { setDebugMode } = await import("./lib/debug.js");
-    // Enable debug mode if flag is set
-    if (debugMode) {
-        setDebugMode(true);
-    }
-    const React = await import("react");
-    const { render } = await import("ink");
-    const { App } = await import("./components/App.js");
-    const { isMockMode, setBluetoothManager } = await import("./lib/bluetooth.js");
-    // Initialize mock manager if in mock mode (set via EMBER_MOCK env var)
+    setDebugMode(true);
+    console.log("Starting ember-mug in debug mode...\n");
+    const { getBluetoothManager, isMockMode, setBluetoothManager } = await import("./lib/bluetooth.js");
+    // Initialize mock manager if in mock mode
     if (isMockMode()) {
+        console.log("Running in MOCK mode\n");
         const { getMockBluetoothManager } = await import("./lib/mock-bluetooth.js");
         const { BluetoothManager } = await import("./lib/bluetooth.js");
         setBluetoothManager(getMockBluetoothManager());
     }
-    // Render the app
-    const app = render(React.createElement(App));
-    await app.waitUntilExit();
-    process.exit(0);
+    const manager = getBluetoothManager();
+    // Listen to all events and log them
+    manager.on('scanning', (isScanning) => {
+        console.log(`[EVENT] Scanning: ${isScanning}`);
+    });
+    manager.on('mugFound', (name) => {
+        console.log(`[EVENT] Mug found: ${name}`);
+    });
+    manager.on('connected', () => {
+        console.log(`[EVENT] Connected!`);
+    });
+    manager.on('disconnected', () => {
+        console.log(`[EVENT] Disconnected`);
+    });
+    manager.on('error', (error) => {
+        console.error(`[EVENT] Error: ${error.message}`);
+    });
+    manager.on('stateChange', (state) => {
+        console.log(`[EVENT] State changed:`, JSON.stringify(state, null, 2));
+    });
+    // Handle graceful shutdown
+    process.on("SIGINT", () => {
+        console.log("\nShutting down...");
+        manager.disconnect();
+        process.exit(0);
+    });
+    // Start scanning
+    console.log("Starting Bluetooth scan...\n");
+    try {
+        await manager.startScanning();
+    }
+    catch (error) {
+        console.error("Failed to start scanning:", error);
+        process.exit(1);
+    }
+    // Keep the process running
+    await new Promise(() => { });
+}
+// Normal mode: run with Ink UI
+async function runNormalMode() {
+    // ANSI escape codes for alternate screen buffer
+    const enterAltScreen = "\x1b[?1049h";
+    const exitAltScreen = "\x1b[?1049l";
+    const hideCursor = "\x1b[?25l";
+    const showCursor = "\x1b[?25h";
+    const clearScreen = "\x1b[2J\x1b[H";
+    // Enter alternate screen buffer and hide cursor
+    process.stdout.write(enterAltScreen + hideCursor + clearScreen);
+    // Handle graceful shutdown - restore terminal state
+    const cleanup = () => {
+        process.stdout.write(showCursor + exitAltScreen);
+        process.exit(0);
+    };
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
+    process.on("exit", () => {
+        process.stdout.write(showCursor + exitAltScreen);
+    });
+    // Handle terminal resize - clear screen to prevent artifacts
+    process.stdout.on("resize", () => {
+        process.stdout.write(clearScreen);
+    });
+    try {
+        const React = await import("react");
+        const { render } = await import("ink");
+        const { App } = await import("./components/App.js");
+        const { isMockMode, setBluetoothManager } = await import("./lib/bluetooth.js");
+        // Initialize mock manager if in mock mode (set via EMBER_MOCK env var)
+        if (isMockMode()) {
+            const { getMockBluetoothManager } = await import("./lib/mock-bluetooth.js");
+            const { BluetoothManager } = await import("./lib/bluetooth.js");
+            setBluetoothManager(getMockBluetoothManager());
+        }
+        // Render the app
+        const app = render(React.createElement(App));
+        await app.waitUntilExit();
+        process.exit(0);
+    }
+    catch (error) {
+        process.stdout.write(showCursor + exitAltScreen);
+        console.error("Failed to start:", error);
+        process.exit(1);
+    }
+}
+// Run appropriate mode
+if (debugMode) {
+    runDebugMode().catch((error) => {
+        console.error("Failed to start:", error);
+        process.exit(1);
+    });
+}
+else {
+    runNormalMode();
 }
-main().catch((error) => {
-    process.stdout.write(showCursor + exitAltScreen);
-    console.error("Failed to start:", error);
-    process.exit(1);
-});
 export {};

package/dist/lib/bluetooth.js

@@ -46,6 +46,12 @@ export class BluetoothManager extends EventEmitter {
                 this.emit('mugFound', name);
                 await this.stopScanning();
                 this.peripheral = peripheral;
+                // Wait for BLE adapter to settle after stopping scan
+                // This delay is necessary because some BLE adapters (especially on Linux with BlueZ)
+                // need time to switch from scanning mode to connection mode
+                const POST_SCAN_DELAY = 500;
+                debug(`Waiting ${POST_SCAN_DELAY}ms for BLE adapter to settle after scan...`);
+                await new Promise(resolve => setTimeout(resolve, POST_SCAN_DELAY));
                 debug('Starting connection process...');
                 await this.connectWithRetry();
             }

package/dist/lib/debug.js

@@ -17,6 +17,5 @@ export function debug(message, ...args) {
     const formattedArgs = args.length > 0
         ? ' ' + args.map(arg => typeof arg === 'object' ? JSON.stringify(arg) : String(arg)).join(' ')
         : '';
-    // Write to stderr so it doesn't interfere with Ink's stdout rendering
-    process.stderr.write(`[${timestamp}] [DEBUG] ${message}${formattedArgs}\n`);
+    console.log(`[${timestamp}] [DEBUG] ${message}${formattedArgs}`);
 }

package/package.json

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