ember-mug 0.1.3 → 0.1.5

package/dist/lib/utils.js

@@ -1,4 +1,4 @@
-import { TemperatureUnit, LiquidState, MIN_TEMP_CELSIUS, MAX_TEMP_CELSIUS, BATTERY_DRAIN_RATE_HEATING, BATTERY_DRAIN_RATE_MAINTAINING, BATTERY_CHARGE_RATE, } from './types.js';
+import { TemperatureUnit, LiquidState, MIN_TEMP_CELSIUS, MAX_TEMP_CELSIUS, BATTERY_DRAIN_RATE_HEATING, BATTERY_DRAIN_RATE_MAINTAINING, BATTERY_CHARGE_RATE, } from "./types.js";
 export function formatTemperature(temp, unit) {
     if (unit === TemperatureUnit.Celsius) {
         return `${temp.toFixed(1)}°C`;
@@ -13,52 +13,36 @@ export function fahrenheitToCelsius(fahrenheit) {
     return ((fahrenheit - 32) * 5) / 9;
 }
 export function formatBatteryLevel(level) {
-    return `${level}%`;
+    return `${Math.round(level)}%`;
 }
 export function getBatteryIcon(level, isCharging) {
     if (isCharging) {
-        return '⚡';
+        return "~";
     }
     if (level >= 75)
-        return '████';
+        return "||||";
     if (level >= 50)
-        return '███░';
+        return "|||.";
     if (level >= 25)
-        return '██░░';
+        return "||..";
     if (level >= 10)
-        return '█░░░';
-    return '░░░░';
+        return "|...";
+    return "....";
 }
 export function getLiquidStateText(state) {
     switch (state) {
         case LiquidState.Empty:
-            return 'Empty';
+            return "Empty";
         case LiquidState.Filling:
-            return 'Filling';
+            return "Filling";
         case LiquidState.Cooling:
-            return 'Cooling';
+            return "Cooling";
         case LiquidState.Heating:
-            return 'Heating';
+            return "Heating";
         case LiquidState.StableTemperature:
-            return 'Perfect';
+            return "Perfect Temperature";
         default:
-            return 'Unknown';
-    }
-}
-export function getLiquidStateIcon(state) {
-    switch (state) {
-        case LiquidState.Empty:
-            return '○';
-        case LiquidState.Filling:
-            return '◐';
-        case LiquidState.Cooling:
-            return '❄';
-        case LiquidState.Heating:
-            return '🔥';
-        case LiquidState.StableTemperature:
-            return '✓';
-        default:
-            return '?';
+            return "Unknown";
     }
 }
 export function clampTemperature(temp) {
@@ -66,7 +50,7 @@ export function clampTemperature(temp) {
 }
 export function formatDuration(minutes) {
     if (minutes < 1) {
-        return '< 1 min';
+        return "< 1 min";
     }
     if (minutes < 60) {
         return `${Math.round(minutes)} min`;
@@ -78,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;
     }
@@ -86,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)
@@ -104,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) {
@@ -119,15 +120,37 @@ 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) {
-        return 'green'; // At target
+        return "green"; // At target
     }
     if (diff > 0) {
-        return 'red'; // Too hot
+        return "red"; // Too hot
     }
-    return 'blue'; // Too cold
+    return "blue"; // Too cold
 }
 export function interpolateColor(value, minColor, maxColor) {
     const clampedValue = Math.max(0, Math.min(1, value));
@@ -138,7 +161,7 @@ export function interpolateColor(value, minColor, maxColor) {
     ];
 }
 export function rgbToHex(r, g, b) {
-    return `#${[r, g, b].map((c) => c.toString(16).padStart(2, '0')).join('')}`;
+    return `#${[r, g, b].map((c) => c.toString(16).padStart(2, "0")).join("")}`;
 }
 export function hexToRgb(hex) {
     const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-mug",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "A CLI app for controlling Ember mugs via Bluetooth",
   "type": "module",
   "main": "dist/index.js",
@@ -15,10 +15,12 @@
   ],
   "scripts": {
     "build": "tsc",
+    "postbuild": "chmod +x dist/cli.js",
     "clean": "rm -rf dist",
     "prebuild": "npm run clean",
     "start": "node dist/cli.js",
     "dev": "tsx src/cli.tsx",
+    "dev-mocked": "EMBER_MOCK=true tsx src/cli.tsx",
     "prepublishOnly": "npm run build",
     "version": "npm run build"
   },

package/dist/components/ColorControl.d.ts

@@ -1,9 +0,0 @@
-import React from 'react';
-import { RGBColor } from '../lib/types.js';
-interface ColorControlProps {
-    color: RGBColor;
-    onColorChange: (color: RGBColor) => void;
-    isActive: boolean;
-}
-export declare function ColorControl({ color, onColorChange, isActive, }: ColorControlProps): React.ReactElement;
-export {};

package/dist/components/ColorControl.js

@@ -1,71 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from 'react';
-import { Box, Text, useInput } from 'ink';
-import { rgbToHex } from '../lib/utils.js';
-const PRESET_COLORS = [
-    { name: 'Orange', color: { r: 255, g: 147, b: 41, a: 255 } },
-    { name: 'Red', color: { r: 255, g: 0, b: 0, a: 255 } },
-    { name: 'Green', color: { r: 0, g: 255, b: 0, a: 255 } },
-    { name: 'Blue', color: { r: 0, g: 128, b: 255, a: 255 } },
-    { name: 'Purple', color: { r: 128, g: 0, b: 255, a: 255 } },
-    { name: 'Pink', color: { r: 255, g: 105, b: 180, a: 255 } },
-    { name: 'White', color: { r: 255, g: 255, b: 255, a: 255 } },
-    { name: 'Teal', color: { r: 0, g: 255, b: 200, a: 255 } },
-];
-export function ColorControl({ color, onColorChange, isActive, }) {
-    const [selectedChannel, setSelectedChannel] = useState('r');
-    const [customMode, setCustomMode] = useState(false);
-    useInput((input, key) => {
-        if (!isActive)
-            return;
-        // Number keys for preset colors
-        const numKey = parseInt(input, 10);
-        if (numKey >= 1 && numKey <= PRESET_COLORS.length) {
-            onColorChange(PRESET_COLORS[numKey - 1].color);
-            setCustomMode(false);
-            return;
-        }
-        // Toggle custom mode
-        if (input === 'c') {
-            setCustomMode(!customMode);
-            return;
-        }
-        if (customMode) {
-            // Switch channels
-            if (input === 'r') {
-                setSelectedChannel('r');
-            }
-            else if (input === 'g') {
-                setSelectedChannel('g');
-            }
-            else if (input === 'b') {
-                setSelectedChannel('b');
-            }
-            // Adjust selected channel
-            let delta = 0;
-            if (key.leftArrow || input === 'h') {
-                delta = -10;
-            }
-            else if (key.rightArrow || input === 'l') {
-                delta = 10;
-            }
-            else if (key.upArrow || input === 'k') {
-                delta = 25;
-            }
-            else if (key.downArrow || input === 'j') {
-                delta = -25;
-            }
-            if (delta !== 0) {
-                const newColor = { ...color };
-                newColor[selectedChannel] = Math.max(0, Math.min(255, newColor[selectedChannel] + delta));
-                onColorChange(newColor);
-            }
-        }
-    }, { isActive });
-    return (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Box, { justifyContent: "center", children: _jsx(Text, { bold: true, children: "LED Color" }) }), _jsx(Box, { justifyContent: "center", marginY: 1, children: _jsxs(Text, { children: ["Current: ", _jsx(Text, { color: rgbToHex(color.r, color.g, color.b), children: "\u25CF" }), ' ', _jsxs(Text, { dimColor: true, children: ["(", rgbToHex(color.r, color.g, color.b), ")"] })] }) }), _jsx(Box, { justifyContent: "center", gap: 1, marginY: 1, children: PRESET_COLORS.map((preset, index) => (_jsxs(Box, { children: [_jsx(Text, { color: rgbToHex(preset.color.r, preset.color.g, preset.color.b), children: "\u25CF" }), _jsx(Text, { dimColor: true, children: index + 1 })] }, preset.name))) }), customMode && (_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsx(Box, { justifyContent: "center", children: _jsx(Text, { dimColor: true, children: "Custom Color Mode" }) }), _jsxs(Box, { justifyContent: "center", gap: 2, children: [_jsx(ChannelSlider, { label: "R", value: color.r, isSelected: selectedChannel === 'r', color: "red" }), _jsx(ChannelSlider, { label: "G", value: color.g, isSelected: selectedChannel === 'g', color: "green" }), _jsx(ChannelSlider, { label: "B", value: color.b, isSelected: selectedChannel === 'b', color: "blue" })] })] })), _jsx(Box, { justifyContent: "center", marginTop: 1, children: _jsxs(Text, { dimColor: true, children: ["Press ", _jsxs(Text, { color: "cyan", children: ["1-", PRESET_COLORS.length] }), " for presets |", ' ', _jsx(Text, { color: "cyan", children: "c" }), " for custom mode"] }) })] }));
-}
-function ChannelSlider({ label, value, isSelected, color, }) {
-    const width = 10;
-    const filled = Math.round((value / 255) * width);
-    return (_jsx(Box, { children: _jsxs(Text, { color: isSelected ? color : 'gray', children: [label, ": ", '█'.repeat(filled), '░'.repeat(width - filled), " ", value.toString().padStart(3)] }) }));
-}