homebridge-broadlink-rm-blaster 1.9.0 → 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/CHANGELOG.md +13 -0
- package/README.md +1 -1
- package/config.schema.json +11 -10
- package/dist/configFile.d.ts +6 -0
- package/dist/configFile.js +29 -0
- package/dist/configFile.js.map +1 -1
- package/dist/configTypes.d.ts +2 -0
- package/dist/mqttBroker.d.ts +7 -0
- package/dist/mqttBroker.js +53 -0
- package/dist/mqttBroker.js.map +1 -0
- package/dist/platform.js +35 -10
- package/dist/platform.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
6
6
|
|
|
7
7
|
## Unreleased
|
|
8
8
|
|
|
9
|
+
## [1.10.0] - 2026-08-21
|
|
10
|
+
|
|
11
|
+
### Changed
|
|
12
|
+
- MQTT settings: the broker is now a single "Broker" field taking `host:port`
|
|
13
|
+
(default `localhost:1883`) rather than separate Host and Port fields, and
|
|
14
|
+
Username/Password only appear once a new "Broker requires authentication"
|
|
15
|
+
checkbox is ticked.
|
|
16
|
+
- An existing config is folded over to the new shape automatically on startup -
|
|
17
|
+
the old port is merged into the broker address and the authentication checkbox
|
|
18
|
+
is set from whether credentials were already filled in. `config.json` is backed
|
|
19
|
+
up to `config.json.backup` first, same as the existing blank-row cleanup, and
|
|
20
|
+
nothing is written when there's nothing to change.
|
|
21
|
+
|
|
9
22
|
## [1.9.0] - 2026-08-21
|
|
10
23
|
|
|
11
24
|
### Added
|
package/README.md
CHANGED
package/config.schema.json
CHANGED
|
@@ -20,19 +20,20 @@
|
|
|
20
20
|
"description": "Publish temperature/humidity readings from RM devices to an MQTT broker."
|
|
21
21
|
},
|
|
22
22
|
"mqttHost": {
|
|
23
|
-
"title": "
|
|
23
|
+
"title": "Broker",
|
|
24
24
|
"type": "string",
|
|
25
|
-
"default": "localhost",
|
|
25
|
+
"default": "localhost:1883",
|
|
26
|
+
"placeholder": "localhost:1883",
|
|
26
27
|
"required": false,
|
|
27
|
-
"description": "Broker hostname or IP address.",
|
|
28
|
+
"description": "Broker hostname or IP address, optionally followed by a port. Without one, port 1883 is used.",
|
|
28
29
|
"condition": {
|
|
29
30
|
"functionBody": "return model.enableMqtt === true;"
|
|
30
31
|
}
|
|
31
32
|
},
|
|
32
|
-
"
|
|
33
|
-
"title": "
|
|
34
|
-
"type": "
|
|
35
|
-
"default":
|
|
33
|
+
"mqttRequiresAuth": {
|
|
34
|
+
"title": "Broker requires authentication",
|
|
35
|
+
"type": "boolean",
|
|
36
|
+
"default": false,
|
|
36
37
|
"required": false,
|
|
37
38
|
"condition": {
|
|
38
39
|
"functionBody": "return model.enableMqtt === true;"
|
|
@@ -43,7 +44,7 @@
|
|
|
43
44
|
"type": "string",
|
|
44
45
|
"required": false,
|
|
45
46
|
"condition": {
|
|
46
|
-
"functionBody": "return model.enableMqtt === true;"
|
|
47
|
+
"functionBody": "return model.enableMqtt === true && model.mqttRequiresAuth === true;"
|
|
47
48
|
}
|
|
48
49
|
},
|
|
49
50
|
"mqttPassword": {
|
|
@@ -51,7 +52,7 @@
|
|
|
51
52
|
"type": "string",
|
|
52
53
|
"required": false,
|
|
53
54
|
"condition": {
|
|
54
|
-
"functionBody": "return model.enableMqtt === true;"
|
|
55
|
+
"functionBody": "return model.enableMqtt === true && model.mqttRequiresAuth === true;"
|
|
55
56
|
}
|
|
56
57
|
},
|
|
57
58
|
"mqttBaseTopic": {
|
|
@@ -897,7 +898,7 @@
|
|
|
897
898
|
"items": [
|
|
898
899
|
"enableMqtt",
|
|
899
900
|
"mqttHost",
|
|
900
|
-
"
|
|
901
|
+
"mqttRequiresAuth",
|
|
901
902
|
"mqttUsername",
|
|
902
903
|
{
|
|
903
904
|
"key": "mqttPassword",
|
package/dist/configFile.d.ts
CHANGED
|
@@ -7,6 +7,12 @@ export declare function findConfigPath(explicitPath?: string): string;
|
|
|
7
7
|
export declare function findPlatformBlock(config: HomebridgeConfigFile): BlasterPlatformConfig | undefined;
|
|
8
8
|
export declare function backupConfig(configPath: string): void;
|
|
9
9
|
export declare function writeConfigAtomically(configPath: string, config: HomebridgeConfigFile): void;
|
|
10
|
+
export interface MigrateMqttSettingsResult {
|
|
11
|
+
config: BlasterPlatformConfig;
|
|
12
|
+
changes: string[];
|
|
13
|
+
removedKeys: string[];
|
|
14
|
+
}
|
|
15
|
+
export declare function migrateMqttSettings(platformConfig: BlasterPlatformConfig): MigrateMqttSettingsResult;
|
|
10
16
|
export interface StripBlankEntriesResult {
|
|
11
17
|
config: BlasterPlatformConfig;
|
|
12
18
|
removed: string[];
|
package/dist/configFile.js
CHANGED
|
@@ -37,6 +37,7 @@ exports.findConfigPath = findConfigPath;
|
|
|
37
37
|
exports.findPlatformBlock = findPlatformBlock;
|
|
38
38
|
exports.backupConfig = backupConfig;
|
|
39
39
|
exports.writeConfigAtomically = writeConfigAtomically;
|
|
40
|
+
exports.migrateMqttSettings = migrateMqttSettings;
|
|
40
41
|
exports.stripBlankEntries = stripBlankEntries;
|
|
41
42
|
const fs = __importStar(require("fs"));
|
|
42
43
|
const path = __importStar(require("path"));
|
|
@@ -60,6 +61,34 @@ function writeConfigAtomically(configPath, config) {
|
|
|
60
61
|
fs.writeFileSync(tempPath, `${JSON.stringify(config, null, 2)}\n`);
|
|
61
62
|
fs.renameSync(tempPath, configPath);
|
|
62
63
|
}
|
|
64
|
+
// The MQTT broker used to be two fields (host + port) and credentials had
|
|
65
|
+
// no "does this broker need auth?" flag at all. Both are now one field and
|
|
66
|
+
// a checkbox, so fold an older config over to the new shape rather than
|
|
67
|
+
// carrying two ways of reading the same setting forever. Pure, so it can be
|
|
68
|
+
// unit-tested; the caller does the file I/O.
|
|
69
|
+
function migrateMqttSettings(platformConfig) {
|
|
70
|
+
const config = { ...platformConfig };
|
|
71
|
+
const changes = [];
|
|
72
|
+
const removedKeys = [];
|
|
73
|
+
const host = (config.mqttHost ?? '').trim();
|
|
74
|
+
const port = config.mqttPort;
|
|
75
|
+
if (port !== undefined) {
|
|
76
|
+
// Only fold the port in if the host isn't already carrying one, so a
|
|
77
|
+
// second run can't produce "host:1883:1883".
|
|
78
|
+
if (host && !host.includes(':')) {
|
|
79
|
+
config.mqttHost = `${host}:${port}`;
|
|
80
|
+
changes.push(`folded the MQTT port into the broker address ("${config.mqttHost}")`);
|
|
81
|
+
}
|
|
82
|
+
delete config.mqttPort;
|
|
83
|
+
removedKeys.push('mqttPort');
|
|
84
|
+
}
|
|
85
|
+
if (config.mqttRequiresAuth === undefined) {
|
|
86
|
+
const hasCredentials = !!(config.mqttUsername ?? '').trim() || !!(config.mqttPassword ?? '').trim();
|
|
87
|
+
config.mqttRequiresAuth = hasCredentials;
|
|
88
|
+
changes.push(`set "Broker requires authentication" to ${hasCredentials ? 'on' : 'off'}`);
|
|
89
|
+
}
|
|
90
|
+
return { config, changes, removedKeys };
|
|
91
|
+
}
|
|
63
92
|
function hasName(name) {
|
|
64
93
|
return typeof name === 'string' && name.trim().length > 0;
|
|
65
94
|
}
|
package/dist/configFile.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configFile.js","sourceRoot":"","sources":["../src/configFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wCASC;AAED,8CAEC;AAED,oCAEC;AAED,sDAIC;AA6BD,8CA+DC;
|
|
1
|
+
{"version":3,"file":"configFile.js","sourceRoot":"","sources":["../src/configFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,wCASC;AAED,8CAEC;AAED,oCAEC;AAED,sDAIC;AAgBD,kDAyBC;AA6BD,8CA+DC;AAvKD,uCAAyB;AACzB,2CAA6B;AAE7B,yCAA2C;AAQ3C,SAAgB,cAAc,CAAC,YAAqB;IAClD,MAAM,UAAU,GAAG,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;IAC3E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,oCAAoC,UAAU,2CAA2C;YACzF,qCAAqC,CACtC,CAAC;IACJ,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAgB,iBAAiB,CAAC,MAA4B;IAC5D,OAAO,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,KAAK,wBAAa,CAAsC,CAAC;AACxH,CAAC;AAED,SAAgB,YAAY,CAAC,UAAkB;IAC7C,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,GAAG,UAAU,SAAS,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,qBAAqB,CAAC,UAAkB,EAAE,MAA4B;IACpF,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1F,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACnE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;AACtC,CAAC;AAWD,0EAA0E;AAC1E,2EAA2E;AAC3E,wEAAwE;AACxE,4EAA4E;AAC5E,6CAA6C;AAC7C,SAAgB,mBAAmB,CAAC,cAAqC;IACvE,MAAM,MAAM,GAA0B,EAAE,GAAG,cAAc,EAAE,CAAC;IAC5D,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAa,EAAE,CAAC;IAEjC,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC;IAC7B,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,qEAAqE;QACrE,6CAA6C;QAC7C,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,CAAC,QAAQ,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;YACpC,OAAO,CAAC,IAAI,CAAC,kDAAkD,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC;QACtF,CAAC;QACD,OAAO,MAAM,CAAC,QAAQ,CAAC;QACvB,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,MAAM,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;QAC1C,MAAM,cAAc,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACpG,MAAM,CAAC,gBAAgB,GAAG,cAAc,CAAC;QACzC,OAAO,CAAC,IAAI,CAAC,2CAA2C,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AAC1C,CAAC;AAOD,SAAS,OAAO,CAAC,IAAa;IAC5B,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,eAAe,CAAC,KAAa,EAAE,KAAa,EAAE,SAAkB;IACvE,MAAM,IAAI,GAAG,GAAG,KAAK,UAAU,KAAK,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IACpE,OAAO,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,QAAQ,SAAS,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;AACxD,CAAC;AAED,SAAS,UAAU,CAA8B,IAAS;IACxD,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;IAC1D,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;AAC3D,CAAC;AAED,6EAA6E;AAC7E,yEAAyE;AACzE,4EAA4E;AAC5E,0EAA0E;AAC1E,0EAA0E;AAC1E,6EAA6E;AAC7E,8EAA8E;AAC9E,wDAAwD;AACxD,SAAgB,iBAAiB,CAAC,cAAqC;IACrE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAA0B,EAAE,GAAG,cAAc,EAAE,CAAC;IAE5D,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACvB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC9D,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM,CAAC,mBAAmB,EAAE,CAAC;QAC/B,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACtE,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,MAAM,CAAC,mBAAmB,GAAG,IAAI,CAAC;IACpC,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1D,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,IAAI,YAAY,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,CAAC;QACrD,CAAC;QACD,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;gBACf,OAAO,GAAG,CAAC;YACb,CAAC;YACD,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC1C,IAAI,WAAW,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;gBACnC,OAAO,GAAG,CAAC;YACb,CAAC;YACD,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YAC1E,OAAO,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAC7B,CAAC"}
|
package/dist/configTypes.d.ts
CHANGED
|
@@ -126,7 +126,9 @@ export interface BlasterPlatformConfig extends PlatformConfig {
|
|
|
126
126
|
ntfyTopic?: string;
|
|
127
127
|
enableMqtt?: boolean;
|
|
128
128
|
mqttHost?: string;
|
|
129
|
+
/** @deprecated Folded into mqttHost. Only read to migrate an older config. */
|
|
129
130
|
mqttPort?: number;
|
|
131
|
+
mqttRequiresAuth?: boolean;
|
|
130
132
|
mqttUsername?: string;
|
|
131
133
|
mqttPassword?: string;
|
|
132
134
|
mqttBaseTopic?: string;
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
export declare const DEFAULT_MQTT_PORT = 1883;
|
|
2
|
+
export declare const DEFAULT_MQTT_BROKER = "localhost:1883";
|
|
3
|
+
export interface BrokerAddress {
|
|
4
|
+
host: string;
|
|
5
|
+
port: number;
|
|
6
|
+
}
|
|
7
|
+
export declare function parseBrokerAddress(address: string | undefined, fallbackPort?: number): BrokerAddress | undefined;
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_MQTT_BROKER = exports.DEFAULT_MQTT_PORT = void 0;
|
|
4
|
+
exports.parseBrokerAddress = parseBrokerAddress;
|
|
5
|
+
exports.DEFAULT_MQTT_PORT = 1883;
|
|
6
|
+
exports.DEFAULT_MQTT_BROKER = `localhost:${exports.DEFAULT_MQTT_PORT}`;
|
|
7
|
+
// The broker is configured as a single "host:port" field. The port half is
|
|
8
|
+
// optional, and an older config that still keeps its port in a separate
|
|
9
|
+
// field passes it here as the fallback - so both shapes resolve the same
|
|
10
|
+
// way whether or not the config file itself has been migrated yet.
|
|
11
|
+
function parseBrokerAddress(address, fallbackPort) {
|
|
12
|
+
const text = (address ?? '').trim();
|
|
13
|
+
if (!text) {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
|
+
const defaultPort = validPort(fallbackPort) ?? exports.DEFAULT_MQTT_PORT;
|
|
17
|
+
// A bracketed IPv6 literal keeps its own colons, so only what follows the
|
|
18
|
+
// closing bracket can be a port.
|
|
19
|
+
if (text.startsWith('[')) {
|
|
20
|
+
const end = text.indexOf(']');
|
|
21
|
+
if (end === -1) {
|
|
22
|
+
return { host: text, port: defaultPort };
|
|
23
|
+
}
|
|
24
|
+
const host = text.slice(0, end + 1);
|
|
25
|
+
const rest = text.slice(end + 1);
|
|
26
|
+
if (!rest.startsWith(':')) {
|
|
27
|
+
return { host, port: defaultPort };
|
|
28
|
+
}
|
|
29
|
+
return { host, port: validPort(Number(rest.slice(1))) ?? defaultPort };
|
|
30
|
+
}
|
|
31
|
+
const firstColon = text.indexOf(':');
|
|
32
|
+
if (firstColon === -1) {
|
|
33
|
+
return { host: text, port: defaultPort };
|
|
34
|
+
}
|
|
35
|
+
// More than one colon and no brackets is a bare IPv6 literal, which has
|
|
36
|
+
// no room for a port.
|
|
37
|
+
if (text.indexOf(':', firstColon + 1) !== -1) {
|
|
38
|
+
return { host: text, port: defaultPort };
|
|
39
|
+
}
|
|
40
|
+
const host = text.slice(0, firstColon).trim();
|
|
41
|
+
const port = validPort(Number(text.slice(firstColon + 1).trim()));
|
|
42
|
+
if (!host) {
|
|
43
|
+
return undefined;
|
|
44
|
+
}
|
|
45
|
+
return { host, port: port ?? defaultPort };
|
|
46
|
+
}
|
|
47
|
+
function validPort(value) {
|
|
48
|
+
if (value === undefined || !Number.isInteger(value) || value < 1 || value > 65535) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
return value;
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=mqttBroker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mqttBroker.js","sourceRoot":"","sources":["../src/mqttBroker.ts"],"names":[],"mappings":";;;AAYA,gDAuCC;AAnDY,QAAA,iBAAiB,GAAG,IAAI,CAAC;AACzB,QAAA,mBAAmB,GAAG,aAAa,yBAAiB,EAAE,CAAC;AAOpE,2EAA2E;AAC3E,wEAAwE;AACxE,yEAAyE;AACzE,mEAAmE;AACnE,SAAgB,kBAAkB,CAAC,OAA2B,EAAE,YAAqB;IACnF,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,yBAAiB,CAAC;IAEjE,0EAA0E;IAC1E,iCAAiC;IACjC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YACf,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAC3C,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;QACpC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QACrC,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW,EAAE,CAAC;IACzE,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC3C,CAAC;IACD,wEAAwE;IACxE,sBAAsB;IACtB,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC3C,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9C,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAClE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI,WAAW,EAAE,CAAC;AAC7C,CAAC;AAED,SAAS,SAAS,CAAC,KAAyB;IAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,KAAK,EAAE,CAAC;QAClF,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
package/dist/platform.js
CHANGED
|
@@ -40,6 +40,13 @@ const ntfyNotifier_1 = require("./ntfyNotifier");
|
|
|
40
40
|
const mqttClient_1 = require("./mqttClient");
|
|
41
41
|
const settings_1 = require("./settings");
|
|
42
42
|
const configFile_1 = require("./configFile");
|
|
43
|
+
const mqttBroker_1 = require("./mqttBroker");
|
|
44
|
+
// Whether an older config (with no "requires authentication" checkbox yet)
|
|
45
|
+
// was filled in with credentials - the same inference the config migration
|
|
46
|
+
// makes, so both agree before and after the file is migrated.
|
|
47
|
+
function hasMqttCredentials(config) {
|
|
48
|
+
return !!(config.mqttUsername ?? '').trim() || !!(config.mqttPassword ?? '').trim();
|
|
49
|
+
}
|
|
43
50
|
const basicAccessory_1 = require("./accessories/basicAccessory");
|
|
44
51
|
const advancedAccessory_1 = require("./accessories/advancedAccessory");
|
|
45
52
|
const dimmerAccessory_1 = require("./accessories/dimmerAccessory");
|
|
@@ -69,7 +76,12 @@ class BroadlinkRMBlasterPlatform {
|
|
|
69
76
|
deviceNames.set(rmDevice.ip, rmDevice.name);
|
|
70
77
|
}
|
|
71
78
|
this.notifier = new ntfyNotifier_1.NtfyNotifier(this.log, blasterConfig.ntfyTopic, deviceNames);
|
|
72
|
-
|
|
79
|
+
// Runs before didFinishLaunching (where the config file itself gets
|
|
80
|
+
// migrated), so this has to resolve either shape - hence passing the
|
|
81
|
+
// legacy mqttPort through as the fallback.
|
|
82
|
+
const broker = (0, mqttBroker_1.parseBrokerAddress)(blasterConfig.mqttHost, blasterConfig.mqttPort);
|
|
83
|
+
const requiresAuth = blasterConfig.mqttRequiresAuth ?? hasMqttCredentials(blasterConfig);
|
|
84
|
+
this.mqtt = new mqttClient_1.MqttBridge(this.log, !!blasterConfig.enableMqtt, broker?.host, broker?.port, blasterConfig.mqttBaseTopic ?? mqttClient_1.DEFAULT_MQTT_BASE_TOPIC, requiresAuth ? blasterConfig.mqttUsername : undefined, requiresAuth ? blasterConfig.mqttPassword : undefined, blasterConfig.mqttLastSeenFormat);
|
|
73
85
|
this.broadlinkClient = new broadlinkClient_1.BroadlinkClient(this.log, this.notifier);
|
|
74
86
|
this.api.on('didFinishLaunching', () => {
|
|
75
87
|
this.discoverAccessories();
|
|
@@ -88,11 +100,14 @@ class BroadlinkRMBlasterPlatform {
|
|
|
88
100
|
this.log.debug(`Ignoring an empty ${kind} entry - remove the blank row from your config.`);
|
|
89
101
|
return true;
|
|
90
102
|
}
|
|
91
|
-
//
|
|
92
|
-
//
|
|
93
|
-
//
|
|
94
|
-
//
|
|
95
|
-
//
|
|
103
|
+
// Two jobs, both write-backs to config.json itself:
|
|
104
|
+
// - the Config UI X form can leave a blank row behind on save (see
|
|
105
|
+
// isBlankEntry above); existing loads already skip those, but nothing
|
|
106
|
+
// made them go away from the file, so they pile up across saves;
|
|
107
|
+
// - MQTT's broker/auth settings changed shape, so an older config gets
|
|
108
|
+
// folded over once rather than being read two ways forever.
|
|
109
|
+
// Only writes when something actually changed, so a normal boot never
|
|
110
|
+
// touches the file or makes a backup.
|
|
96
111
|
cleanUpConfigFile() {
|
|
97
112
|
try {
|
|
98
113
|
const configPath = this.api.user.configPath();
|
|
@@ -102,16 +117,26 @@ class BroadlinkRMBlasterPlatform {
|
|
|
102
117
|
return;
|
|
103
118
|
}
|
|
104
119
|
const { config: cleaned, removed } = (0, configFile_1.stripBlankEntries)(platformBlock);
|
|
105
|
-
|
|
120
|
+
const { config: migrated, changes, removedKeys } = (0, configFile_1.migrateMqttSettings)(cleaned);
|
|
121
|
+
if (removed.length === 0 && changes.length === 0) {
|
|
106
122
|
return;
|
|
107
123
|
}
|
|
108
124
|
(0, configFile_1.backupConfig)(configPath);
|
|
109
|
-
Object.assign(platformBlock,
|
|
125
|
+
Object.assign(platformBlock, migrated);
|
|
126
|
+
// Object.assign can't express a deletion, so drop retired keys off
|
|
127
|
+
// the real object rather than the copy that was merged in.
|
|
128
|
+
for (const key of removedKeys) {
|
|
129
|
+
delete platformBlock[key];
|
|
130
|
+
}
|
|
110
131
|
(0, configFile_1.writeConfigAtomically)(configPath, fileConfig);
|
|
111
|
-
|
|
132
|
+
const summary = [
|
|
133
|
+
...(removed.length > 0 ? [`removed ${removed.join(', ')}`] : []),
|
|
134
|
+
...changes,
|
|
135
|
+
].join('; ');
|
|
136
|
+
this.log.info(`Updated config.json: ${summary}. Backed up to config.json.backup.`);
|
|
112
137
|
}
|
|
113
138
|
catch (error) {
|
|
114
|
-
this.log.warn(`Could not
|
|
139
|
+
this.log.warn(`Could not update config.json: ${error.message}`);
|
|
115
140
|
}
|
|
116
141
|
}
|
|
117
142
|
discoverAccessories() {
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "homebridge-broadlink-rm-blaster",
|
|
3
3
|
"displayName": "Broadlink RM Blaster",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.10.0",
|
|
5
5
|
"description": "Blast RF and IR signals from Broadlink RM devices using Homebridge",
|
|
6
6
|
"author": "Luud Jacobs",
|
|
7
7
|
"license": "MIT",
|