amaran-light-cli 1.8.1 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +36 -16
- package/dist/__tests__/lightControl.test.js +0 -31
- package/dist/__tests__/lightControl.test.js.map +1 -1
- package/dist/__tests__/simulateSchedule.test.js +4 -2
- package/dist/__tests__/simulateSchedule.test.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +7 -2
- package/dist/cli.js.map +1 -1
- package/dist/commands/daylightSimulation/autoCct.d.ts.map +1 -1
- package/dist/commands/daylightSimulation/autoCct.js +49 -17
- package/dist/commands/daylightSimulation/autoCct.js.map +1 -1
- package/dist/commands/daylightSimulation/graphSchedule.js +1 -1
- package/dist/commands/daylightSimulation/graphSchedule.js.map +1 -1
- package/dist/commands/daylightSimulation/printSchedule.js +4 -4
- package/dist/commands/daylightSimulation/printSchedule.js.map +1 -1
- package/dist/commands/daylightSimulation/schedule.d.ts +5 -0
- package/dist/commands/daylightSimulation/schedule.d.ts.map +1 -0
- package/dist/commands/daylightSimulation/schedule.js +11 -0
- package/dist/commands/daylightSimulation/schedule.js.map +1 -0
- package/dist/commands/daylightSimulation/simulateSchedule.d.ts.map +1 -1
- package/dist/commands/daylightSimulation/simulateSchedule.js +6 -2
- package/dist/commands/daylightSimulation/simulateSchedule.js.map +1 -1
- package/dist/commands/daylightSimulation/weather.d.ts +5 -0
- package/dist/commands/daylightSimulation/weather.d.ts.map +1 -0
- package/dist/commands/daylightSimulation/weather.js +96 -0
- package/dist/commands/daylightSimulation/weather.js.map +1 -0
- package/dist/commands/deviceControl/cct.d.ts.map +1 -1
- package/dist/commands/deviceControl/cct.js +91 -3
- package/dist/commands/deviceControl/cct.js.map +1 -1
- package/dist/commands/deviceControl/color.d.ts.map +1 -1
- package/dist/commands/deviceControl/color.js +171 -3
- package/dist/commands/deviceControl/color.js.map +1 -1
- package/dist/commands/deviceControl/config.d.ts.map +1 -1
- package/dist/commands/deviceControl/config.js +36 -3
- package/dist/commands/deviceControl/config.js.map +1 -1
- package/dist/commands/deviceControl/hsi.d.ts.map +1 -1
- package/dist/commands/deviceControl/hsi.js +132 -2
- package/dist/commands/deviceControl/hsi.js.map +1 -1
- package/dist/commands/deviceControl/info.d.ts.map +1 -1
- package/dist/commands/deviceControl/info.js +115 -29
- package/dist/commands/deviceControl/info.js.map +1 -1
- package/dist/commands/deviceControl/intensity.d.ts.map +1 -1
- package/dist/commands/deviceControl/intensity.js +86 -2
- package/dist/commands/deviceControl/intensity.js.map +1 -1
- package/dist/commands/deviceControl/power.d.ts.map +1 -1
- package/dist/commands/deviceControl/power.js +120 -29
- package/dist/commands/deviceControl/power.js.map +1 -1
- package/dist/commands/deviceControl/status.d.ts.map +1 -1
- package/dist/commands/deviceControl/status.js +184 -21
- package/dist/commands/deviceControl/status.js.map +1 -1
- package/dist/commands.d.ts.map +1 -1
- package/dist/commands.js +4 -8
- package/dist/commands.js.map +1 -1
- package/dist/daylightSimulation/cctUtil.d.ts.map +1 -1
- package/dist/daylightSimulation/cctUtil.js +2 -1
- package/dist/daylightSimulation/cctUtil.js.map +1 -1
- package/dist/daylightSimulation/privacyUtil.d.ts +13 -0
- package/dist/daylightSimulation/privacyUtil.d.ts.map +1 -0
- package/dist/daylightSimulation/privacyUtil.js +30 -0
- package/dist/daylightSimulation/privacyUtil.js.map +1 -0
- package/dist/daylightSimulation/textSchedule.d.ts +1 -1
- package/dist/daylightSimulation/textSchedule.d.ts.map +1 -1
- package/dist/daylightSimulation/textSchedule.js +3 -18
- package/dist/daylightSimulation/textSchedule.js.map +1 -1
- package/dist/daylightSimulation/weatherUtil.d.ts +35 -0
- package/dist/daylightSimulation/weatherUtil.d.ts.map +1 -0
- package/dist/daylightSimulation/weatherUtil.js +163 -0
- package/dist/daylightSimulation/weatherUtil.js.map +1 -0
- package/dist/deviceControl/lightControl.d.ts +2 -5
- package/dist/deviceControl/lightControl.d.ts.map +1 -1
- package/dist/deviceControl/lightControl.js +38 -23
- package/dist/deviceControl/lightControl.js.map +1 -1
- package/dist/deviceControl/types.d.ts +33 -1
- package/dist/deviceControl/types.d.ts.map +1 -1
- package/dist/test/MockLightServer.d.ts.map +1 -1
- package/dist/test/MockLightServer.js +6 -5
- package/dist/test/MockLightServer.js.map +1 -1
- package/package.json +1 -1
- package/dist/commands/deviceControl/firmware.d.ts +0 -5
- package/dist/commands/deviceControl/firmware.d.ts.map +0 -1
- package/dist/commands/deviceControl/firmware.js +0 -68
- package/dist/commands/deviceControl/firmware.js.map +0 -1
|
@@ -6,7 +6,7 @@ import { textSchedule } from '../../daylightSimulation/textSchedule.js';
|
|
|
6
6
|
export function registerPrintSchedule(program, deps) {
|
|
7
7
|
const { asyncCommand } = deps;
|
|
8
8
|
program
|
|
9
|
-
.command('print
|
|
9
|
+
.command('print')
|
|
10
10
|
.description('Preview auto-cct schedule from sunrise to sunset')
|
|
11
11
|
.option('-y, --lat <latitude>', 'Manual latitude (-90 to 90)')
|
|
12
12
|
.option('-x, --lon <longitude>', 'Manual longitude (-180 to 180)')
|
|
@@ -17,7 +17,7 @@ export function registerPrintSchedule(program, deps) {
|
|
|
17
17
|
.option('-o, --output <file>', 'Output result to a file')
|
|
18
18
|
.option('--cloud-cover <value>', 'Cloud cover (0-1)')
|
|
19
19
|
.option('--precipitation <type>', 'Precipitation type')
|
|
20
|
-
.option('
|
|
20
|
+
.option('--privacy-off', 'Show full IP address and precise coordinates', false)
|
|
21
21
|
.action(asyncCommand(handlePrintSchedule(deps)));
|
|
22
22
|
}
|
|
23
23
|
function handlePrintSchedule(deps) {
|
|
@@ -42,14 +42,14 @@ function handlePrintSchedule(deps) {
|
|
|
42
42
|
}
|
|
43
43
|
const output = textSchedule(schedule, {
|
|
44
44
|
csv: options.csv,
|
|
45
|
-
|
|
45
|
+
privacyOff: options.privacyOff,
|
|
46
46
|
interval: options.interval,
|
|
47
47
|
});
|
|
48
48
|
if (options.output) {
|
|
49
49
|
try {
|
|
50
50
|
const cleanOutput = textSchedule(schedule, {
|
|
51
51
|
csv: options.csv,
|
|
52
|
-
|
|
52
|
+
privacyOff: options.privacyOff,
|
|
53
53
|
interval: options.interval,
|
|
54
54
|
stripAnsi: true,
|
|
55
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printSchedule.js","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/printSchedule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAcxE,MAAM,UAAU,qBAAqB,CAAC,OAAgB,EAAE,IAAiB;IACvE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAE9B,OAAO;SACJ,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"printSchedule.js","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/printSchedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/schedule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAKhE,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,QAMnE;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import registerGraphSchedule from './graphSchedule.js';
|
|
2
|
+
import registerPrintSchedule from './printSchedule.js';
|
|
3
|
+
import registerSimulateSchedule from './simulateSchedule.js';
|
|
4
|
+
export function registerSchedule(program, deps) {
|
|
5
|
+
const schedule = program.command('schedule').description('Commands for viewing and simulating light schedules');
|
|
6
|
+
registerPrintSchedule(schedule, deps);
|
|
7
|
+
registerGraphSchedule(schedule, deps);
|
|
8
|
+
registerSimulateSchedule(schedule, deps);
|
|
9
|
+
}
|
|
10
|
+
export default registerSchedule;
|
|
11
|
+
//# sourceMappingURL=schedule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schedule.js","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/schedule.ts"],"names":[],"mappings":"AAEA,OAAO,qBAAqB,MAAM,oBAAoB,CAAC;AACvD,OAAO,qBAAqB,MAAM,oBAAoB,CAAC;AACvD,OAAO,wBAAwB,MAAM,uBAAuB,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,OAAgB,EAAE,IAAiB;IAClE,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,qDAAqD,CAAC,CAAC;IAEhH,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtC,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACtC,wBAAwB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC3C,CAAC;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulateSchedule.d.ts","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/simulateSchedule.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,mCAAmC,CAAC;AAErF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"simulateSchedule.d.ts","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/simulateSchedule.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,mCAAmC,CAAC;AAErF,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,QAkB3E;AAgID,eAAe,wBAAwB,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { ScheduleMaker } from '../../daylightSimulation/scheduleMaker.js';
|
|
|
4
4
|
export function registerSimulateSchedule(program, deps) {
|
|
5
5
|
const { asyncCommand } = deps;
|
|
6
6
|
program
|
|
7
|
-
.command('simulate
|
|
7
|
+
.command('simulate')
|
|
8
8
|
.description('Simulate a CCT schedule curve in real-time on a specific device')
|
|
9
9
|
.argument('<device>', 'Device name, ID, or node_id to control')
|
|
10
10
|
.option('-u, --url <url>', 'WebSocket URL')
|
|
@@ -16,12 +16,14 @@ export function registerSimulateSchedule(program, deps) {
|
|
|
16
16
|
.option('--duration <seconds>', 'Simulation duration to compress full day (default: 10 seconds)', '10')
|
|
17
17
|
.option('--cloud-cover <value>', 'Cloud cover (0-1)')
|
|
18
18
|
.option('--precipitation <type>', 'Precipitation type')
|
|
19
|
+
.option('--privacy-off', 'Show full IP address and precise coordinates', false)
|
|
19
20
|
.action(asyncCommand(handleSimulateSchedule(deps)));
|
|
20
21
|
}
|
|
21
22
|
function handleSimulateSchedule(deps) {
|
|
22
23
|
const { createController, findDevice, loadConfig } = deps;
|
|
23
24
|
return async (deviceQuery, options) => {
|
|
24
25
|
const { DEVICE_DEFAULTS, ERROR_MESSAGES } = await import('../../deviceControl/constants.js');
|
|
26
|
+
const { formatLocation } = await import('../../daylightSimulation/privacyUtil.js');
|
|
25
27
|
// 1. Make the schedule
|
|
26
28
|
const _maker = new ScheduleMaker(deps);
|
|
27
29
|
// We want a high-resolution schedule for smooth simulation
|
|
@@ -77,11 +79,13 @@ function handleSimulateSchedule(deps) {
|
|
|
77
79
|
console.log(chalk.blue(' CCT Schedule Simulation'));
|
|
78
80
|
console.log(chalk.blue('═══════════════════════════════════════════════════════════\n'));
|
|
79
81
|
console.log(chalk.cyan(`Device: ${displayName} (${nodeId})`));
|
|
80
|
-
console.log(chalk.cyan(`Location: ${schedule.lat
|
|
82
|
+
console.log(chalk.cyan(`Location: ${formatLocation(schedule.lat, schedule.lon, schedule.source, options.privacyOff)}`));
|
|
81
83
|
console.log(chalk.cyan(`Simulation Duration: ${durationCount} second(s)`));
|
|
82
84
|
console.log(chalk.cyan(`Update Interval: ${updateInterval}ms`));
|
|
83
85
|
console.log(chalk.cyan(`Curve: ${schedule.curves[0]}\n`));
|
|
84
86
|
// 3. Render the schedule by making the lights execute it
|
|
87
|
+
console.log(chalk.yellow(`Turning on ${displayName}...`));
|
|
88
|
+
controller.turnLightOn(nodeId);
|
|
85
89
|
const _cfg = (loadConfig?.() ?? {});
|
|
86
90
|
const runSimulation = async () => {
|
|
87
91
|
const curve = schedule.curves[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulateSchedule.js","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/simulateSchedule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAG1E,MAAM,UAAU,wBAAwB,CAAC,OAAgB,EAAE,IAAiB;IAC1E,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAE9B,OAAO;SACJ,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"simulateSchedule.js","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/simulateSchedule.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"weather.d.ts","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/weather.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,QAYlE;AA+FD,eAAe,eAAe,CAAC"}
|
|
@@ -0,0 +1,96 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
export function registerWeather(program, deps) {
|
|
3
|
+
const { asyncCommand } = deps;
|
|
4
|
+
program
|
|
5
|
+
.command('weather')
|
|
6
|
+
.description('Get current weather for location and its effect on lighting')
|
|
7
|
+
.option('-y, --lat <latitude>', 'Manual latitude (-90 to 90)')
|
|
8
|
+
.option('-x, --lon <longitude>', 'Manual longitude (-180 to 180)')
|
|
9
|
+
.option('-i, --ip <ip>', 'Override IP address for geoip lookup')
|
|
10
|
+
.option('--privacy-off', 'Show full IP address and precise coordinates', false)
|
|
11
|
+
.option('-d, --debug', 'Enable debug mode')
|
|
12
|
+
.action(asyncCommand(handleWeather(deps)));
|
|
13
|
+
}
|
|
14
|
+
function handleWeather(deps) {
|
|
15
|
+
const { loadConfig } = deps;
|
|
16
|
+
return async (options) => {
|
|
17
|
+
const { privacyOff } = options;
|
|
18
|
+
const { getLocationFromIP } = await import('../../daylightSimulation/geoipUtil.js');
|
|
19
|
+
const { getWeatherData } = await import('../../daylightSimulation/weatherUtil.js');
|
|
20
|
+
const { formatLocation } = await import('../../daylightSimulation/privacyUtil.js');
|
|
21
|
+
let lat;
|
|
22
|
+
let lon;
|
|
23
|
+
let source = '';
|
|
24
|
+
// 1. Check CLI options
|
|
25
|
+
if (options.lat && options.lon) {
|
|
26
|
+
lat = parseFloat(options.lat);
|
|
27
|
+
lon = parseFloat(options.lon);
|
|
28
|
+
source = 'manual';
|
|
29
|
+
}
|
|
30
|
+
// 2. Check config
|
|
31
|
+
else if (loadConfig) {
|
|
32
|
+
const config = loadConfig();
|
|
33
|
+
if (config?.latitude && config?.longitude) {
|
|
34
|
+
lat = config.latitude;
|
|
35
|
+
lon = config.longitude;
|
|
36
|
+
source = 'config';
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
// 3. Check GeoIP
|
|
40
|
+
if (lat === undefined || lon === undefined) {
|
|
41
|
+
let ip = options.ip;
|
|
42
|
+
if (!ip) {
|
|
43
|
+
try {
|
|
44
|
+
const res = await fetch('https://api.ipify.org?format=json');
|
|
45
|
+
const data = await res.json();
|
|
46
|
+
ip = data.ip;
|
|
47
|
+
}
|
|
48
|
+
catch (_err) {
|
|
49
|
+
ip = '127.0.0.1';
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
const location = getLocationFromIP(ip);
|
|
53
|
+
if (location?.ll) {
|
|
54
|
+
[lat, lon] = location.ll;
|
|
55
|
+
source = `geoip (${ip})`;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
if (lat === undefined || lon === undefined) {
|
|
59
|
+
console.error(chalk.red('Could not determine location. Use --lat and --lon or configure defaults.'));
|
|
60
|
+
process.exit(1);
|
|
61
|
+
}
|
|
62
|
+
const weather = await getWeatherData(lat, lon, new Date(), options.debug);
|
|
63
|
+
const description = weather.description || weather.raw?.current_condition?.[0].weatherDesc?.[0]?.value;
|
|
64
|
+
console.log(chalk.blue(`Weather for ${formatLocation(lat, lon, source, privacyOff)}`));
|
|
65
|
+
if (description || weather.temp_C) {
|
|
66
|
+
const tempC = weather.temp_C || weather.raw?.current_condition?.[0].temp_C;
|
|
67
|
+
console.log(chalk.gray(` Current: ${description || 'Unknown'}, ${tempC || '?'}°C`));
|
|
68
|
+
}
|
|
69
|
+
const now = new Date();
|
|
70
|
+
console.log(chalk.gray(` Current Time: ${now.toLocaleTimeString()}`));
|
|
71
|
+
const sourceDesc = weather.source === 'api'
|
|
72
|
+
? 'wttr.in API (Current Condition)'
|
|
73
|
+
: weather.source === 'forecast'
|
|
74
|
+
? 'Hourly Forecast (Cache)'
|
|
75
|
+
: 'Cache (Current Condition)';
|
|
76
|
+
console.log(chalk.gray(` Source: ${sourceDesc}`));
|
|
77
|
+
if (weather.effectiveTime) {
|
|
78
|
+
const timeInfo = [weather.effectiveTime];
|
|
79
|
+
if (weather.dataTimestamp) {
|
|
80
|
+
const diffMs = now.getTime() - weather.dataTimestamp;
|
|
81
|
+
const diffMins = Math.round(Math.abs(diffMs) / 60000);
|
|
82
|
+
const relativeStr = diffMs >= 0 ? `${diffMins}m ago` : `in ${diffMins}m`;
|
|
83
|
+
timeInfo.push(`(${relativeStr})`);
|
|
84
|
+
}
|
|
85
|
+
console.log(chalk.gray(` Weather Time: ${timeInfo.join(' ')}`));
|
|
86
|
+
}
|
|
87
|
+
console.log(chalk.blue(' Lighting Parameters:'));
|
|
88
|
+
console.log(chalk.gray(` Cloud Cover: ${Math.round((weather.cloudCover ?? 0) * 100)}%`));
|
|
89
|
+
console.log(chalk.gray(` Precipitation: ${weather.precipitation ?? 'none'}`));
|
|
90
|
+
if (options.debug && weather.raw) {
|
|
91
|
+
console.log(chalk.gray(' Full data:'), JSON.stringify(weather.raw.current_condition[0], null, 2));
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
export default registerWeather;
|
|
96
|
+
//# sourceMappingURL=weather.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"weather.js","sourceRoot":"","sources":["../../../src/commands/daylightSimulation/weather.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cct.d.ts","sourceRoot":"","sources":["../../../src/commands/deviceControl/cct.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,KAAK,EAAE,WAAW,EAA0B,MAAM,8BAA8B,CAAC;AAGxF,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"cct.d.ts","sourceRoot":"","sources":["../../../src/commands/deviceControl/cct.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,KAAK,EAAE,WAAW,EAA0B,MAAM,8BAA8B,CAAC;AAGxF,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,QAiB9D;AAoKD,eAAe,WAAW,CAAC"}
|
|
@@ -4,14 +4,102 @@ import { addStandardOptions, runDeviceAction } from '../cmdUtils.js';
|
|
|
4
4
|
export function registerCct(program, deps) {
|
|
5
5
|
const { asyncCommand } = deps;
|
|
6
6
|
addStandardOptions(program
|
|
7
|
-
.command('cct
|
|
8
|
-
.usage('
|
|
9
|
-
.description(`Set color temperature in Kelvin (${VALIDATION_RANGES.cct.min}-${VALIDATION_RANGES.cct.max}). Omit device or use "all"
|
|
7
|
+
.command('cct [temperature] [device]')
|
|
8
|
+
.usage('[temperature] [device] [options]')
|
|
9
|
+
.description(`Set or get color temperature in Kelvin (${VALIDATION_RANGES.cct.min}-${VALIDATION_RANGES.cct.max}). Omit device or use "all" for all lights.`))
|
|
10
10
|
.option('-i, --intensity <value>', `Also set intensity (${VALIDATION_RANGES.intensity.min}-${VALIDATION_RANGES.intensity.max})`)
|
|
11
|
+
.option('-g, --get', 'Get current CCT and intensity instead of setting')
|
|
11
12
|
.action(asyncCommand(handleCct(deps)));
|
|
12
13
|
}
|
|
13
14
|
function handleCct(deps) {
|
|
14
15
|
return async (tempStr, deviceQuery, options) => {
|
|
16
|
+
if (options.get) {
|
|
17
|
+
return runDeviceAction({
|
|
18
|
+
deps,
|
|
19
|
+
options,
|
|
20
|
+
deviceQuery,
|
|
21
|
+
actionName: 'get temperature',
|
|
22
|
+
}, async (device, controller) => {
|
|
23
|
+
return new Promise((resolve) => {
|
|
24
|
+
controller.getCCT(device.node_id, (success, message, data) => {
|
|
25
|
+
if (!success)
|
|
26
|
+
throw new Error(message);
|
|
27
|
+
const displayName = device.device_name || device.name || device.id || device.node_id || 'Unknown';
|
|
28
|
+
// Handle potential nesting: { data: { data: 1700 } } or { data: { cct: 1700 } }
|
|
29
|
+
let state = data;
|
|
30
|
+
if (state && typeof state === 'object' && 'data' in state) {
|
|
31
|
+
const innerData = state.data;
|
|
32
|
+
// If nested data is just a number, that's our CCT
|
|
33
|
+
if (typeof innerData === 'number') {
|
|
34
|
+
state = { cct: innerData };
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
state = innerData;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
// biome-ignore lint/suspicious/noExplicitAny: Data from server is dynamic
|
|
41
|
+
const s = state;
|
|
42
|
+
// Some servers return the value directly or in a 'cct' property
|
|
43
|
+
const cctValue = typeof state === 'number' ? state : s?.cct;
|
|
44
|
+
let output = `✓ ${displayName}: ${cctValue || 'unknown'}K`;
|
|
45
|
+
if (s?.intensity !== undefined) {
|
|
46
|
+
output += ` at ${s.intensity / 10}% intensity`;
|
|
47
|
+
}
|
|
48
|
+
console.log(chalk.green(output));
|
|
49
|
+
resolve();
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}, async (controller) => {
|
|
53
|
+
const devices = controller.getDevices();
|
|
54
|
+
if (devices.length === 0) {
|
|
55
|
+
console.log(chalk.yellow('No devices found'));
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
// Filter for light devices only, skipping groups like 'ALL'
|
|
59
|
+
const lightDevices = devices.filter((d) => d.node_id?.includes('-') && d.node_id !== '00000000000000000000000000000000');
|
|
60
|
+
if (lightDevices.length === 0) {
|
|
61
|
+
console.log(chalk.yellow('No light devices found'));
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
for (const device of lightDevices) {
|
|
65
|
+
if (device.node_id) {
|
|
66
|
+
await new Promise((resolve) => {
|
|
67
|
+
controller.getCCT(device.node_id, (success, message, data) => {
|
|
68
|
+
const displayName = device.device_name || device.name || device.id || device.node_id || 'Unknown';
|
|
69
|
+
if (success) {
|
|
70
|
+
let state = data;
|
|
71
|
+
if (state && typeof state === 'object' && 'data' in state) {
|
|
72
|
+
const innerData = state.data;
|
|
73
|
+
if (typeof innerData === 'number') {
|
|
74
|
+
state = { cct: innerData };
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
state = innerData;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
// biome-ignore lint/suspicious/noExplicitAny: Data from server is dynamic
|
|
81
|
+
const s = state;
|
|
82
|
+
const cctValue = typeof state === 'number' ? state : s?.cct;
|
|
83
|
+
let output = `✓ ${displayName}: ${cctValue || 'unknown'}K`;
|
|
84
|
+
if (s?.intensity !== undefined) {
|
|
85
|
+
output += ` at ${s.intensity / 10}% intensity`;
|
|
86
|
+
}
|
|
87
|
+
console.log(chalk.green(output));
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
console.error(chalk.red(`✗ ${displayName}: Failed to get CCT: ${message}`));
|
|
91
|
+
}
|
|
92
|
+
resolve();
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
if (!tempStr) {
|
|
100
|
+
console.error(chalk.red('Error: temperature is required unless using --get'));
|
|
101
|
+
process.exit(1);
|
|
102
|
+
}
|
|
15
103
|
const temperature = parseInt(tempStr, 10);
|
|
16
104
|
if (Number.isNaN(temperature) ||
|
|
17
105
|
temperature < VALIDATION_RANGES.cct.min ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cct.js","sourceRoot":"","sources":["../../../src/commands/deviceControl/cct.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAErE,MAAM,UAAU,WAAW,CAAC,OAAgB,EAAE,IAAiB;IAC7D,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAE9B,kBAAkB,CAChB,OAAO;SACJ,OAAO,CAAC,4BAA4B,CAAC;SACrC,KAAK,CAAC,kCAAkC,CAAC;SACzC,WAAW,CACV,
|
|
1
|
+
{"version":3,"file":"cct.js","sourceRoot":"","sources":["../../../src/commands/deviceControl/cct.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/commands/deviceControl/color.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAA0B,MAAM,8BAA8B,CAAC;AAGxF,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"color.d.ts","sourceRoot":"","sources":["../../../src/commands/deviceControl/color.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,KAAK,EAAE,WAAW,EAA0B,MAAM,8BAA8B,CAAC;AAGxF,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,QAahE;AAoPD,eAAe,aAAa,CAAC"}
|
|
@@ -3,13 +3,181 @@ import { addStandardOptions, runDeviceAction } from '../cmdUtils.js';
|
|
|
3
3
|
export function registerColor(program, deps) {
|
|
4
4
|
const { asyncCommand } = deps;
|
|
5
5
|
addStandardOptions(program
|
|
6
|
-
.command('color
|
|
7
|
-
.description('Set color by name or hex code (e.g., "red", "#ff0000"). Omit device or use "all"
|
|
6
|
+
.command('color [color] [device]')
|
|
7
|
+
.description('Set or get color by name or hex code (e.g., "red", "#ff0000"). Omit device or use "all" for all lights.'))
|
|
8
8
|
.option('-i, --intensity <value>', 'Set intensity (0-100)')
|
|
9
|
+
.option('-g, --get', 'Get current color status')
|
|
9
10
|
.action(asyncCommand(handleColor(deps)));
|
|
10
11
|
}
|
|
11
12
|
function handleColor(deps) {
|
|
12
|
-
return async (
|
|
13
|
+
return async (colorStr, deviceQuery, options) => {
|
|
14
|
+
// Handle get mode
|
|
15
|
+
if (options.get) {
|
|
16
|
+
// Argument shifting: if only one arg provided and it might be a device (or if colorStr is undefined)
|
|
17
|
+
// For color command, if user types `color -g mydevice`, colorStr will be "mydevice".
|
|
18
|
+
// If user types `color -g`, colorStr is undefined.
|
|
19
|
+
let targetDevice = deviceQuery;
|
|
20
|
+
if (!targetDevice && colorStr) {
|
|
21
|
+
// If colorStr does not look like a color (hex/name) but might be a device?
|
|
22
|
+
// Actually, if fetching, we don't care about color arg. So whatever is passed is likely the device or ignored.
|
|
23
|
+
// It's safer to treat the first arg as device if getting.
|
|
24
|
+
targetDevice = colorStr;
|
|
25
|
+
}
|
|
26
|
+
return runDeviceAction({
|
|
27
|
+
deps,
|
|
28
|
+
options,
|
|
29
|
+
deviceQuery: targetDevice,
|
|
30
|
+
actionName: 'get color',
|
|
31
|
+
}, async (device, controller) => {
|
|
32
|
+
// We use getNodeConfig initially
|
|
33
|
+
return new Promise((resolve) => {
|
|
34
|
+
controller.getNodeConfig(device.node_id, async (_success, _messagee, data) => {
|
|
35
|
+
const displayName = device.device_name || device.name || device.id || device.node_id || 'Unknown';
|
|
36
|
+
const config = data?.data ||
|
|
37
|
+
data ||
|
|
38
|
+
{};
|
|
39
|
+
const h = config.hue ?? config.h;
|
|
40
|
+
const s = config.saturation ??
|
|
41
|
+
config.sat ??
|
|
42
|
+
config.s;
|
|
43
|
+
let i = config.intensity ??
|
|
44
|
+
config.int ??
|
|
45
|
+
config.i;
|
|
46
|
+
let cct = config.cct;
|
|
47
|
+
// If state is missing, try explicit getters for reliable props (CCT, Intensity)
|
|
48
|
+
// We skip getHSI as it is invalid on server
|
|
49
|
+
if (h === undefined && s === undefined && cct === undefined) {
|
|
50
|
+
// Try getting CCT
|
|
51
|
+
await new Promise((r) => {
|
|
52
|
+
controller.getCCT(device.node_id, (ok, _msg, d) => {
|
|
53
|
+
if (ok) {
|
|
54
|
+
const inner = d?.data ?? d;
|
|
55
|
+
const val = typeof inner === 'number'
|
|
56
|
+
? inner
|
|
57
|
+
: inner?.cct;
|
|
58
|
+
if (val !== undefined)
|
|
59
|
+
cct = val;
|
|
60
|
+
}
|
|
61
|
+
r();
|
|
62
|
+
});
|
|
63
|
+
});
|
|
64
|
+
// Try getting Intensity
|
|
65
|
+
await new Promise((r) => {
|
|
66
|
+
controller.getIntensity(device.node_id, (ok, _msg, d) => {
|
|
67
|
+
if (ok) {
|
|
68
|
+
const inner = d?.data ?? d;
|
|
69
|
+
const val = typeof inner === 'number'
|
|
70
|
+
? inner
|
|
71
|
+
: inner?.intensity;
|
|
72
|
+
if (val !== undefined)
|
|
73
|
+
i = val;
|
|
74
|
+
}
|
|
75
|
+
r();
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
let output = `✓ ${displayName}: `;
|
|
80
|
+
const parts = [];
|
|
81
|
+
if (h !== undefined && s !== undefined) {
|
|
82
|
+
parts.push(`HSI(${h}, ${s}, ${i !== undefined ? i / 10 : '?'})`);
|
|
83
|
+
}
|
|
84
|
+
else if (cct !== undefined) {
|
|
85
|
+
parts.push(`CCT: ${cct}K`);
|
|
86
|
+
}
|
|
87
|
+
if (i !== undefined && (parts.length === 0 || !parts[0].includes('HSI'))) {
|
|
88
|
+
parts.push(`Intensity: ${i / 10}%`);
|
|
89
|
+
}
|
|
90
|
+
if (parts.length === 0) {
|
|
91
|
+
parts.push('Unknown state');
|
|
92
|
+
}
|
|
93
|
+
output += parts.join(', ');
|
|
94
|
+
console.log(chalk.green(output));
|
|
95
|
+
resolve();
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
}, async (controller) => {
|
|
99
|
+
// Apply to all devices loop
|
|
100
|
+
const devices = controller.getDevices();
|
|
101
|
+
if (devices.length === 0) {
|
|
102
|
+
console.log(chalk.yellow('No devices found'));
|
|
103
|
+
return;
|
|
104
|
+
}
|
|
105
|
+
// Filter for light devices only
|
|
106
|
+
const lightDevices = devices.filter((d) => d.node_id?.includes('-') && d.node_id !== '00000000000000000000000000000000');
|
|
107
|
+
if (lightDevices.length === 0) {
|
|
108
|
+
console.log(chalk.yellow('No light devices found'));
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
for (const device of lightDevices) {
|
|
112
|
+
if (device.node_id) {
|
|
113
|
+
await new Promise((resolve) => {
|
|
114
|
+
controller.getNodeConfig(device.node_id, async (_success, _messagee, data) => {
|
|
115
|
+
const displayName = device.device_name || device.name || device.id || device.node_id || 'Unknown';
|
|
116
|
+
const config = data?.data ||
|
|
117
|
+
data ||
|
|
118
|
+
{};
|
|
119
|
+
const h = config.hue ?? config.h;
|
|
120
|
+
const s = config.saturation ??
|
|
121
|
+
config.sat ??
|
|
122
|
+
config.s;
|
|
123
|
+
let i = config.intensity ??
|
|
124
|
+
config.int ??
|
|
125
|
+
config.i;
|
|
126
|
+
let cct = config.cct;
|
|
127
|
+
if (h === undefined && s === undefined && cct === undefined) {
|
|
128
|
+
await new Promise((r) => {
|
|
129
|
+
controller.getCCT(device.node_id, (ok, _msg, d) => {
|
|
130
|
+
if (ok) {
|
|
131
|
+
const inner = d?.data ?? d;
|
|
132
|
+
const val = typeof inner === 'number'
|
|
133
|
+
? inner
|
|
134
|
+
: inner?.cct;
|
|
135
|
+
if (val !== undefined)
|
|
136
|
+
cct = val;
|
|
137
|
+
}
|
|
138
|
+
r();
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
await new Promise((r) => {
|
|
142
|
+
controller.getIntensity(device.node_id, (ok, _msg, d) => {
|
|
143
|
+
if (ok) {
|
|
144
|
+
const inner = d?.data ?? d;
|
|
145
|
+
const val = typeof inner === 'number'
|
|
146
|
+
? inner
|
|
147
|
+
: inner?.intensity;
|
|
148
|
+
if (val !== undefined)
|
|
149
|
+
i = val;
|
|
150
|
+
}
|
|
151
|
+
r();
|
|
152
|
+
});
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
const parts = [];
|
|
156
|
+
if (h !== undefined && s !== undefined) {
|
|
157
|
+
parts.push(`HSI(${h}, ${s}, ${i !== undefined ? i / 10 : '?'})`);
|
|
158
|
+
}
|
|
159
|
+
else if (cct !== undefined) {
|
|
160
|
+
parts.push(`CCT: ${cct}K`);
|
|
161
|
+
}
|
|
162
|
+
if (i !== undefined && (parts.length === 0 || !parts[0].includes('HSI'))) {
|
|
163
|
+
parts.push(`Intensity: ${i / 10}%`);
|
|
164
|
+
}
|
|
165
|
+
if (parts.length === 0)
|
|
166
|
+
parts.push('Unknown state');
|
|
167
|
+
console.log(chalk.green(`✓ ${displayName}: ${parts.join(', ')}`));
|
|
168
|
+
resolve();
|
|
169
|
+
});
|
|
170
|
+
});
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
// Set mode (original logic)
|
|
176
|
+
if (!colorStr) {
|
|
177
|
+
console.error(chalk.red("error: missing required argument 'color'"));
|
|
178
|
+
process.exit(1);
|
|
179
|
+
}
|
|
180
|
+
const color = colorStr;
|
|
13
181
|
let intensity;
|
|
14
182
|
if (options.intensity) {
|
|
15
183
|
intensity = parseInt(options.intensity, 10);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"color.js","sourceRoot":"","sources":["../../../src/commands/deviceControl/color.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAErE,MAAM,UAAU,aAAa,CAAC,OAAgB,EAAE,IAAiB;IAC/D,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAE9B,kBAAkB,CAChB,OAAO;SACJ,OAAO,CAAC,wBAAwB,CAAC;SACjC,WAAW,CACV,
|
|
1
|
+
{"version":3,"file":"color.js","sourceRoot":"","sources":["../../../src/commands/deviceControl/color.ts"],"names":[],"mappings":"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"}
|