amaran-light-cli 1.9.0 → 1.11.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 +46 -3
- package/dist/__tests__/autoCct.test.js +8 -4
- package/dist/__tests__/autoCct.test.js.map +1 -1
- package/dist/__tests__/autoCctMaxLux.test.js +11 -9
- package/dist/__tests__/autoCctMaxLux.test.js.map +1 -1
- package/dist/__tests__/autostart.test.js +18 -0
- package/dist/__tests__/autostart.test.js.map +1 -1
- package/dist/__tests__/cctUtil.test.js +2 -1
- package/dist/__tests__/cctUtil.test.js.map +1 -1
- package/dist/__tests__/cli.config.test.d.ts +2 -0
- package/dist/__tests__/cli.config.test.d.ts.map +1 -0
- package/dist/__tests__/cli.config.test.js +65 -0
- package/dist/__tests__/cli.config.test.js.map +1 -0
- package/dist/__tests__/cli.smoke.test.js +36 -17
- package/dist/__tests__/cli.smoke.test.js.map +1 -1
- package/dist/__tests__/lightControl.test.js +2 -2
- package/dist/__tests__/lightControl.test.js.map +1 -1
- package/dist/__tests__/maxLuxInterpolation.test.js +4 -2
- package/dist/__tests__/maxLuxInterpolation.test.js.map +1 -1
- package/dist/__tests__/packageExports.test.d.ts +2 -0
- package/dist/__tests__/packageExports.test.d.ts.map +1 -0
- package/dist/__tests__/packageExports.test.js +33 -0
- package/dist/__tests__/packageExports.test.js.map +1 -0
- package/dist/__tests__/simulateSchedule.test.js +7 -3
- package/dist/__tests__/simulateSchedule.test.js.map +1 -1
- package/dist/circadian.d.ts +16 -0
- package/dist/circadian.d.ts.map +1 -0
- package/dist/circadian.js +11 -0
- package/dist/circadian.js.map +1 -0
- package/dist/cli.d.ts +2 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +35 -28
- package/dist/cli.js.map +1 -1
- package/dist/commands/__tests__/integration.test.js +28 -0
- package/dist/commands/__tests__/integration.test.js.map +1 -1
- package/dist/commands/cmdUtils.d.ts +4 -1
- package/dist/commands/cmdUtils.d.ts.map +1 -1
- package/dist/commands/cmdUtils.js +19 -0
- package/dist/commands/cmdUtils.js.map +1 -1
- package/dist/commands/daylightSimulation/autoCct.d.ts.map +1 -1
- package/dist/commands/daylightSimulation/autoCct.js +98 -47
- package/dist/commands/daylightSimulation/autoCct.js.map +1 -1
- package/dist/commands/daylightSimulation/graphSchedule.d.ts.map +1 -1
- package/dist/commands/daylightSimulation/graphSchedule.js +2 -0
- package/dist/commands/daylightSimulation/graphSchedule.js.map +1 -1
- package/dist/commands/daylightSimulation/printSchedule.d.ts.map +1 -1
- package/dist/commands/daylightSimulation/printSchedule.js +2 -0
- package/dist/commands/daylightSimulation/printSchedule.js.map +1 -1
- package/dist/commands/daylightSimulation/service.d.ts.map +1 -1
- package/dist/commands/daylightSimulation/service.js +15 -7
- package/dist/commands/daylightSimulation/service.js.map +1 -1
- package/dist/commands/daylightSimulation/simulateSchedule.d.ts.map +1 -1
- package/dist/commands/daylightSimulation/simulateSchedule.js +26 -9
- 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 +111 -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 +10 -12
- 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 +3 -9
- 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 +83 -47
- 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 +3 -9
- package/dist/commands/deviceControl/hsi.js.map +1 -1
- package/dist/commands/deviceControl/intensity.d.ts.map +1 -1
- package/dist/commands/deviceControl/intensity.js +10 -12
- package/dist/commands/deviceControl/intensity.js.map +1 -1
- package/dist/commands/deviceControl/list.d.ts.map +1 -1
- package/dist/commands/deviceControl/list.js +18 -13
- package/dist/commands/deviceControl/list.js.map +1 -1
- package/dist/commands/deviceControl/power.d.ts.map +1 -1
- package/dist/commands/deviceControl/power.js +10 -25
- 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 +3 -3
- package/dist/commands/deviceControl/status.js.map +1 -1
- package/dist/commands/parseUtils.d.ts +6 -0
- package/dist/commands/parseUtils.d.ts.map +1 -0
- package/dist/commands/parseUtils.js +42 -0
- package/dist/commands/parseUtils.js.map +1 -0
- package/dist/commands-api.d.ts +28 -0
- package/dist/commands-api.d.ts.map +1 -0
- package/dist/commands-api.js +27 -0
- package/dist/commands-api.js.map +1 -0
- package/dist/commands.d.ts.map +1 -1
- package/dist/commands.js +2 -0
- package/dist/commands.js.map +1 -1
- package/dist/config.d.ts +83 -0
- package/dist/config.d.ts.map +1 -0
- package/dist/config.js +114 -0
- package/dist/config.js.map +1 -0
- package/dist/daylightSimulation/cctUtil.d.ts.map +1 -1
- package/dist/daylightSimulation/cctUtil.js +23 -21
- package/dist/daylightSimulation/cctUtil.js.map +1 -1
- package/dist/daylightSimulation/curves/realistic.d.ts +6 -6
- package/dist/daylightSimulation/curves/realistic.d.ts.map +1 -1
- package/dist/daylightSimulation/curves/realistic.js +36 -6
- package/dist/daylightSimulation/curves/realistic.js.map +1 -1
- package/dist/daylightSimulation/mathUtil.d.ts.map +1 -1
- package/dist/daylightSimulation/mathUtil.js +6 -2
- package/dist/daylightSimulation/mathUtil.js.map +1 -1
- package/dist/daylightSimulation/scheduleMaker.d.ts +6 -2
- package/dist/daylightSimulation/scheduleMaker.d.ts.map +1 -1
- package/dist/daylightSimulation/scheduleMaker.js +4 -6
- package/dist/daylightSimulation/scheduleMaker.js.map +1 -1
- package/dist/daylightSimulation/types.d.ts +2 -0
- package/dist/daylightSimulation/types.d.ts.map +1 -1
- package/dist/daylightSimulation/types.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 +194 -0
- package/dist/daylightSimulation/weatherUtil.js.map +1 -0
- package/dist/device-control.d.ts +7 -0
- package/dist/device-control.d.ts.map +1 -0
- package/dist/device-control.js +7 -0
- package/dist/device-control.js.map +1 -0
- package/dist/deviceControl/autostart.d.ts.map +1 -1
- package/dist/deviceControl/autostart.js +15 -16
- package/dist/deviceControl/autostart.js.map +1 -1
- package/dist/deviceControl/lightControl.d.ts +1 -0
- package/dist/deviceControl/lightControl.d.ts.map +1 -1
- package/dist/deviceControl/lightControl.js +20 -10
- package/dist/deviceControl/lightControl.js.map +1 -1
- package/dist/deviceControl/types.d.ts +8 -0
- package/dist/deviceControl/types.d.ts.map +1 -1
- package/dist/index.d.ts +11 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +7 -0
- package/dist/index.js.map +1 -0
- package/docs/CHANGELOG.md +134 -0
- package/package.json +33 -6
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import { CURVE_HELP_TEXT } from '../../daylightSimulation/constants.js';
|
|
3
3
|
import { ScheduleMaker } from '../../daylightSimulation/scheduleMaker.js';
|
|
4
|
+
import { commandCallbackPromise, getLightDevices } from '../cmdUtils.js';
|
|
4
5
|
export function registerSimulateSchedule(program, deps) {
|
|
5
6
|
const { asyncCommand } = deps;
|
|
6
7
|
program
|
|
@@ -13,6 +14,7 @@ export function registerSimulateSchedule(program, deps) {
|
|
|
13
14
|
.option('--lat <latitude>', 'Manual latitude (-90 to 90)')
|
|
14
15
|
.option('--lon <longitude>', 'Manual longitude (-180 to 180)')
|
|
15
16
|
.option('-C, --curve <curve>', CURVE_HELP_TEXT, 'hann')
|
|
17
|
+
.option('-L, --max-lux <value>', 'Simulation peak in lux (scales the whole day)')
|
|
16
18
|
.option('--duration <seconds>', 'Simulation duration to compress full day (default: 10 seconds)', '10')
|
|
17
19
|
.option('--cloud-cover <value>', 'Cloud cover (0-1)')
|
|
18
20
|
.option('--precipitation <type>', 'Precipitation type')
|
|
@@ -43,6 +45,7 @@ function handleSimulateSchedule(deps) {
|
|
|
43
45
|
curves: options.curve,
|
|
44
46
|
cloudCover: options.cloudCover, // ScheduleMaker handles parsing
|
|
45
47
|
precipitation: options.precipitation,
|
|
48
|
+
maxLuxLimit: options.maxLux ? parseFloat(options.maxLux) : undefined,
|
|
46
49
|
});
|
|
47
50
|
const nightEnd = baseInfo.times.nightEnd;
|
|
48
51
|
const night = baseInfo.times.night;
|
|
@@ -59,6 +62,7 @@ function handleSimulateSchedule(deps) {
|
|
|
59
62
|
endTime: night,
|
|
60
63
|
intervalMinutes: timeStepMs / (60 * 1000), // convert ms to minutes for the maker's interval
|
|
61
64
|
includeSpecialTimes: false, // Smooth simulation doesn't need jumps to special times
|
|
65
|
+
maxLuxLimit: options.maxLux ? parseFloat(options.maxLux) : undefined,
|
|
62
66
|
});
|
|
63
67
|
}
|
|
64
68
|
catch (error) {
|
|
@@ -67,25 +71,38 @@ function handleSimulateSchedule(deps) {
|
|
|
67
71
|
}
|
|
68
72
|
// 2. Connect to controller and find device
|
|
69
73
|
const controller = await createController(options.url, options.clientId, options.debug);
|
|
70
|
-
|
|
71
|
-
if (
|
|
74
|
+
let devices;
|
|
75
|
+
if (deviceQuery.toLowerCase() === 'all') {
|
|
76
|
+
devices = getLightDevices(controller.getDevices());
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
const device = findDevice(controller, deviceQuery);
|
|
80
|
+
devices = device ? [device] : [];
|
|
81
|
+
}
|
|
82
|
+
if (devices.length === 0) {
|
|
83
|
+
console.error(chalk.red(ERROR_MESSAGES.deviceNotFound(deviceQuery)));
|
|
84
|
+
await controller.disconnect();
|
|
85
|
+
process.exit(1);
|
|
86
|
+
}
|
|
87
|
+
if (devices.some((device) => !device.node_id)) {
|
|
72
88
|
console.error(chalk.red(ERROR_MESSAGES.deviceNotFound(deviceQuery)));
|
|
73
89
|
await controller.disconnect();
|
|
74
90
|
process.exit(1);
|
|
75
91
|
}
|
|
76
|
-
const
|
|
77
|
-
|
|
92
|
+
const targetLabel = devices.length === 1
|
|
93
|
+
? devices[0].device_name || devices[0].name || devices[0].id || devices[0].node_id || 'Unknown'
|
|
94
|
+
: `${devices.length} lights`;
|
|
78
95
|
console.log(chalk.blue('\n═══════════════════════════════════════════════════════════'));
|
|
79
96
|
console.log(chalk.blue(' CCT Schedule Simulation'));
|
|
80
97
|
console.log(chalk.blue('═══════════════════════════════════════════════════════════\n'));
|
|
81
|
-
console.log(chalk.cyan(`Device: ${
|
|
98
|
+
console.log(chalk.cyan(`Device: ${targetLabel}`));
|
|
82
99
|
console.log(chalk.cyan(`Location: ${formatLocation(schedule.lat, schedule.lon, schedule.source, options.privacyOff)}`));
|
|
83
100
|
console.log(chalk.cyan(`Simulation Duration: ${durationCount} second(s)`));
|
|
84
101
|
console.log(chalk.cyan(`Update Interval: ${updateInterval}ms`));
|
|
85
102
|
console.log(chalk.cyan(`Curve: ${schedule.curves[0]}\n`));
|
|
86
103
|
// 3. Render the schedule by making the lights execute it
|
|
87
|
-
console.log(chalk.yellow(`Turning on ${
|
|
88
|
-
controller.turnLightOn(
|
|
104
|
+
console.log(chalk.yellow(`Turning on ${targetLabel}...`));
|
|
105
|
+
await Promise.all(devices.map((device) => commandCallbackPromise((callback) => controller.turnLightOn(device.node_id, callback))));
|
|
89
106
|
const _cfg = (loadConfig?.() ?? {});
|
|
90
107
|
const runSimulation = async () => {
|
|
91
108
|
const curve = schedule.curves[0];
|
|
@@ -97,8 +114,8 @@ function handleSimulateSchedule(deps) {
|
|
|
97
114
|
const percent = Math.round((val.intensity / 10) * 10) / 10;
|
|
98
115
|
const progress = Math.round((i / (schedule.points.length - 1)) * 100);
|
|
99
116
|
const timeStr = point.time.toLocaleTimeString(undefined, { hour: '2-digit', minute: '2-digit' });
|
|
100
|
-
process.stdout.write(`\r${chalk.gray(`[${progress}% | ${timeStr}] `)}${chalk.green(`Setting ${
|
|
101
|
-
controller.setCCT(
|
|
117
|
+
process.stdout.write(`\r${chalk.gray(`[${progress}% | ${timeStr}] `)}${chalk.green(`Setting ${targetLabel} to ${val.cct}K at ${percent}%`)} `);
|
|
118
|
+
await Promise.all(devices.map((device) => commandCallbackPromise((callback) => controller.setCCT(device.node_id, val.cct, val.intensity, callback))));
|
|
102
119
|
if (i < schedule.points.length - 1) {
|
|
103
120
|
await new Promise((resolve) => setTimeout(resolve, updateInterval));
|
|
104
121
|
}
|
|
@@ -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,UAAU,CAAC;SACnB,WAAW,CAAC,iEAAiE,CAAC;SAC9E,QAAQ,CAAC,UAAU,EAAE,wCAAwC,CAAC;SAC9D,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC;SAC1C,MAAM,CAAC,sBAAsB,EAAE,WAAW,CAAC;SAC3C,MAAM,CAAC,aAAa,EAAE,mBAAmB,CAAC;SAC1C,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,CAAC;SACzD,MAAM,CAAC,mBAAmB,EAAE,gCAAgC,CAAC;SAC7D,MAAM,CAAC,qBAAqB,EAAE,eAAe,EAAE,MAAM,CAAC;SACtD,MAAM,CAAC,sBAAsB,EAAE,gEAAgE,EAAE,IAAI,CAAC;SACtG,MAAM,CAAC,uBAAuB,EAAE,mBAAmB,CAAC;SACpD,MAAM,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,8CAA8C,EAAE,KAAK,CAAC;SAC9E,MAAM,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAiB;IAC/C,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAE1D,OAAO,KAAK,
|
|
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,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEzE,MAAM,UAAU,wBAAwB,CAAC,OAAgB,EAAE,IAAiB;IAC1E,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;IAE9B,OAAO;SACJ,OAAO,CAAC,UAAU,CAAC;SACnB,WAAW,CAAC,iEAAiE,CAAC;SAC9E,QAAQ,CAAC,UAAU,EAAE,wCAAwC,CAAC;SAC9D,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC;SAC1C,MAAM,CAAC,sBAAsB,EAAE,WAAW,CAAC;SAC3C,MAAM,CAAC,aAAa,EAAE,mBAAmB,CAAC;SAC1C,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,CAAC;SACzD,MAAM,CAAC,mBAAmB,EAAE,gCAAgC,CAAC;SAC7D,MAAM,CAAC,qBAAqB,EAAE,eAAe,EAAE,MAAM,CAAC;SACtD,MAAM,CAAC,uBAAuB,EAAE,+CAA+C,CAAC;SAChF,MAAM,CAAC,sBAAsB,EAAE,gEAAgE,EAAE,IAAI,CAAC;SACtG,MAAM,CAAC,uBAAuB,EAAE,mBAAmB,CAAC;SACpD,MAAM,CAAC,wBAAwB,EAAE,oBAAoB,CAAC;SACtD,MAAM,CAAC,eAAe,EAAE,8CAA8C,EAAE,KAAK,CAAC;SAC9E,MAAM,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAiB;IAC/C,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAE1D,OAAO,KAAK,EACV,WAAmB,EACnB,OASC,EACD,EAAE;QACF,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,kCAAkC,CAAC,CAAC;QAC7F,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,yCAAyC,CAAC,CAAC;QAEnF,uBAAuB;QACvB,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QAEvC,2DAA2D;QAC3D,6FAA6F;QAC7F,wEAAwE;QAExE,MAAM,aAAa,GAAG,QAAQ,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAW,EAAE,EAAE,CAAC,CAAC;QACzE,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;QACtD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;QAEzE,MAAM,cAAc,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC;QAC/C,IAAI,QAAiE,CAAC;QACtE,IAAI,CAAC;YACH,gDAAgD;YAChD,sCAAsC;YACtC,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,YAAY,CAAC;gBACjD,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,MAAM,EAAE,OAAO,CAAC,KAAK;gBACrB,UAAU,EAAE,OAAO,CAAC,UAAgC,EAAE,gCAAgC;gBACtF,aAAa,EAAE,OAAO,CAAC,aAAmC;gBAC1D,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;aACrE,CAAC,CAAC;YAEH,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;YACzC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;YAEnC,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;gBAC7F,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;YACpE,CAAC;YAED,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC3D,MAAM,UAAU,GAAG,aAAa,GAAG,YAAY,CAAC;YAEhD,QAAQ,GAAG,MAAM,cAAc,CAAC,YAAY,CAAC;gBAC3C,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,MAAM,EAAE,OAAO,CAAC,KAAK;gBACrB,SAAS,EAAE,QAAQ;gBACnB,OAAO,EAAE,KAAK;gBACd,eAAe,EAAE,UAAU,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,iDAAiD;gBAC5F,mBAAmB,EAAE,KAAK,EAAE,wDAAwD;gBACpF,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;aACrE,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAE,KAAe,CAAC,OAAO,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,2CAA2C;QAC3C,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACxF,IAAI,OAAiB,CAAC;QACtB,IAAI,WAAW,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE,CAAC;YACxC,OAAO,GAAG,eAAe,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC;QACrD,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;YACnD,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnC,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACrE,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACrE,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,WAAW,GACf,OAAO,CAAC,MAAM,KAAK,CAAC;YAClB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,SAAS;YAC/F,CAAC,CAAC,GAAG,OAAO,CAAC,MAAM,SAAS,CAAC;QAEjC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC,CAAC;QACzF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,+DAA+D,CAAC,CAAC,CAAC;QAEzF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC,CAAC;QAClD,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,IAAI,CAAC,aAAa,cAAc,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAC3G,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,aAAa,YAAY,CAAC,CAAC,CAAC;QAC3E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,cAAc,IAAI,CAAC,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAE1D,yDAAyD;QACzD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,WAAW,KAAK,CAAC,CAAC,CAAC;QAC1D,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACrB,sBAAsB,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,OAAiB,EAAE,QAAQ,CAAC,CAAC,CACjG,CACF,CAAC;QAEF,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAA4B,CAAC;QAE/D,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;YAC/B,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACjC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACpC,IAAI,CAAC,GAAG;oBAAE,SAAS;gBAEnB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;gBAE3D,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;gBACtE,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAEjG,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,KAAK,KAAK,CAAC,IAAI,CAAC,IAAI,QAAQ,OAAO,OAAO,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,WAAW,OAAO,GAAG,CAAC,GAAG,QAAQ,OAAO,GAAG,CAAC,YAAY,CAClI,CAAC;gBAEF,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CACrB,sBAAsB,CAAC,CAAC,QAAQ,EAAE,EAAE,CAClC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,OAAiB,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAC9E,CACF,CACF,CAAC;gBAEF,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACnC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;YACD,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,CAAC,CAAC;QAEF,MAAM,aAAa,GAAG,KAAK,IAAI,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,gCAAgC,CAAC,CAAC,CAAC;YAC5D,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC;QAEF,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QACpC,MAAM,aAAa,EAAE,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAErC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACnD,MAAM,UAAU,CAAC,UAAU,EAAE,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC;AAED,eAAe,wBAAwB,CAAC"}
|
|
@@ -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;AAGhE,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,QAYlE;AA4GD,eAAe,eAAe,CAAC"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import chalk from 'chalk';
|
|
2
|
+
import { parseStrictNumber } from '../parseUtils.js';
|
|
3
|
+
export function registerWeather(program, deps) {
|
|
4
|
+
const { asyncCommand } = deps;
|
|
5
|
+
program
|
|
6
|
+
.command('weather')
|
|
7
|
+
.description('Get current weather for location and its effect on lighting')
|
|
8
|
+
.option('-y, --lat <latitude>', 'Manual latitude (-90 to 90)')
|
|
9
|
+
.option('-x, --lon <longitude>', 'Manual longitude (-180 to 180)')
|
|
10
|
+
.option('-i, --ip <ip>', 'Override IP address for geoip lookup')
|
|
11
|
+
.option('--privacy-off', 'Show full IP address and precise coordinates', false)
|
|
12
|
+
.option('-d, --debug', 'Enable debug mode')
|
|
13
|
+
.action(asyncCommand(handleWeather(deps)));
|
|
14
|
+
}
|
|
15
|
+
function handleWeather(deps) {
|
|
16
|
+
const { loadConfig } = deps;
|
|
17
|
+
return async (options) => {
|
|
18
|
+
const { privacyOff } = options;
|
|
19
|
+
const { getLocationFromIP } = await import('../../daylightSimulation/geoipUtil.js');
|
|
20
|
+
const { getWeatherData } = await import('../../daylightSimulation/weatherUtil.js');
|
|
21
|
+
const { formatLocation } = await import('../../daylightSimulation/privacyUtil.js');
|
|
22
|
+
let lat;
|
|
23
|
+
let lon;
|
|
24
|
+
let source = '';
|
|
25
|
+
// 1. Check CLI options
|
|
26
|
+
if (options.lat !== undefined && options.lon !== undefined) {
|
|
27
|
+
try {
|
|
28
|
+
lat = parseStrictNumber(options.lat, 'Latitude');
|
|
29
|
+
lon = parseStrictNumber(options.lon, 'Longitude');
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
console.error(chalk.red(error.message));
|
|
33
|
+
process.exit(1);
|
|
34
|
+
}
|
|
35
|
+
if (lat < -90 || lat > 90) {
|
|
36
|
+
console.error(chalk.red('Latitude must be between -90 and 90'));
|
|
37
|
+
process.exit(1);
|
|
38
|
+
}
|
|
39
|
+
if (lon < -180 || lon > 180) {
|
|
40
|
+
console.error(chalk.red('Longitude must be between -180 and 180'));
|
|
41
|
+
process.exit(1);
|
|
42
|
+
}
|
|
43
|
+
source = 'manual';
|
|
44
|
+
}
|
|
45
|
+
// 2. Check config
|
|
46
|
+
else if (loadConfig) {
|
|
47
|
+
const config = loadConfig();
|
|
48
|
+
if (typeof config?.latitude === 'number' && typeof config?.longitude === 'number') {
|
|
49
|
+
lat = config.latitude;
|
|
50
|
+
lon = config.longitude;
|
|
51
|
+
source = 'config';
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
// 3. Check GeoIP
|
|
55
|
+
if (lat === undefined || lon === undefined) {
|
|
56
|
+
let ip = options.ip;
|
|
57
|
+
if (!ip) {
|
|
58
|
+
try {
|
|
59
|
+
const res = await fetch('https://api.ipify.org?format=json');
|
|
60
|
+
const data = await res.json();
|
|
61
|
+
ip = data.ip;
|
|
62
|
+
}
|
|
63
|
+
catch (_err) {
|
|
64
|
+
ip = '127.0.0.1';
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
const location = getLocationFromIP(ip);
|
|
68
|
+
if (location?.ll) {
|
|
69
|
+
[lat, lon] = location.ll;
|
|
70
|
+
source = `geoip (${ip})`;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
if (lat === undefined || lon === undefined) {
|
|
74
|
+
console.error(chalk.red('Could not determine location. Use --lat and --lon or configure defaults.'));
|
|
75
|
+
process.exit(1);
|
|
76
|
+
}
|
|
77
|
+
const weather = await getWeatherData(lat, lon, new Date(), options.debug);
|
|
78
|
+
const description = weather.description || weather.raw?.current_condition?.[0].weatherDesc?.[0]?.value;
|
|
79
|
+
console.log(chalk.blue(`Weather for ${formatLocation(lat, lon, source, privacyOff)}`));
|
|
80
|
+
if (description || weather.temp_C) {
|
|
81
|
+
const tempC = weather.temp_C || weather.raw?.current_condition?.[0].temp_C;
|
|
82
|
+
console.log(chalk.gray(` Current: ${description || 'Unknown'}, ${tempC || '?'}°C`));
|
|
83
|
+
}
|
|
84
|
+
const now = new Date();
|
|
85
|
+
console.log(chalk.gray(` Current Time: ${now.toLocaleTimeString()}`));
|
|
86
|
+
const sourceDesc = weather.source === 'api'
|
|
87
|
+
? 'wttr.in API (Current Condition)'
|
|
88
|
+
: weather.source === 'forecast'
|
|
89
|
+
? 'Hourly Forecast (Cache)'
|
|
90
|
+
: 'Cache (Current Condition)';
|
|
91
|
+
console.log(chalk.gray(` Source: ${sourceDesc}`));
|
|
92
|
+
if (weather.effectiveTime) {
|
|
93
|
+
const timeInfo = [weather.effectiveTime];
|
|
94
|
+
if (weather.dataTimestamp) {
|
|
95
|
+
const diffMs = now.getTime() - weather.dataTimestamp;
|
|
96
|
+
const diffMins = Math.round(Math.abs(diffMs) / 60000);
|
|
97
|
+
const relativeStr = diffMs >= 0 ? `${diffMins}m ago` : `in ${diffMins}m`;
|
|
98
|
+
timeInfo.push(`(${relativeStr})`);
|
|
99
|
+
}
|
|
100
|
+
console.log(chalk.gray(` Weather Time: ${timeInfo.join(' ')}`));
|
|
101
|
+
}
|
|
102
|
+
console.log(chalk.blue(' Lighting Parameters:'));
|
|
103
|
+
console.log(chalk.gray(` Cloud Cover: ${Math.round((weather.cloudCover ?? 0) * 100)}%`));
|
|
104
|
+
console.log(chalk.gray(` Precipitation: ${weather.precipitation ?? 'none'}`));
|
|
105
|
+
if (options.debug && weather.raw) {
|
|
106
|
+
console.log(chalk.gray(' Full data:'), JSON.stringify(weather.raw.current_condition[0], null, 2));
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
export default registerWeather;
|
|
111
|
+
//# 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,QAiB9D;
|
|
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;AAqKD,eAAe,WAAW,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
2
|
import { VALIDATION_RANGES } from '../../deviceControl/constants.js';
|
|
3
|
-
import { addStandardOptions, runDeviceAction } from '../cmdUtils.js';
|
|
3
|
+
import { addStandardOptions, commandCallbackPromise, getLightDevices, runDeviceAction } from '../cmdUtils.js';
|
|
4
4
|
export function registerCct(program, deps) {
|
|
5
5
|
const { asyncCommand } = deps;
|
|
6
6
|
addStandardOptions(program
|
|
@@ -14,17 +14,21 @@ export function registerCct(program, deps) {
|
|
|
14
14
|
function handleCct(deps) {
|
|
15
15
|
return async (tempStr, deviceQuery, options) => {
|
|
16
16
|
if (options.get) {
|
|
17
|
+
const targetDevice = deviceQuery ?? tempStr;
|
|
17
18
|
return runDeviceAction({
|
|
18
19
|
deps,
|
|
19
20
|
options,
|
|
20
|
-
deviceQuery,
|
|
21
|
+
deviceQuery: targetDevice,
|
|
21
22
|
actionName: 'get temperature',
|
|
22
23
|
}, async (device, controller) => {
|
|
23
24
|
return new Promise((resolve) => {
|
|
24
25
|
controller.getCCT(device.node_id, (success, message, data) => {
|
|
25
|
-
if (!success)
|
|
26
|
-
throw new Error(message);
|
|
27
26
|
const displayName = device.device_name || device.name || device.id || device.node_id || 'Unknown';
|
|
27
|
+
if (!success) {
|
|
28
|
+
console.error(chalk.red(`✗ ${displayName}: Failed to get CCT: ${message}`));
|
|
29
|
+
resolve();
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
28
32
|
// Handle potential nesting: { data: { data: 1700 } } or { data: { cct: 1700 } }
|
|
29
33
|
let state = data;
|
|
30
34
|
if (state && typeof state === 'object' && 'data' in state) {
|
|
@@ -56,7 +60,7 @@ function handleCct(deps) {
|
|
|
56
60
|
return;
|
|
57
61
|
}
|
|
58
62
|
// Filter for light devices only, skipping groups like 'ALL'
|
|
59
|
-
const lightDevices = devices
|
|
63
|
+
const lightDevices = getLightDevices(devices);
|
|
60
64
|
if (lightDevices.length === 0) {
|
|
61
65
|
console.log(chalk.yellow('No light devices found'));
|
|
62
66
|
return;
|
|
@@ -132,13 +136,7 @@ function handleCct(deps) {
|
|
|
132
136
|
return msg;
|
|
133
137
|
},
|
|
134
138
|
}, (device, controller) => {
|
|
135
|
-
return
|
|
136
|
-
controller.setCCT(device.node_id, temperature, intensity, (success, message) => {
|
|
137
|
-
if (!success)
|
|
138
|
-
throw new Error(message);
|
|
139
|
-
resolve();
|
|
140
|
-
});
|
|
141
|
-
});
|
|
139
|
+
return commandCallbackPromise((callback) => controller.setCCT(device.node_id, temperature, intensity, callback));
|
|
142
140
|
}, async (controller) => {
|
|
143
141
|
await controller.setCCTAndIntensityForAllLights(temperature, intensity, (success, message) => {
|
|
144
142
|
if (!success)
|
|
@@ -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;
|
|
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,QAahE;
|
|
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;AA+OD,eAAe,aAAa,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import chalk from 'chalk';
|
|
2
|
-
import { addStandardOptions, runDeviceAction } from '../cmdUtils.js';
|
|
2
|
+
import { addStandardOptions, commandCallbackPromise, getLightDevices, runDeviceAction } from '../cmdUtils.js';
|
|
3
3
|
export function registerColor(program, deps) {
|
|
4
4
|
const { asyncCommand } = deps;
|
|
5
5
|
addStandardOptions(program
|
|
@@ -103,7 +103,7 @@ function handleColor(deps) {
|
|
|
103
103
|
return;
|
|
104
104
|
}
|
|
105
105
|
// Filter for light devices only
|
|
106
|
-
const lightDevices = devices
|
|
106
|
+
const lightDevices = getLightDevices(devices);
|
|
107
107
|
if (lightDevices.length === 0) {
|
|
108
108
|
console.log(chalk.yellow('No light devices found'));
|
|
109
109
|
return;
|
|
@@ -201,13 +201,7 @@ function handleColor(deps) {
|
|
|
201
201
|
return msg;
|
|
202
202
|
},
|
|
203
203
|
}, (device, controller) => {
|
|
204
|
-
return
|
|
205
|
-
controller.setColor(device.node_id, color, intensity, (success, message) => {
|
|
206
|
-
if (!success)
|
|
207
|
-
throw new Error(message);
|
|
208
|
-
resolve();
|
|
209
|
-
});
|
|
210
|
-
});
|
|
204
|
+
return commandCallbackPromise((callback) => controller.setColor(device.node_id, color, intensity, callback));
|
|
211
205
|
}, async (controller) => {
|
|
212
206
|
await controller.setColorForAllLights(color, intensity, (success, message) => {
|
|
213
207
|
if (!success)
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"color.js","sourceRoot":"","sources":["../../../src/commands/deviceControl/color.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/commands/deviceControl/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/commands/deviceControl/config.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,OAAO,KAAK,EAAE,WAAW,EAAU,MAAM,8BAA8B,CAAC;AAqBxE,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,QAyBzE"}
|