ember-mug 0.1.4 → 0.1.5

package/README.md

@@ -39,35 +39,37 @@ npm run dev
 - **Temperature Control**: View current temperature and adjust target temperature
 - **Temperature Presets**: Quick-select from predefined temperature presets (Latte, Coffee, Tea)
 - **Battery Monitoring**: Real-time battery level with estimated battery life
-- **Time Estimates**:
-  - Estimated time to reach target temperature
-  - Estimated battery life based on current mug state
-- **LED Color Control**: Customize your mug's LED color with presets or custom RGB values
+- **Dynamic Time Estimates**:
+  - Estimated time to reach target temperature based on real-time heating/cooling rates
+  - Estimated battery life based on actual discharge/charge rates
+- **LED Color Control**: Customize your mug's LED color via the settings panel
 - **Temperature Unit Toggle**: Switch between Celsius and Fahrenheit
-- **Persistent Settings**: Your preferences are saved between sessions
+- **Persistent Settings**: Your preferences and custom presets are saved between sessions
+- **Responsive Layout**: Adapts to narrow or wide terminals automatically
 
 ## Controls
 
 ### When Disconnected
+
 - `s` - Start scanning for Ember mug
 - `r` - Retry scanning (after error)
 - `q` - Quit
 
 ### When Connected
-- `t` - Enter temperature adjustment mode
-  - `←/→` or `h/l` - Adjust by ±0.5°
-  - `↑/↓` or `j/k` - Adjust by ±1°
-  - `t` or `Enter` - Exit temperature mode
+
+- `←/→` or `h/l` - Adjust temperature by ±0.5°
 - `1-3` - Select temperature preset
-- `c` - Toggle LED color control
-  - `1-8` - Select preset color
-  - `c` - Toggle custom color mode
-  - `r/g/b` - Select color channel (in custom mode)
-  - `←/→` - Adjust selected channel
 - `u` - Toggle temperature unit (°C/°F)
-- `o` - Open settings
+- `o` - Open settings (LED color, unit, preset editing)
 - `q` - Quit
 
+### In Settings
+
+- `↑/↓` or `j/k` - Navigate settings
+- `Enter/Space` - Toggle unit
+- `←/→` or `h/l` - Change LED color or edit preset temperature
+- `Esc` or `q` - Close settings
+
 ## Requirements
 
 - Node.js 18+
@@ -77,20 +79,25 @@ npm run dev
 ### Platform-Specific Notes
 
 #### Linux
+
 You may need to grant Bluetooth permissions:
+
 ```bash
 sudo setcap cap_net_raw+eip $(eval readlink -f `which node`)
 ```
 
 #### macOS
+
 Grant Bluetooth permissions to your terminal application in System Preferences > Security & Privacy > Privacy > Bluetooth.
 
 #### Windows
+
 Requires Windows 10 build 15063 or later with Bluetooth 4.0+ adapter.
 
 ## Technical Details
 
 This application uses:
+
 - [@abandonware/noble](https://github.com/abandonware/noble) for Bluetooth LE communication
 - [Ink](https://github.com/vadimdemedes/ink) for the React-based CLI interface
 - [Conf](https://github.com/sindresorhus/conf) for persistent settings storage

package/dist/components/App.js

@@ -24,7 +24,7 @@ export function App() {
     const panelWidth = isNarrowTerminal
         ? terminalWidth - 4 // Full width minus margins for stacked layout
         : Math.floor((terminalWidth - 6) / 2); // Half width minus gaps for 2x2 grid
-    const { state: mugState, isScanning, error, foundMugName, startScanning, setTargetTemp, setTemperatureUnit: setMugTempUnit, setLedColor, } = useMug();
+    const { state: mugState, isScanning, error, foundMugName, startScanning, setTargetTemp, setTemperatureUnit: setMugTempUnit, setLedColor, tempRate, batteryRate, } = useMug();
     // Get theme based on mug state
     const themeKey = getThemeForState(mugState.liquidState, mugState.connected);
     const theme = getTerminalTheme(themeKey);
@@ -125,7 +125,7 @@ export function App() {
     // Main view
     return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Header, { mugName: mugState.mugName, connected: mugState.connected, theme: theme, ledColor: mugState.color }), !mugState.connected ? (_jsx(ConnectionStatus, { isScanning: isScanning, isConnected: mugState.connected, foundMugName: foundMugName, error: error, onRetry: startScanning, width: panelWidth, theme: theme })) : (_jsx(Box, { flexDirection: "column", children: isNarrowTerminal ? (
                 /* Narrow terminal: stack all panels vertically */
-                _jsxs(_Fragment, { children: [_jsx(TemperatureDisplay, { currentTemp: mugState.currentTemp, targetTemp: mugState.targetTemp, liquidState: mugState.liquidState, temperatureUnit: localTempUnit, width: panelWidth, theme: theme }), _jsx(Box, { marginTop: 1, children: _jsx(BatteryDisplay, { batteryLevel: mugState.batteryLevel, isCharging: mugState.isCharging, liquidState: mugState.liquidState, width: panelWidth, theme: theme }) }), _jsx(Box, { marginTop: 1, children: _jsx(TemperatureControl, { targetTemp: mugState.targetTemp, temperatureUnit: localTempUnit, onTempChange: handleTempChange, isActive: true, width: panelWidth, theme: theme }) }), _jsx(Box, { marginTop: 1, children: _jsx(Presets, { presets: presets, selectedIndex: selectedPresetIndex, temperatureUnit: localTempUnit, onSelect: handlePresetSelect, isActive: activeControl === "none", width: panelWidth, theme: theme }) })] })) : (
+                _jsxs(_Fragment, { children: [_jsx(TemperatureDisplay, { currentTemp: mugState.currentTemp, targetTemp: mugState.targetTemp, liquidState: mugState.liquidState, temperatureUnit: localTempUnit, width: panelWidth, theme: theme, tempRate: tempRate }), _jsx(Box, { marginTop: 1, children: _jsx(BatteryDisplay, { batteryLevel: mugState.batteryLevel, isCharging: mugState.isCharging, liquidState: mugState.liquidState, width: panelWidth, theme: theme, batteryRate: batteryRate }) }), _jsx(Box, { marginTop: 1, children: _jsx(TemperatureControl, { targetTemp: mugState.targetTemp, temperatureUnit: localTempUnit, onTempChange: handleTempChange, isActive: true, width: panelWidth, theme: theme }) }), _jsx(Box, { marginTop: 1, children: _jsx(Presets, { presets: presets, selectedIndex: selectedPresetIndex, temperatureUnit: localTempUnit, onSelect: handlePresetSelect, isActive: activeControl === "none", width: panelWidth, theme: theme }) })] })) : (
                 /* Wide terminal: 2x2 grid layout */
-                _jsxs(_Fragment, { children: [_jsxs(Box, { justifyContent: "center", gap: 2, children: [_jsx(TemperatureDisplay, { currentTemp: mugState.currentTemp, targetTemp: mugState.targetTemp, liquidState: mugState.liquidState, temperatureUnit: localTempUnit, width: panelWidth, height: 8, theme: theme }), _jsx(BatteryDisplay, { batteryLevel: mugState.batteryLevel, isCharging: mugState.isCharging, liquidState: mugState.liquidState, width: panelWidth, height: 8, theme: theme })] }), _jsxs(Box, { justifyContent: "center", gap: 2, marginTop: 1, children: [_jsx(TemperatureControl, { targetTemp: mugState.targetTemp, temperatureUnit: localTempUnit, onTempChange: handleTempChange, isActive: true, width: panelWidth, height: 9, theme: theme }), _jsx(Presets, { presets: presets, selectedIndex: selectedPresetIndex, temperatureUnit: localTempUnit, onSelect: handlePresetSelect, isActive: activeControl === "none", width: panelWidth, height: 9, theme: theme })] })] })) })), _jsx(HelpDisplay, { isConnected: mugState.connected, theme: theme })] }));
+                _jsxs(_Fragment, { children: [_jsxs(Box, { justifyContent: "center", gap: 2, children: [_jsx(TemperatureDisplay, { currentTemp: mugState.currentTemp, targetTemp: mugState.targetTemp, liquidState: mugState.liquidState, temperatureUnit: localTempUnit, width: panelWidth, height: 8, theme: theme, tempRate: tempRate }), _jsx(BatteryDisplay, { batteryLevel: mugState.batteryLevel, isCharging: mugState.isCharging, liquidState: mugState.liquidState, width: panelWidth, height: 8, theme: theme, batteryRate: batteryRate })] }), _jsxs(Box, { justifyContent: "center", gap: 2, marginTop: 1, children: [_jsx(TemperatureControl, { targetTemp: mugState.targetTemp, temperatureUnit: localTempUnit, onTempChange: handleTempChange, isActive: true, width: panelWidth, height: 9, theme: theme }), _jsx(Presets, { presets: presets, selectedIndex: selectedPresetIndex, temperatureUnit: localTempUnit, onSelect: handlePresetSelect, isActive: activeControl === "none", width: panelWidth, height: 9, theme: theme })] })] })) })), _jsx(HelpDisplay, { isConnected: mugState.connected, theme: theme })] }));
 }

package/dist/components/BatteryDisplay.d.ts

@@ -9,6 +9,7 @@ interface BatteryDisplayProps {
     width?: number;
     height?: number;
     theme: TerminalTheme;
+    batteryRate?: number;
 }
-export declare function BatteryDisplay({ batteryLevel, isCharging, liquidState, width, height, theme, }: BatteryDisplayProps): React.ReactElement;
+export declare function BatteryDisplay({ batteryLevel, isCharging, liquidState, width, height, theme, batteryRate, }: BatteryDisplayProps): React.ReactElement;
 export {};

package/dist/components/BatteryDisplay.js

@@ -2,8 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { Box, Text } from "ink";
 import { formatBatteryLevel, estimateBatteryLife, formatDuration, } from "../lib/utils.js";
 import { Panel } from "./Panel.js";
-export function BatteryDisplay({ batteryLevel, isCharging, liquidState, width, height, theme, }) {
-    const batteryTimeEstimate = estimateBatteryLife(batteryLevel, isCharging, liquidState);
+export function BatteryDisplay({ batteryLevel, isCharging, liquidState, width, height, theme, batteryRate, }) {
+    const batteryTimeEstimate = estimateBatteryLife(batteryLevel, isCharging, liquidState, batteryRate);
     return (_jsxs(Panel, { title: "Battery", titleColor: theme.primary, borderColor: theme.border, width: width, height: height, children: [_jsxs(Box, { justifyContent: "center", marginY: 1, children: [_jsx(Text, { color: theme.primary, bold: true, children: formatBatteryLevel(batteryLevel) }), isCharging && (_jsxs(Text, { color: theme.primary, bold: true, children: [" ", "~"] }))] }), _jsx(Box, { justifyContent: "center", children: _jsx(BatteryBar, { level: batteryLevel, isCharging: isCharging, theme: theme }) }), batteryTimeEstimate !== null && (_jsx(Box, { justifyContent: "center", marginTop: 1, children: _jsx(Text, { color: theme.dimText, children: isCharging ? (_jsxs(_Fragment, { children: ["[~] ", _jsx(Text, { color: theme.primary, children: formatDuration(batteryTimeEstimate) }), _jsx(Text, { color: theme.dimText, children: " to full" })] })) : (_jsxs(_Fragment, { children: ["[~] ", _jsx(Text, { color: theme.primary, children: formatDuration(batteryTimeEstimate) }), _jsx(Text, { color: theme.dimText, children: " remaining" })] })) }) }))] }));
 }
 function BatteryBar({ level, isCharging, theme, }) {

package/dist/components/SettingsView.js

@@ -47,9 +47,11 @@ export function SettingsView({ presets, temperatureUnit, ledColor, onTemperature
         else if (selectedIndex === 1) {
             // LED Color
             if (key.leftArrow || input === "h" || key.rightArrow || input === "l") {
-                const currentColorIndex = PRESET_COLORS.findIndex((p) => p.color.r === ledColor.r &&
-                    p.color.g === ledColor.g &&
-                    p.color.b === ledColor.b);
+                const currentColorIndex = ledColor
+                    ? PRESET_COLORS.findIndex((p) => p.color.r === ledColor.r &&
+                        p.color.g === ledColor.g &&
+                        p.color.b === ledColor.b)
+                    : -1;
                 let nextIndex = currentColorIndex;
                 if (key.leftArrow || input === "h") {
                     nextIndex = currentColorIndex - 1;
@@ -83,15 +85,21 @@ export function SettingsView({ presets, temperatureUnit, ledColor, onTemperature
             }
         }
     }, { isActive });
-    const currentColorPreset = PRESET_COLORS.find((p) => p.color.r === ledColor.r &&
-        p.color.g === ledColor.g &&
-        p.color.b === ledColor.b);
+    const currentColorPreset = ledColor
+        ? PRESET_COLORS.find((p) => p.color.r === ledColor.r &&
+            p.color.g === ledColor.g &&
+            p.color.b === ledColor.b)
+        : undefined;
     const colorDisplayValue = currentColorPreset
         ? currentColorPreset.name
-        : rgbToHex(ledColor.r, ledColor.g, ledColor.b);
+        : ledColor
+            ? rgbToHex(ledColor.r, ledColor.g, ledColor.b)
+            : "Unknown";
     return (_jsx(Box, { justifyContent: "center", marginY: 1, children: _jsxs(Panel, { title: "[=] Settings", titleColor: theme.primary, borderColor: theme.border, width: panelWidth, height: 16, children: [_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(SettingRow, { label: "Temperature Unit", value: temperatureUnit === TemperatureUnit.Celsius
                                 ? "Celsius (°C)"
-                                : "Fahrenheit (°F)", isSelected: selectedIndex === 0, hint: "Enter/Space to toggle", theme: theme }), _jsx(SettingRow, { label: "LED Color", value: colorDisplayValue, valueColor: rgbToHex(ledColor.r, ledColor.g, ledColor.b), isSelected: selectedIndex === 1, hint: "Left/Right to change", theme: theme }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: theme.primary, bold: true, children: "Presets:" }), presets.map((preset, index) => (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: theme.dimText, children: [_jsxs(Text, { color: selectedIndex === index + 2
+                                : "Fahrenheit (°F)", isSelected: selectedIndex === 0, hint: "Enter/Space to toggle", theme: theme }), _jsx(SettingRow, { label: "LED Color", value: colorDisplayValue, valueColor: ledColor
+                                ? rgbToHex(ledColor.r, ledColor.g, ledColor.b)
+                                : undefined, isSelected: selectedIndex === 1, hint: "Left/Right to change", theme: theme }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { color: theme.primary, bold: true, children: "Presets:" }), presets.map((preset, index) => (_jsx(Box, { marginLeft: 2, children: _jsxs(Text, { color: theme.dimText, children: [_jsxs(Text, { color: selectedIndex === index + 2
                                                     ? theme.primary
                                                     : theme.dimText, children: [selectedIndex === index + 2 ? "> " : "  ", index + 1, "."] }), " ", preset.name, ":", " ", _jsx(Text, { color: selectedIndex === index + 2 ? theme.text : theme.dimText, bold: selectedIndex === index + 2, children: formatTemperature(preset.temperature, temperatureUnit) }), selectedIndex === index + 2 && (_jsx(Text, { dimColor: true, children: " (Left/Right to edit)" }))] }) }, preset.id)))] })] }), _jsx(Box, { marginTop: 1, justifyContent: "center", children: _jsxs(Text, { color: theme.dimText, children: [_jsx(Text, { color: theme.primary, bold: true, children: "[Esc]" }), " ", "or", " ", _jsx(Text, { color: theme.primary, bold: true, children: "[q]" }), " ", "to close"] }) }), _jsx(Box, { justifyContent: "center", children: _jsx(Text, { color: theme.dimText, dimColor: true, children: "(Use Arrow Keys to navigate and edit)" }) })] }) }));
 }

package/dist/components/TemperatureDisplay.d.ts

@@ -10,6 +10,7 @@ interface TemperatureDisplayProps {
     width?: number;
     height?: number;
     theme: TerminalTheme;
+    tempRate?: number;
 }
-export declare function TemperatureDisplay({ currentTemp, targetTemp, liquidState, temperatureUnit, width, height, theme, }: TemperatureDisplayProps): React.ReactElement;
+export declare function TemperatureDisplay({ currentTemp, targetTemp, liquidState, temperatureUnit, width, height, theme, tempRate, }: TemperatureDisplayProps): React.ReactElement;
 export {};

package/dist/components/TemperatureDisplay.js

@@ -3,10 +3,10 @@ import { Box, Text } from "ink";
 import { LiquidState } from "../lib/types.js";
 import { formatTemperature, getLiquidStateText, estimateTimeToTargetTemp, formatDuration, } from "../lib/utils.js";
 import { Panel } from "./Panel.js";
-export function TemperatureDisplay({ currentTemp, targetTemp, liquidState, temperatureUnit, width, height, theme, }) {
+export function TemperatureDisplay({ currentTemp, targetTemp, liquidState, temperatureUnit, width, height, theme, tempRate, }) {
     const isEmpty = liquidState === LiquidState.Empty;
     const isAtTarget = Math.abs(currentTemp - targetTemp) < 0.5 && !isEmpty;
-    const timeToTarget = estimateTimeToTargetTemp(currentTemp, targetTemp, liquidState);
+    const timeToTarget = estimateTimeToTargetTemp(currentTemp, targetTemp, liquidState, tempRate);
     return (_jsxs(Panel, { title: "Temperature", titleColor: theme.primary, borderColor: theme.border, width: width, height: height, children: [_jsxs(Box, { marginY: 1, justifyContent: "center", width: "100%", children: [_jsxs(Box, { flexDirection: "column", alignItems: "center", minWidth: 16, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { color: theme.dimText, children: "Current" }) }), _jsx(Box, { children: _jsx(Text, { bold: true, color: theme.primary, children: isEmpty
                                         ? "---"
                                         : formatTemperature(currentTemp, temperatureUnit) }) })] }), _jsx(Box, { marginX: 2, justifyContent: "center", alignItems: "center", children: _jsx(Text, { color: theme.primary, bold: true, children: "-->" }) }), _jsxs(Box, { flexDirection: "column", alignItems: "center", minWidth: 16, flexShrink: 0, children: [_jsx(Box, { children: _jsx(Text, { color: theme.dimText, children: "Target" }) }), _jsx(Box, { children: _jsx(Text, { bold: true, color: theme.text, children: formatTemperature(targetTemp, temperatureUnit) }) })] })] }), _jsx(Box, { justifyContent: "center", children: _jsxs(Text, { children: [_jsx(Text, { color: theme.primary, bold: true, children: getLiquidStateText(liquidState) }), isAtTarget && (_jsxs(Text, { color: theme.primary, bold: true, children: [" ", "*"] })), timeToTarget !== null && timeToTarget > 0 && (_jsxs(Text, { color: theme.dimText, children: ["  •  [~] ", _jsx(Text, { color: theme.primary, children: formatDuration(timeToTarget) }), _jsx(Text, { color: theme.dimText, children: " to target" })] }))] }) })] }));

package/dist/hooks/useMug.d.ts

@@ -9,6 +9,8 @@ interface UseMugReturn {
     setTemperatureUnit: (unit: TemperatureUnit) => Promise<void>;
     setLedColor: (color: RGBColor) => Promise<void>;
     disconnect: () => Promise<void>;
+    tempRate: number;
+    batteryRate: number;
 }
 export declare function useMug(): UseMugReturn;
 export {};

package/dist/hooks/useMug.js

@@ -1,6 +1,7 @@
 import { useState, useEffect, useCallback } from "react";
 import { getBluetoothManager } from "../lib/bluetooth.js";
 import { LiquidState, TemperatureUnit, } from "../lib/types.js";
+import { calculateRate } from "../lib/utils.js";
 const initialState = {
     connected: false,
     batteryLevel: 0,
@@ -17,6 +18,48 @@ export function useMug() {
     const [isScanning, setIsScanning] = useState(true);
     const [error, setError] = useState(null);
     const [foundMugName, setFoundMugName] = useState(null);
+    const [tempHistory, setTempHistory] = useState([]);
+    const [batteryHistory, setBatteryHistory] = useState([]);
+    // Update temp history
+    useEffect(() => {
+        if (state.connected && state.liquidState !== LiquidState.Empty) {
+            const now = Date.now();
+            setTempHistory((prev) => {
+                const last = prev[prev.length - 1];
+                if (last &&
+                    last.value === state.currentTemp &&
+                    now - last.time < 10000) {
+                    return prev;
+                }
+                const next = [...prev, { value: state.currentTemp, time: now }];
+                return next.filter((item) => now - item.time < 5 * 60 * 1000);
+            });
+        }
+        else if (!state.connected || state.liquidState === LiquidState.Empty) {
+            if (tempHistory.length > 0)
+                setTempHistory([]);
+        }
+    }, [state.currentTemp, state.connected, state.liquidState]);
+    // Update battery history
+    useEffect(() => {
+        if (state.connected) {
+            const now = Date.now();
+            setBatteryHistory((prev) => {
+                const last = prev[prev.length - 1];
+                if (last &&
+                    last.value === state.batteryLevel &&
+                    now - last.time < 30000) {
+                    return prev;
+                }
+                const next = [...prev, { value: state.batteryLevel, time: now }];
+                return next.filter((item) => now - item.time < 10 * 60 * 1000);
+            });
+        }
+        else if (!state.connected) {
+            if (batteryHistory.length > 0)
+                setBatteryHistory([]);
+        }
+    }, [state.batteryLevel, state.connected]);
     useEffect(() => {
         const manager = getBluetoothManager();
         const handleStateChange = (newState) => {
@@ -98,6 +141,8 @@ export function useMug() {
             setError(err instanceof Error ? err.message : "Failed to disconnect");
         }
     }, []);
+    const tempRate = calculateRate(tempHistory);
+    const batteryRate = calculateRate(batteryHistory, 5 * 60 * 1000);
     return {
         state,
         isScanning,
@@ -108,5 +153,7 @@ export function useMug() {
         setTemperatureUnit,
         setLedColor,
         disconnect,
+        tempRate,
+        batteryRate,
     };
 }

package/dist/lib/utils.d.ts

@@ -7,8 +7,12 @@ export declare function getBatteryIcon(level: number, isCharging: boolean): stri
 export declare function getLiquidStateText(state: LiquidState): string;
 export declare function clampTemperature(temp: number): number;
 export declare function formatDuration(minutes: number): string;
-export declare function estimateTimeToTargetTemp(currentTemp: number, targetTemp: number, liquidState: LiquidState): number | null;
-export declare function estimateBatteryLife(batteryLevel: number, isCharging: boolean, liquidState: LiquidState): number | null;
+export declare function estimateTimeToTargetTemp(currentTemp: number, targetTemp: number, liquidState: LiquidState, dynamicRate?: number): number | null;
+export declare function estimateBatteryLife(batteryLevel: number, isCharging: boolean, liquidState: LiquidState, dynamicRate?: number): number | null;
+export declare function calculateRate(history: {
+    value: number;
+    time: number;
+}[], windowMs?: number): number;
 export declare function getTemperatureColor(currentTemp: number, targetTemp: number): string;
 export declare function interpolateColor(value: number, minColor: [number, number, number], maxColor: [number, number, number]): [number, number, number];
 export declare function rgbToHex(r: number, g: number, b: number): string;

package/dist/lib/utils.js

@@ -62,7 +62,7 @@ export function formatDuration(minutes) {
     }
     return `${hours}h ${mins}m`;
 }
-export function estimateTimeToTargetTemp(currentTemp, targetTemp, liquidState) {
+export function estimateTimeToTargetTemp(currentTemp, targetTemp, liquidState, dynamicRate) {
     if (liquidState === LiquidState.Empty) {
         return null;
     }
@@ -70,15 +70,28 @@ export function estimateTimeToTargetTemp(currentTemp, targetTemp, liquidState) {
     if (tempDiff < 0.5) {
         return 0; // Already at target
     }
-    // Estimate based on typical Ember mug heating/cooling rates
-    // Heating: approximately 1°C per minute
-    // Cooling: approximately 0.5°C per minute (slower due to insulation)
+    // Use dynamic rate if provided and valid (greater than a small threshold)
+    if (dynamicRate && Math.abs(dynamicRate) > 0.05) {
+        // Ensure the rate is in the right direction
+        const isHeating = currentTemp < targetTemp;
+        const isRateHeating = dynamicRate > 0;
+        if (isHeating === isRateHeating) {
+            return tempDiff / Math.abs(dynamicRate);
+        }
+    }
+    // Fallback to typical Ember mug heating/cooling rates
     const isHeating = currentTemp < targetTemp;
     const ratePerMinute = isHeating ? 1.0 : 0.5;
     return tempDiff / ratePerMinute;
 }
-export function estimateBatteryLife(batteryLevel, isCharging, liquidState) {
+export function estimateBatteryLife(batteryLevel, isCharging, liquidState, dynamicRate) {
     if (isCharging) {
+        if (dynamicRate && dynamicRate > 0.1) {
+            const remaining = 100 - batteryLevel;
+            if (remaining <= 0)
+                return 0;
+            return remaining / dynamicRate;
+        }
         // Estimate time to full charge
         const remaining = 100 - batteryLevel;
         if (remaining <= 0)
@@ -88,6 +101,10 @@ export function estimateBatteryLife(batteryLevel, isCharging, liquidState) {
     if (batteryLevel <= 0) {
         return 0;
     }
+    // Use dynamic rate if provided and discharging
+    if (dynamicRate && dynamicRate < -0.01) {
+        return batteryLevel / Math.abs(dynamicRate);
+    }
     // Determine drain rate based on mug state
     let drainRate;
     switch (liquidState) {
@@ -103,6 +120,28 @@ export function estimateBatteryLife(batteryLevel, isCharging, liquidState) {
     }
     return batteryLevel / drainRate;
 }
+export function calculateRate(history, windowMs = 2 * 60 * 1000) {
+    if (history.length < 2)
+        return 0;
+    const now = Date.now();
+    const windowStart = now - windowMs;
+    const windowHistory = history.filter((item) => item.time >= windowStart);
+    if (windowHistory.length < 2) {
+        // If not enough data in the current window, use the last two points overall if they are recent enough
+        const last = history[history.length - 1];
+        const secondLast = history[history.length - 2];
+        if (now - last.time > windowMs)
+            return 0;
+        const valDiff = last.value - secondLast.value;
+        const timeDiffMin = (last.time - secondLast.time) / (1000 * 60);
+        return timeDiffMin > 0 ? valDiff / timeDiffMin : 0;
+    }
+    const first = windowHistory[0];
+    const last = windowHistory[windowHistory.length - 1];
+    const valDiff = last.value - first.value;
+    const timeDiffMin = (last.time - first.time) / (1000 * 60);
+    return timeDiffMin > 0 ? valDiff / timeDiffMin : 0;
+}
 export function getTemperatureColor(currentTemp, targetTemp) {
     const diff = currentTemp - targetTemp;
     if (Math.abs(diff) < 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-mug",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "A CLI app for controlling Ember mugs via Bluetooth",
   "type": "module",
   "main": "dist/index.js",
@@ -15,6 +15,7 @@
   ],
   "scripts": {
     "build": "tsc",
+    "postbuild": "chmod +x dist/cli.js",
     "clean": "rm -rf dist",
     "prebuild": "npm run clean",
     "start": "node dist/cli.js",