Merge branch 'master' of github.com:TuyaAPI/cli

Author: codetheweb

cli.js

@@ -8,8 +8,8 @@ const Configstore = require('configstore');
 // Import local files
 const cloud = require('./lib/cloud');
 const link = require('./lib/link');
-const listApp = require('./lib/list-app.js');
-const mock = require('./lib/mock.js');
+const listApp = require('./lib/list-app');
+const mock = require('./lib/mock');
 const control = require('./lib/control');
 const wizard = require('./lib/wizard');
 const pkg = require('./package.json');
@@ -54,8 +54,9 @@ program
 	.option('--ip <ip_addr>', 'ip address of device')
 	.option('--id <id>', 'id of device')
 	.option('--key [key]', 'key of device')
-	.option('--dps [dps]', 'property index to get', 1)
-	.option('-a, --all', 'get all properties of a device', false)
+	.option('--cid [cid_zigbee_device]', 'if specified, use device id of zigbee gateway and cid of subdevice to get its status')
+	.option('--dps [dps]', 'property index to get')
+	.option('--full', 'get full response payload', false)
 	.option('--protocol-version [version]', 'tuya protocol version', parseFloat, 3.1)
 	.action(options => {
 		control.get(conf, options);
@@ -69,6 +70,7 @@ program
 	.option('--ip <ip_addr>', 'ip address of device')
 	.option('--id <id>', 'id of device')
 	.option('--key [key]', 'key of device')
+	.option('--cid [cid_zigbee_device]', 'if specified, use device id of zigbee gateway and cid of subdevice to set its property')
 	.option('--set <set>', 'value to set')
 	.option('--raw-value', 'pass the raw set value without attempting to parse it from a string')
 	.option('--dps [dps]', 'DPS index to set', 1)

lib/control.js

@@ -3,11 +3,24 @@ const TuyAPI = require('tuyapi');
 const c = require('./common');
 
 function parseConfig(config, options) {
-	if (options.id === undefined) {
+	const apiOptions = {
+		issueGetOnConnect: false,
+		version: options.protocolVersion,
+		id: options.id,
+		ip: options.ip,
+		key: options.key || config.get(options.id)
+	};
+
+	// If key is not given and does not exit in config
+	if (!apiOptions.key) {
 		c.badArgument(options);
 	}
 
-	if (Number.isNaN(Number(options.protocolVersion))) {
+	if (!apiOptions.id) {
+		c.badArgument(options);
+	}
+
+	if (Number.isNaN(Number(apiOptions.version))) {
 		c.badArgument(options);
 	}
 
@@ -16,26 +29,7 @@ function parseConfig(config, options) {
 		config.set(options.id, options.key);
 	}
 
-	// If key is not given but exists in config
-	if (options.key === undefined && config.get(options.id) !== undefined) {
-		if (options.ip === undefined) {
-			return new TuyAPI({version: options.protocolVersion, id: options.id, key: config.get(options.id)});
-		}
-
-		return new TuyAPI({version: options.protocolVersion, ip: options.ip, id: options.id, key: config.get(options.id)});
-	}
-
-	// If key is not given and does not exit in config
-	if (options.key === undefined && config.get(options.id) === undefined) {
-		c.badArgument(options);
-	} else {
-		// If both arguments are given
-		if (options.ip === undefined) {
-			return new TuyAPI({version: options.protocolVersion, id: options.id, key: options.key});
-		}
-
-		return new TuyAPI({version: options.protocolVersion, ip: options.ip, id: options.id, key: options.key});
-	}
+	return new TuyAPI(apiOptions);
 }
 
 async function get(config, options) {
@@ -46,14 +40,20 @@ async function get(config, options) {
 
 		await tuya.connect();
 
-		const properties = await tuya.get({schema: true});
+		const properties = await tuya.get({schema: true, cid: options.cid, dps: options.dps});
 
 		tuya.disconnect();
 
-		if (options.all) {
-			console.log(JSON.stringify(properties));
+		if (properties) {
+			if (options.dps) {
+				console.log(properties.dps[options.dps]);
+			} else if (options.full) {
+				console.log(properties);
+			} else {
+				console.log(properties.dps);
+			}
 		} else {
-			console.log(properties.dps[options.dps]);
+			throw new Error('No response from device');
 		}
 	} catch (error) {
 		console.log(error);
@@ -82,7 +82,7 @@ async function set(config, options) {
 
 		await tuya.connect();
 
-		await tuya.set({set: options.set, dps: options.dps});
+		await tuya.set({set: options.set, dps: options.dps, cid: options.cid});
 
 		tuya.disconnect();
 

lib/wizard.js

@@ -96,15 +96,47 @@ const list = async (conf, options) => {
 	// Get user devices
 	const api = new OpenAPI({key: answers.apiKey, secret: answers.apiSecret, region: foundAPIRegion});
 	await api.getToken();
+
 	const devices = await api.getDevicesByUser(userId);
 
+	const groupedDevices = {};
+	for (const device of devices) {
+		if (device.node_id) {
+			if (!groupedDevices[device.local_key] || !groupedDevices[device.local_key].subDevices) {
+				groupedDevices[device.local_key] = {...groupedDevices[device.local_key], subDevices: []};
+			}
+
+			groupedDevices[device.local_key].subDevices.push(device);
+		} else {
+			groupedDevices[device.local_key] = {...device, ...groupedDevices[device.local_key]};
+		}
+	}
+
 	// Output devices
-	const prettyDevices = devices.map(device => ({name: device.name, id: device.id, key: device.local_key}));
+	const prettyDevices = Object.values(groupedDevices).map(device => {
+		const pretty = {
+			name: device.name,
+			id: device.id,
+			key: device.local_key
+		};
+
+		if (device.subDevices) {
+			const prettySubDevices = device.subDevices.map(subDevice => ({
+				name: subDevice.name,
+				id: subDevice.id,
+				cid: subDevice.node_id
+			}));
+
+			pretty.subDevices = prettySubDevices;
+		}
+
+		return pretty;
+	});
 
 	if (options.stringify) {
 		console.log(JSON.stringify(prettyDevices));
 	} else {
-		console.log(prettyDevices);
+		console.dir(prettyDevices, {depth: 3});
 	}
 
 	// Save API key and secret