homebridge-cmd4 6.0.0 → 6.0.4
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/CHANGELOG.md +30 -0
- package/Cmd4Accessory.js +115 -143
- package/Cmd4Platform.js +19 -0
- package/RUNNING_CHANGELOG.md +36 -0
- package/docs/Developers.md +1 -1
- package/package.json +2 -2
- package/homebridge-ui/public/index.html.1 +0 -248
- package/homebridge-ui/public/index.html.2 +0 -257
- package/homebridge-ui/public/index.html.3 +0 -265
- package/homebridge-ui/public/index.html.3.1 +0 -244
- package/homebridge-ui/public/index.html.wemo.1 +0 -194
- package/homebridge-ui/public/index.html.wemo.2 +0 -339
- package/homebridge-ui/public/js/main.js.1 +0 -583
- package/homebridge-ui/public/js/main.js.2 +0 -583
- package/homebridge-ui/public/js/main.js.3 +0 -583
- package/homebridge-ui/public/js/schema.js.save +0 -196
- package/homebridge-ui/public/js/wmain.js.1 +0 -152
- package/homebridge-ui/public/js/wmain.js.2 +0 -161
- package/homebridge-ui/server.js.1 +0 -281
- package/homebridge-ui/server.js.2 +0 -281
- package/homebridge-ui/server.js.3 +0 -281
- package/homebridge-ui/server.js.wemo.1 +0 -78
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,33 @@
|
|
|
1
|
+
# Homebridges-cmd4 - CMD4 Plugin for Homebridge - Supports ~All Accessory Types and now all Characteristics too!!
|
|
2
|
+
#### 6.0.4 (2021-12-31)
|
|
3
|
+
|
|
4
|
+
##### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Constants were not getting passed down to linked types ([b7252bf9](https://github.com/ztalbot2000/homebridge-cmd4/commit/b7252bf934e26535047008f343f4d6b627dd6ddb))
|
|
7
|
+
|
|
8
|
+
# Homebridges-cmd4 - CMD4 Plugin for Homebridge - Supports ~All Accessory Types and now all Characteristics too!!
|
|
9
|
+
### 6.0.3 (2021-11-11)
|
|
10
|
+
|
|
11
|
+
##### Bug Fix
|
|
12
|
+
|
|
13
|
+
* Schema Prep for Homebridge-UI integration ([2c5df2c1](https://github.com/ztalbot2000/homebridge-cmd4/commit/2c5df2c1279ebe88fdaedbaa22ae0124e2841b6d))
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
# Homebridges-cmd4 - CMD4 Plugin for Homebridge - Supports ~All Accessory Types and now all Characteristics too!!
|
|
17
|
+
### 6.0.2 (2021-11-10)
|
|
18
|
+
|
|
19
|
+
##### Bug Fix
|
|
20
|
+
|
|
21
|
+
* Schema Prep - For Homebridge-ui schema must have defined keys ([3053780b](https://github.com/ztalbot2000/homebridge-cmd4/commit/3053780b40eb3d4505dc407411257109977688a1))
|
|
22
|
+
|
|
23
|
+
# Homebridges-cmd4 - CMD4 Plugin for Homebridge - Supports ~All Accessory Types and now all Characteristics too!!
|
|
24
|
+
#### 6.0.1 (2021-11-07)
|
|
25
|
+
|
|
26
|
+
##### Bug Fixes
|
|
27
|
+
|
|
28
|
+
* For bug[#116](https://github.com/ztalbot2000/homebridge-cmd4/pull/116) remove stateCmd validation and for AirCon add global const parsing ([e7bc4963](https://github.com/ztalbot2000/homebridge-cmd4/commit/e7bc49630c47d16d296ff9751df7c7666cf2ecd3))
|
|
29
|
+
|
|
30
|
+
|
|
1
31
|
# Homebridges-cmd4 - CMD4 Plugin for Homebridge - Supports ~All Accessory Types and now all Characteristics too!!
|
|
2
32
|
## 6.0.0 (2021-10-01)
|
|
3
33
|
|
package/Cmd4Accessory.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
const moment = require( "moment" );
|
|
4
|
-
const fs = require( "fs" );
|
|
5
|
-
const commandExistsSync = require( "command-exists" ).sync;
|
|
6
4
|
|
|
7
5
|
// Settings, Globals and Constants
|
|
8
6
|
let settings = require( "./cmd4Settings" );
|
|
@@ -239,6 +237,16 @@ class Cmd4Accessory
|
|
|
239
237
|
);
|
|
240
238
|
}
|
|
241
239
|
|
|
240
|
+
// Add the global constants to the listOfConstants
|
|
241
|
+
if ( this.parentInfo && this.parentInfo.globalConstants != null )
|
|
242
|
+
{
|
|
243
|
+
this.processConstants( this.parentInfo.globalConstants );
|
|
244
|
+
// Since linked accessories get processed first, The parentInfo they
|
|
245
|
+
// get is actually "this" and we need for the linked accessory to
|
|
246
|
+
// process the constants first in order to see them. i.e. ${IP}
|
|
247
|
+
this.globalConstants = this.parentInfo.globalConstants;
|
|
248
|
+
}
|
|
249
|
+
|
|
242
250
|
// Direct if polling should be set or false.
|
|
243
251
|
// You cannot copy polling from the parent because you would be copying the array
|
|
244
252
|
// of polled characteristics that the child does not have, or turning on polling
|
|
@@ -1237,68 +1245,7 @@ class Cmd4Accessory
|
|
|
1237
1245
|
if ( typeof state_cmd != "string" )
|
|
1238
1246
|
throw new Error( `No state_cmd for: "${ this.displayName }".` );
|
|
1239
1247
|
|
|
1240
|
-
|
|
1241
|
-
// Split the state_cmd into words.
|
|
1242
|
-
let cmdArray = state_cmd.match(/\S+/gi);
|
|
1243
|
-
|
|
1244
|
-
// Assume no words
|
|
1245
|
-
let arrayLength = 0;
|
|
1246
|
-
|
|
1247
|
-
// Get the number of words
|
|
1248
|
-
if ( cmdArray )
|
|
1249
|
-
arrayLength = cmdArray.length;
|
|
1250
|
-
|
|
1251
|
-
// Check that the state_cmd is valid.
|
|
1252
|
-
// The first word must be in the persons path
|
|
1253
|
-
// The second word, if it exists must be a file
|
|
1254
|
-
// and have the correct path.
|
|
1255
|
-
switch ( arrayLength )
|
|
1256
|
-
{
|
|
1257
|
-
case 0:
|
|
1258
|
-
this.log.error( `No state_cmd given` );
|
|
1259
|
-
return false;
|
|
1260
|
-
default:
|
|
1261
|
-
{
|
|
1262
|
-
let checkFile = cmdArray[ arrayLength -1 ];
|
|
1263
|
-
|
|
1264
|
-
try {
|
|
1265
|
-
fs.accessSync( checkFile, fs.F_OK );
|
|
1266
|
-
// File exists - OK
|
|
1267
|
-
|
|
1268
|
-
} catch ( e ) {
|
|
1269
|
-
// It isn't accessible
|
|
1270
|
-
throw new Error( `The file: "${ checkFile }" does not exist, It is highly likely the state_cmd will fail. Hint: Do not use wildcards that would normally be expanded by a shell.` );
|
|
1271
|
-
}
|
|
1272
|
-
}
|
|
1273
|
-
// Purposely fall through to check the command as well
|
|
1274
|
-
// break omitted
|
|
1275
|
-
case 1:
|
|
1276
|
-
{
|
|
1277
|
-
let checkCmd = cmdArray[ 0 ];
|
|
1278
|
-
|
|
1279
|
-
// if the lone command is a path to a command
|
|
1280
|
-
// Then check if it exists, oTherwise check if it is
|
|
1281
|
-
// in Their path.
|
|
1282
|
-
if ( checkCmd.charAt( 0 ) == "/" || (
|
|
1283
|
-
checkCmd.length > 1 &&
|
|
1284
|
-
checkCmd.charAt( 0 ) == "." &&
|
|
1285
|
-
checkCmd.charAt( 1 ) == "/" )
|
|
1286
|
-
)
|
|
1287
|
-
{
|
|
1288
|
-
try {
|
|
1289
|
-
fs.accessSync( checkCmd, fs.F_OK );
|
|
1290
|
-
// File exists - OK
|
|
1291
|
-
} catch ( e ) {
|
|
1292
|
-
throw new Error( `The file: "${ checkCmd }" does not exist, It is highly likely the state_cmd will fail. Hint: Do not use wildcards that would normally be expanded by a shell.` );
|
|
1293
|
-
}
|
|
1294
|
-
} else
|
|
1295
|
-
{
|
|
1296
|
-
if ( ! commandExistsSync( checkCmd ) )
|
|
1297
|
-
throw new Error( `The file: "${ checkCmd }" does not exist, It is highly likely the state_cmd will fail. Hint: Do not use wildcards that would normally be expanded by a shell.` );
|
|
1298
|
-
}
|
|
1299
|
-
break;
|
|
1300
|
-
}
|
|
1301
|
-
}
|
|
1248
|
+
// This was messy, did not like spaces. let the user be the judge of it.
|
|
1302
1249
|
return true;
|
|
1303
1250
|
}
|
|
1304
1251
|
|
|
@@ -1321,11 +1268,8 @@ class Cmd4Accessory
|
|
|
1321
1268
|
let accTypeEnumIndex = rcDirective.accTypeEnumIndex;
|
|
1322
1269
|
|
|
1323
1270
|
// Do not update the stored values as it is being restored from cache
|
|
1324
|
-
this.log.debug( `Checking to see if value should be set ${ parseConfigShouldUseCharacteristicValues }` );
|
|
1325
1271
|
if ( parseConfigShouldUseCharacteristicValues == false )
|
|
1326
1272
|
return;
|
|
1327
|
-
//this.log.debug( `Going to set its value` );
|
|
1328
|
-
|
|
1329
1273
|
|
|
1330
1274
|
if ( Object.keys( CMD4_ACC_TYPE_ENUM.properties[ accTypeEnumIndex ].validValues ).length > 0 )
|
|
1331
1275
|
{
|
|
@@ -1349,108 +1293,99 @@ class Cmd4Accessory
|
|
|
1349
1293
|
this.cmd4Storage.setStoredValueForIndex( accTypeEnumIndex, properValue );
|
|
1350
1294
|
}
|
|
1351
1295
|
|
|
1352
|
-
processRequires(
|
|
1296
|
+
processRequires( requiresArray )
|
|
1353
1297
|
{
|
|
1354
|
-
if ( Array.isArray (
|
|
1355
|
-
|
|
1356
|
-
for ( let required in requires )
|
|
1357
|
-
this.processRequires( requires[ required ] );
|
|
1298
|
+
if ( ! Array.isArray ( requiresArray ) )
|
|
1299
|
+
throw new Error( `requires must be an array of { "require": "some requires string" }` );
|
|
1358
1300
|
|
|
1359
|
-
|
|
1360
|
-
|
|
1361
|
-
if ( isJSON( requires ) )
|
|
1301
|
+
// Iterate over the groups of key/value constants in the array.
|
|
1302
|
+
for ( let argIndex = 0; argIndex < requiresArray.length; argIndex++ )
|
|
1362
1303
|
{
|
|
1363
|
-
|
|
1364
|
-
for ( let key in requires )
|
|
1365
|
-
{
|
|
1366
|
-
let required = requires[ key ] ;
|
|
1304
|
+
let argEntry = requiresArray[ argIndex ];
|
|
1367
1305
|
|
|
1368
|
-
|
|
1369
|
-
|
|
1306
|
+
if ( argEntry.require == undefined )
|
|
1307
|
+
throw new Error( `Requires definition at index: "${ argIndex }" has no "require":"SomeRequire"` );
|
|
1370
1308
|
|
|
1309
|
+
let required = argEntry.require;
|
|
1371
1310
|
|
|
1372
|
-
|
|
1311
|
+
if ( typeof required != "string" )
|
|
1312
|
+
throw new Error( `Requires definition: "${ required }" must be a string.` );
|
|
1313
|
+
required = this.replaceConstantsInString( required );
|
|
1373
1314
|
|
|
1374
|
-
|
|
1375
|
-
|
|
1376
|
-
|
|
1315
|
+
if ( settings.cmd4Dbg ) this.log.debug( `Requiring ${ required }` );
|
|
1316
|
+
|
|
1317
|
+
require( required );
|
|
1377
1318
|
}
|
|
1378
|
-
throw new Error( `Requires must be an array of/or list of key/value pairs: "${ requires }".` );
|
|
1379
1319
|
}
|
|
1380
1320
|
|
|
1381
|
-
processConstants(
|
|
1321
|
+
processConstants( constantsArgArray )
|
|
1382
1322
|
{
|
|
1383
|
-
if ( Array.isArray (
|
|
1384
|
-
|
|
1385
|
-
for ( let constant in constantArg )
|
|
1386
|
-
this.processConstants( constantArg[ constant ] );
|
|
1323
|
+
if ( ! Array.isArray ( constantsArgArray ) )
|
|
1324
|
+
throw new Error( `Constants must be an array of { "key": "\${SomeKey}", "value": "some replacement string" }` );
|
|
1387
1325
|
|
|
1388
|
-
|
|
1389
|
-
|
|
1390
|
-
|
|
1326
|
+
|
|
1327
|
+
// Iterate over the groups of key/value constants in the array.
|
|
1328
|
+
for ( let argIndex = 0; argIndex < constantsArgArray.length; argIndex++ )
|
|
1391
1329
|
{
|
|
1392
|
-
|
|
1393
|
-
for ( let key in constantArg )
|
|
1394
|
-
{
|
|
1395
|
-
let keyToAdd = key ;
|
|
1396
|
-
let valueToAdd = constantArg[ key ] ;
|
|
1397
|
-
if ( ! keyToAdd.startsWith( "${" ) )
|
|
1398
|
-
throw new Error( `Constant definition for: "${ keyToAdd }" must start with "\${" for clarity.` );
|
|
1330
|
+
let argEntry = constantsArgArray[ argIndex ];
|
|
1399
1331
|
|
|
1332
|
+
if ( argEntry.key == undefined )
|
|
1333
|
+
throw new Error( `Constant definition at index: "${ argIndex }" has no "key":"\${SomeKey}"` );
|
|
1400
1334
|
|
|
1401
|
-
|
|
1402
|
-
|
|
1335
|
+
if ( argEntry.value == undefined )
|
|
1336
|
+
throw new Error( `Constant definition at index: "${ argIndex }" has no "value":"Some replacement string` );
|
|
1403
1337
|
|
|
1338
|
+
let keyToAdd = argEntry.key;
|
|
1339
|
+
let valueToAdd = argEntry.value;
|
|
1340
|
+
if ( ! keyToAdd.startsWith( "${" ) )
|
|
1341
|
+
throw new Error( `Constant definition for: "${ keyToAdd }" must start with "\${" for clarity.` );
|
|
1404
1342
|
|
|
1405
|
-
|
|
1406
|
-
|
|
1407
|
-
valueToAdd.replace(/^'/, "")
|
|
1408
|
-
valueToAdd.replace(/'$/, "")
|
|
1343
|
+
if ( ! keyToAdd.endsWith( "}" ) )
|
|
1344
|
+
throw new Error( `Constant definition for: "${ keyToAdd }" must end with "}" for clarity.` );
|
|
1409
1345
|
|
|
1410
|
-
|
|
1411
|
-
|
|
1412
|
-
|
|
1413
|
-
|
|
1346
|
+
// remove any leading and trailing single quotes
|
|
1347
|
+
// so that using it for replacement will be easier.
|
|
1348
|
+
valueToAdd.replace(/^'/, "")
|
|
1349
|
+
valueToAdd.replace(/'$/, "")
|
|
1414
1350
|
|
|
1415
|
-
|
|
1351
|
+
// Do not check for duplicates. Linked accessories add the same
|
|
1352
|
+
// ${IP} for example
|
|
1353
|
+
this.listOfConstants[ keyToAdd ] = valueToAdd;
|
|
1354
|
+
}
|
|
1416
1355
|
}
|
|
1417
1356
|
|
|
1418
|
-
processVariables(
|
|
1357
|
+
processVariables( variablesArgArray )
|
|
1419
1358
|
{
|
|
1420
|
-
if ( Array.isArray (
|
|
1421
|
-
|
|
1422
|
-
for ( let variable in variables )
|
|
1423
|
-
this.processConstants( variables[ variable ] );
|
|
1359
|
+
if ( ! Array.isArray ( variablesArgArray ) )
|
|
1360
|
+
throw new Error( `Variables must be an array of { "key": "\${SomeKey}", "value": "some replacement string" }` );
|
|
1424
1361
|
|
|
1425
|
-
|
|
1426
|
-
|
|
1427
|
-
|
|
1362
|
+
|
|
1363
|
+
// Iterate over the groups of key/value constants in the array.
|
|
1364
|
+
for ( let argIndex = 0; argIndex < variablesArgArray.length; argIndex++ )
|
|
1428
1365
|
{
|
|
1429
|
-
|
|
1430
|
-
for ( let key in variables )
|
|
1431
|
-
{
|
|
1432
|
-
let keyToAdd = key ;
|
|
1433
|
-
let valueToAdd = variables[ key ] ;
|
|
1434
|
-
if ( ! keyToAdd.startsWith( "${" ) )
|
|
1435
|
-
throw new Error( `Variable definition for: "${ keyToAdd }" must start with "\${" for clarity.` );
|
|
1366
|
+
let argEntry = variablesArgArray[ argIndex ];
|
|
1436
1367
|
|
|
1437
|
-
|
|
1438
|
-
|
|
1368
|
+
if ( argEntry.key == undefined )
|
|
1369
|
+
throw new Error( `Variable definition at index: "${ argIndex }" has no "key":"\${SomeKey}"` );
|
|
1439
1370
|
|
|
1440
|
-
|
|
1441
|
-
|
|
1442
|
-
valueToAdd.replace(/^'/, "")
|
|
1443
|
-
valueToAdd.replace(/'$/, "")
|
|
1371
|
+
if ( argEntry.value == undefined )
|
|
1372
|
+
throw new Error( `Variable definition at index: "${ argIndex }" has no "value":"Some replacement string` );
|
|
1444
1373
|
|
|
1445
|
-
|
|
1446
|
-
|
|
1374
|
+
let keyToAdd = argEntry.key;
|
|
1375
|
+
let valueToAdd = argEntry.value;
|
|
1376
|
+
if ( ! keyToAdd.startsWith( "${" ) )
|
|
1377
|
+
throw new Error( `Variable definition for: "${ keyToAdd }" must start with "\${" for clarity.` );
|
|
1447
1378
|
|
|
1448
|
-
|
|
1449
|
-
|
|
1450
|
-
|
|
1451
|
-
|
|
1379
|
+
if ( ! keyToAdd.endsWith( "}" ) )
|
|
1380
|
+
throw new Error( `Variable definition for: "${ keyToAdd }" must end with "}" for clarity.` );
|
|
1381
|
+
|
|
1382
|
+
// remove any leading and trailing single quotes
|
|
1383
|
+
// so that using it for replacement will be easier.
|
|
1384
|
+
valueToAdd.replace(/^'/, "")
|
|
1385
|
+
valueToAdd.replace(/'$/, "")
|
|
1452
1386
|
|
|
1453
|
-
|
|
1387
|
+
this.listOfVariables[ keyToAdd ] = valueToAdd;
|
|
1388
|
+
}
|
|
1454
1389
|
}
|
|
1455
1390
|
|
|
1456
1391
|
accessoryTypeConfigToCmd4Accessories( config, parentInfo )
|
|
@@ -1537,7 +1472,7 @@ class Cmd4Accessory
|
|
|
1537
1472
|
throw new Error( `Unknown device type: "${ value }" given in: "${ this.displayName }".` );
|
|
1538
1473
|
|
|
1539
1474
|
// warn now
|
|
1540
|
-
this.log.warn( `The config.json Cmd4 device type: ${ value } is lowerCase. It should be: ${ rcValue.deviceName }. In the near future this will be an error for homebridge-
|
|
1475
|
+
this.log.warn( `The config.json Cmd4 device type: ${ value } is lowerCase. It should be: ${ rcValue.deviceName }. In the near future this will be an error for homebridge-UI integration.\nTo remove this Warning, Please fix your config.json.` );
|
|
1541
1476
|
|
|
1542
1477
|
this.type = rcValue.deviceName;
|
|
1543
1478
|
}
|
|
@@ -1606,6 +1541,9 @@ class Cmd4Accessory
|
|
|
1606
1541
|
|
|
1607
1542
|
break;
|
|
1608
1543
|
case constants.QUEUETYPES:
|
|
1544
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the accessory level. Please move it to where "Platform: "Cmd4" is located in your config.json.` );
|
|
1545
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1546
|
+
|
|
1609
1547
|
parseAddQueueTypes( this.log, value );
|
|
1610
1548
|
|
|
1611
1549
|
break;
|
|
@@ -1631,6 +1569,7 @@ class Cmd4Accessory
|
|
|
1631
1569
|
case constants.POLLING:
|
|
1632
1570
|
// Do not parse it yet as characteristics must be set first.
|
|
1633
1571
|
this.polling = value;
|
|
1572
|
+
|
|
1634
1573
|
break;
|
|
1635
1574
|
case "Cmd4_Mode":
|
|
1636
1575
|
case "cmd4_Mode":
|
|
@@ -1656,6 +1595,7 @@ class Cmd4Accessory
|
|
|
1656
1595
|
break;
|
|
1657
1596
|
case constants.STATE_CMD_SUFFIX:
|
|
1658
1597
|
// This gets added after any Get/Set <value>
|
|
1598
|
+
// We replace any constants already defined
|
|
1659
1599
|
this.state_cmd_suffix = value;
|
|
1660
1600
|
|
|
1661
1601
|
break;
|
|
@@ -1665,18 +1605,30 @@ class Cmd4Accessory
|
|
|
1665
1605
|
|
|
1666
1606
|
break;
|
|
1667
1607
|
case constants.STORAGE:
|
|
1608
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
1609
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1610
|
+
|
|
1668
1611
|
this.storage = value;
|
|
1669
1612
|
|
|
1670
1613
|
break;
|
|
1671
1614
|
case constants.STORAGEPATH:
|
|
1615
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
1616
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1617
|
+
|
|
1672
1618
|
this.storagePath = value
|
|
1673
1619
|
|
|
1674
1620
|
break;
|
|
1675
1621
|
case constants.FOLDER:
|
|
1622
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
1623
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1624
|
+
|
|
1676
1625
|
this.folder = value
|
|
1677
1626
|
|
|
1678
1627
|
break;
|
|
1679
1628
|
case constants.KEYPATH:
|
|
1629
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
1630
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1631
|
+
|
|
1680
1632
|
this.keyPath = value
|
|
1681
1633
|
|
|
1682
1634
|
break;
|
|
@@ -1690,6 +1642,9 @@ class Cmd4Accessory
|
|
|
1690
1642
|
|
|
1691
1643
|
break;
|
|
1692
1644
|
case constants.CONSTANTS:
|
|
1645
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Accessory level. Please move it to where "Platform: "Cmd4" is located in your config.json.` );
|
|
1646
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1647
|
+
|
|
1693
1648
|
this.processConstants( value );
|
|
1694
1649
|
|
|
1695
1650
|
break;
|
|
@@ -1712,6 +1667,9 @@ class Cmd4Accessory
|
|
|
1712
1667
|
|
|
1713
1668
|
break;
|
|
1714
1669
|
case constants.ALLOWTLV8:
|
|
1670
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Accessory level. Please move it to where "Platform: "Cmd4" is located.` );
|
|
1671
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1672
|
+
|
|
1715
1673
|
this.allowTLV8 = value;
|
|
1716
1674
|
break;
|
|
1717
1675
|
default:
|
|
@@ -1766,9 +1724,15 @@ class Cmd4Accessory
|
|
|
1766
1724
|
|
|
1767
1725
|
// Handle seperation of strings of state_cmd for a suffix
|
|
1768
1726
|
if ( this.state_cmd_suffix )
|
|
1769
|
-
|
|
1770
|
-
|
|
1727
|
+
{
|
|
1728
|
+
if ( typeof this.state_cmd_suffix != "string" )
|
|
1729
|
+
throw new Error( `state_cmd_suffix must be a string: "${ this.state_cmd_suffix }".` );
|
|
1730
|
+
|
|
1731
|
+
this.state_cmd_suffix = " " + this.replaceConstantsInString( this.state_cmd_suffix );
|
|
1732
|
+
} else
|
|
1733
|
+
{
|
|
1771
1734
|
this.state_cmd_suffix = "";
|
|
1735
|
+
}
|
|
1772
1736
|
|
|
1773
1737
|
if ( this.typeIndex == CMD4_DEVICE_TYPE_ENUM.Television )
|
|
1774
1738
|
{
|
|
@@ -1971,6 +1935,9 @@ class Cmd4Accessory
|
|
|
1971
1935
|
if ( this.queue && this.queue.queueName != value )
|
|
1972
1936
|
throw new Error( chalk.red( `Already defined Priority Polling Queue "${ this.queue.queueName }" for ${ this.displayName } cannot be redefined.` ) );
|
|
1973
1937
|
|
|
1938
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the polling level. Please define it for the accessory: ${ this.displayName } as "queue": "${ value }"` );
|
|
1939
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1940
|
+
|
|
1974
1941
|
this.queue = addQueue( this.log, value, constants.QUEUETYPE_WORM );
|
|
1975
1942
|
|
|
1976
1943
|
break;
|
|
@@ -1996,6 +1963,11 @@ class Cmd4Accessory
|
|
|
1996
1963
|
}
|
|
1997
1964
|
case constants.QUEUETYPES:
|
|
1998
1965
|
{
|
|
1966
|
+
// WHY IS THIS HERE AT ALL ??????????
|
|
1967
|
+
|
|
1968
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the accessory level. Please move it to where "Platform: "Cmd4" is located in your config.json.` );
|
|
1969
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
1970
|
+
|
|
1999
1971
|
parseAddQueueTypes( this.log, value );
|
|
2000
1972
|
// This whole record is not a characteristic polling entry
|
|
2001
1973
|
// continue to next ( via return )
|
package/Cmd4Platform.js
CHANGED
|
@@ -89,6 +89,7 @@ class Cmd4Platform
|
|
|
89
89
|
this.toBeRestoredPlatforms = [ ];
|
|
90
90
|
this.createdCmd4Accessories = [ ];
|
|
91
91
|
this.createdCmd4Platforms = [ ];
|
|
92
|
+
this.globalConstants = null;
|
|
92
93
|
|
|
93
94
|
this.services = [ ];
|
|
94
95
|
|
|
@@ -271,6 +272,9 @@ class Cmd4Platform
|
|
|
271
272
|
this.log.warn( `To remove this message, just remove "${ key }" from your config.json` );
|
|
272
273
|
break;
|
|
273
274
|
case constants.STORAGE:
|
|
275
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
276
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
277
|
+
|
|
274
278
|
if ( value == constants.FS || value == constants.GOOGLEDRIVEl )
|
|
275
279
|
this.storage = value;
|
|
276
280
|
else
|
|
@@ -278,14 +282,23 @@ class Cmd4Platform
|
|
|
278
282
|
|
|
279
283
|
break;
|
|
280
284
|
case constants.STORAGEPATH:
|
|
285
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
286
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
287
|
+
|
|
281
288
|
this.storagePath = value;
|
|
282
289
|
|
|
283
290
|
break;
|
|
284
291
|
case constants.FOLDER:
|
|
292
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
293
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
294
|
+
|
|
285
295
|
this.folder = value;
|
|
286
296
|
|
|
287
297
|
break;
|
|
288
298
|
case constants.KEYPATH:
|
|
299
|
+
this.log.warn( `Warning: ${ key } will soon been deprecated at the Platform level. It was always meant to just be a fakegato config option only.` );
|
|
300
|
+
this.log.warn( `This message will disappear when you have done so.` );
|
|
301
|
+
|
|
289
302
|
this.keyPath = value;
|
|
290
303
|
|
|
291
304
|
break;
|
|
@@ -293,6 +306,12 @@ class Cmd4Platform
|
|
|
293
306
|
this.definitions = value;
|
|
294
307
|
|
|
295
308
|
break;
|
|
309
|
+
case constants.CONSTANTS:
|
|
310
|
+
// Save the constants defined globally so the accessory
|
|
311
|
+
// can parse it.
|
|
312
|
+
this.globalConstants = value;
|
|
313
|
+
|
|
314
|
+
break
|
|
296
315
|
case constants.PLATFORM:
|
|
297
316
|
// Noop
|
|
298
317
|
|
package/RUNNING_CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
## Homebridge UI User. Do not click on any inline links. Homebridge UI does not supprt them. Bug#1098
|
|
4
4
|
|
|
5
5
|
## ChangeLog
|
|
6
|
+
* <a href="#Whats-new-in-6-0-4">**Whats new in 6.0.4**</a>
|
|
7
|
+
* <a href="#Whats-new-in-6-0-3">**Whats new in 6.0.3**</a>
|
|
8
|
+
* <a href="#Whats-new-in-6-0-2">**Whats new in 6.0.2**</a>
|
|
9
|
+
* <a href="#Whats-new-in-6-0-1">**Whats new in 6.0.1**</a>
|
|
6
10
|
* <a href="#Whats-new-in-6-0-0">**Whats new in 6.0.0**</a>
|
|
7
11
|
* <a href="#Whats-new-in-6-0-0-beta1">**Whats new in 6.0.0.beta1**</a>
|
|
8
12
|
* <a href="#Whats-new-in-5-1-1">**Whats new in 5.1.1**</a>
|
|
@@ -75,6 +79,38 @@
|
|
|
75
79
|
* <a href="#Whats-new-in-2-1">**Whats new in 2.1**</a>
|
|
76
80
|
* <a href="#Whats-new-in-2-0">**Whats new in 2.0**</a>
|
|
77
81
|
|
|
82
|
+
<a name="Whats-new-in-6-0-4">## Whats new in 6.0.4</a>
|
|
83
|
+
#### 6.0.4 (2021-12-31)
|
|
84
|
+
|
|
85
|
+
##### Bug Fixes
|
|
86
|
+
|
|
87
|
+
* Constants were not getting passed down to linked types ([b7252bf9](https://github.com/ztalbot2000/homebridge-cmd4/commit/b7252bf934e26535047008f343f4d6b627dd6ddb))
|
|
88
|
+
|
|
89
|
+
|
|
90
|
+
<a name="Whats-new-in-6-0-3">## Whats new in 6.0.3</a>
|
|
91
|
+
### 6.0.3 (2021-11-11)
|
|
92
|
+
|
|
93
|
+
##### Bug Fix
|
|
94
|
+
|
|
95
|
+
* Schema Prep for Homebridge-UI integration ([2c5df2c1](https://github.com/ztalbot2000/homebridge-cmd4/commit/2c5df2c1279ebe88fdaedbaa22ae0124e2841b6d))
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
<a name="Whats-new-in-6-0-2">## Whats new in 6.0.2</a>
|
|
99
|
+
### 6.0.2 (2021-11-10)
|
|
100
|
+
|
|
101
|
+
##### Bug Fix
|
|
102
|
+
|
|
103
|
+
* Schema Prep - For Homebridge-ui schema must have defined keys ([3053780b](https://github.com/ztalbot2000/homebridge-cmd4/commit/3053780b40eb3d4505dc407411257109977688a1))
|
|
104
|
+
|
|
105
|
+
|
|
106
|
+
<a name="Whats-new-in-6-0-1">## Whats new in 6.0.1</a>
|
|
107
|
+
#### 6.0.1 (2021-11-07)
|
|
108
|
+
|
|
109
|
+
##### Bug Fixes
|
|
110
|
+
|
|
111
|
+
* For bug[#116](https://github.com/ztalbot2000/homebridge-cmd4/pull/116) remove stateCmd validation and for AirCon add global const parsing ([e7bc4963](https://github.com/ztalbot2000/homebridge-cmd4/commit/e7bc49630c47d16d296ff9751df7c7666cf2ecd3))
|
|
112
|
+
|
|
113
|
+
|
|
78
114
|
<a name="Whats-new-in-6-0-0">## Whats new in 6.0.0</a>
|
|
79
115
|
## 6.0.0 (2021-10-01)
|
|
80
116
|
|
package/docs/Developers.md
CHANGED
|
@@ -453,7 +453,7 @@ The value "0" should be used for any characteristics value which is not possible
|
|
|
453
453
|
### Step 3. Install homebridge-cmd4 development dependencies
|
|
454
454
|
|
|
455
455
|
```bash
|
|
456
|
-
*SHELL*> npm install --
|
|
456
|
+
*SHELL*> npm install --dev
|
|
457
457
|
```
|
|
458
458
|
|
|
459
459
|
### Step 4. Run the provided test cases
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "homebridge-cmd4",
|
|
3
3
|
"description": "Exec Plugin for Homebridge supporting all accessorys and characteristics",
|
|
4
|
-
"version": "6.0.
|
|
4
|
+
"version": "6.0.4",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": {
|
|
7
7
|
"name": "John Talbot"
|
|
@@ -112,4 +112,4 @@
|
|
|
112
112
|
"release:minor": "tools/generateChangeLog --type minor --cleanup",
|
|
113
113
|
"release:major": "tools/generateChangeLog --type major --cleanup"
|
|
114
114
|
}
|
|
115
|
-
}
|
|
115
|
+
}
|