homebridge-broadlink-rm-blaster 1.7.1 → 1.8.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 +8 -0
- package/README.md +7 -1
- package/config.schema.json +75 -2
- package/dist/accessories/temperatureHumiditySensorAccessory.d.ts +3 -1
- package/dist/accessories/temperatureHumiditySensorAccessory.js +4 -2
- package/dist/accessories/temperatureHumiditySensorAccessory.js.map +1 -1
- package/dist/configTypes.d.ts +3 -0
- package/dist/mqttClient.d.ts +5 -2
- package/dist/mqttClient.js +16 -4
- package/dist/mqttClient.js.map +1 -1
- package/dist/mqttLastSeen.d.ts +3 -0
- package/dist/mqttLastSeen.js +34 -0
- package/dist/mqttLastSeen.js.map +1 -0
- package/dist/platform.js +3 -3
- package/dist/platform.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
6
6
|
|
|
7
7
|
## Unreleased
|
|
8
8
|
|
|
9
|
+
## [1.8.0] - 2026-08-19
|
|
10
|
+
|
|
11
|
+
### Added
|
|
12
|
+
- MQTT: a `last_seen` field on every publish (sensor readings and accessory state),
|
|
13
|
+
similar to zigbee2mqtt. Format is set platform-wide (ISO 8601 UTC by default, ISO
|
|
14
|
+
8601 local time, epoch milliseconds, or disabled), with a per-RM-device override
|
|
15
|
+
for that device's own sensor readings.
|
|
16
|
+
|
|
9
17
|
## [1.7.1] - 2026-08-16
|
|
10
18
|
|
|
11
19
|
### Fixed
|
package/README.md
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
# Broadlink RM Blaster 1.
|
|
1
|
+
# Broadlink RM Blaster 1.8.0
|
|
2
2
|
|
|
3
3
|
**This Homebridge plugin has been 100% vibe coded with Claude.**
|
|
4
4
|
|
|
@@ -75,6 +75,12 @@ you untick "Retain state messages" on that accessory, so a subscriber
|
|
|
75
75
|
connecting later immediately gets the last known state. Commands are JSON,
|
|
76
76
|
and anything left out is not changed.
|
|
77
77
|
|
|
78
|
+
Every publish - state messages and sensor readings alike - also carries a
|
|
79
|
+
`last_seen` field, similar to zigbee2mqtt. Set the format ("last_seen
|
|
80
|
+
Format" in the MQTT settings) to ISO 8601 UTC (default), ISO 8601 local
|
|
81
|
+
time, epoch milliseconds, or disable it entirely. Each RM device can
|
|
82
|
+
override the format for its own sensor readings.
|
|
83
|
+
|
|
78
84
|
### Simple on/off accessories, advanced accessories and TVs
|
|
79
85
|
|
|
80
86
|
```json
|
package/config.schema.json
CHANGED
|
@@ -65,6 +65,42 @@
|
|
|
65
65
|
"functionBody": "return model.enableMqtt === true;"
|
|
66
66
|
}
|
|
67
67
|
},
|
|
68
|
+
"mqttLastSeenFormat": {
|
|
69
|
+
"title": "last_seen Format",
|
|
70
|
+
"type": "string",
|
|
71
|
+
"required": false,
|
|
72
|
+
"default": "iso8601",
|
|
73
|
+
"description": "Adds a last_seen field to every MQTT publish (sensor readings and accessory state), same idea as zigbee2mqtt. Can be overridden per RM device below.",
|
|
74
|
+
"oneOf": [
|
|
75
|
+
{
|
|
76
|
+
"title": "ISO 8601 (UTC)",
|
|
77
|
+
"enum": [
|
|
78
|
+
"iso8601"
|
|
79
|
+
]
|
|
80
|
+
},
|
|
81
|
+
{
|
|
82
|
+
"title": "ISO 8601 (local time)",
|
|
83
|
+
"enum": [
|
|
84
|
+
"iso8601local"
|
|
85
|
+
]
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
"title": "Epoch (ms)",
|
|
89
|
+
"enum": [
|
|
90
|
+
"epoch"
|
|
91
|
+
]
|
|
92
|
+
},
|
|
93
|
+
{
|
|
94
|
+
"title": "Disabled",
|
|
95
|
+
"enum": [
|
|
96
|
+
"disabled"
|
|
97
|
+
]
|
|
98
|
+
}
|
|
99
|
+
],
|
|
100
|
+
"condition": {
|
|
101
|
+
"functionBody": "return model.enableMqtt === true;"
|
|
102
|
+
}
|
|
103
|
+
},
|
|
68
104
|
"rmDevices": {
|
|
69
105
|
"title": "Broadlink RM Devices",
|
|
70
106
|
"type": "array",
|
|
@@ -108,6 +144,41 @@
|
|
|
108
144
|
"condition": {
|
|
109
145
|
"functionBody": "return model.enableMqtt === true && model.rmDevices && model.rmDevices[arrayIndices] && model.rmDevices[arrayIndices].enableMqttPublish === true;"
|
|
110
146
|
}
|
|
147
|
+
},
|
|
148
|
+
"mqttLastSeenFormat": {
|
|
149
|
+
"title": "last_seen Format Override",
|
|
150
|
+
"type": "string",
|
|
151
|
+
"required": false,
|
|
152
|
+
"description": "Overrides the platform-wide last_seen format above, for this device's readings only. Leave unset to use the platform setting.",
|
|
153
|
+
"oneOf": [
|
|
154
|
+
{
|
|
155
|
+
"title": "ISO 8601 (UTC)",
|
|
156
|
+
"enum": [
|
|
157
|
+
"iso8601"
|
|
158
|
+
]
|
|
159
|
+
},
|
|
160
|
+
{
|
|
161
|
+
"title": "ISO 8601 (local time)",
|
|
162
|
+
"enum": [
|
|
163
|
+
"iso8601local"
|
|
164
|
+
]
|
|
165
|
+
},
|
|
166
|
+
{
|
|
167
|
+
"title": "Epoch (ms)",
|
|
168
|
+
"enum": [
|
|
169
|
+
"epoch"
|
|
170
|
+
]
|
|
171
|
+
},
|
|
172
|
+
{
|
|
173
|
+
"title": "Disabled",
|
|
174
|
+
"enum": [
|
|
175
|
+
"disabled"
|
|
176
|
+
]
|
|
177
|
+
}
|
|
178
|
+
],
|
|
179
|
+
"condition": {
|
|
180
|
+
"functionBody": "return model.enableMqtt === true && model.rmDevices && model.rmDevices[arrayIndices] && model.rmDevices[arrayIndices].enableMqttPublish === true;"
|
|
181
|
+
}
|
|
111
182
|
}
|
|
112
183
|
}
|
|
113
184
|
}
|
|
@@ -778,7 +849,8 @@
|
|
|
778
849
|
"rmDevices[].ip",
|
|
779
850
|
"rmDevices[].enableTemperatureHumidity",
|
|
780
851
|
"rmDevices[].enableMqttPublish",
|
|
781
|
-
"rmDevices[].mqttRetain"
|
|
852
|
+
"rmDevices[].mqttRetain",
|
|
853
|
+
"rmDevices[].mqttLastSeenFormat"
|
|
782
854
|
]
|
|
783
855
|
},
|
|
784
856
|
{
|
|
@@ -799,7 +871,8 @@
|
|
|
799
871
|
"key": "mqttPassword",
|
|
800
872
|
"type": "password"
|
|
801
873
|
},
|
|
802
|
-
"mqttBaseTopic"
|
|
874
|
+
"mqttBaseTopic",
|
|
875
|
+
"mqttLastSeenFormat"
|
|
803
876
|
]
|
|
804
877
|
},
|
|
805
878
|
{
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { PlatformAccessory } from 'homebridge';
|
|
2
2
|
import type { BroadlinkRMBlasterPlatform } from '../platform';
|
|
3
|
+
import type { LastSeenFormat } from '../mqttLastSeen';
|
|
3
4
|
export declare class TemperatureHumiditySensorAccessory {
|
|
4
5
|
private readonly platform;
|
|
5
6
|
private readonly accessory;
|
|
@@ -8,8 +9,9 @@ export declare class TemperatureHumiditySensorAccessory {
|
|
|
8
9
|
private readonly deviceName;
|
|
9
10
|
private readonly publishToMqtt;
|
|
10
11
|
private readonly retain;
|
|
12
|
+
private readonly lastSeenFormat?;
|
|
11
13
|
private consecutiveFailures;
|
|
12
|
-
constructor(platform: BroadlinkRMBlasterPlatform, accessory: PlatformAccessory | undefined, ip: string, name: string, deviceName: string, publishToMqtt: boolean, retain: boolean);
|
|
14
|
+
constructor(platform: BroadlinkRMBlasterPlatform, accessory: PlatformAccessory | undefined, ip: string, name: string, deviceName: string, publishToMqtt: boolean, retain: boolean, lastSeenFormat?: LastSeenFormat | undefined);
|
|
13
15
|
private getTemperature;
|
|
14
16
|
private getHumidity;
|
|
15
17
|
private throwNoResponse;
|
|
@@ -14,8 +14,9 @@ class TemperatureHumiditySensorAccessory {
|
|
|
14
14
|
deviceName;
|
|
15
15
|
publishToMqtt;
|
|
16
16
|
retain;
|
|
17
|
+
lastSeenFormat;
|
|
17
18
|
consecutiveFailures = 0;
|
|
18
|
-
constructor(platform, accessory, ip, name, deviceName, publishToMqtt, retain) {
|
|
19
|
+
constructor(platform, accessory, ip, name, deviceName, publishToMqtt, retain, lastSeenFormat) {
|
|
19
20
|
this.platform = platform;
|
|
20
21
|
this.accessory = accessory;
|
|
21
22
|
this.ip = ip;
|
|
@@ -23,6 +24,7 @@ class TemperatureHumiditySensorAccessory {
|
|
|
23
24
|
this.deviceName = deviceName;
|
|
24
25
|
this.publishToMqtt = publishToMqtt;
|
|
25
26
|
this.retain = retain;
|
|
27
|
+
this.lastSeenFormat = lastSeenFormat;
|
|
26
28
|
if (this.accessory) {
|
|
27
29
|
const temperatureService = this.accessory.getService(this.platform.Service.TemperatureSensor)
|
|
28
30
|
?? this.accessory.addService(this.platform.Service.TemperatureSensor);
|
|
@@ -74,7 +76,7 @@ class TemperatureHumiditySensorAccessory {
|
|
|
74
76
|
?.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, humidity);
|
|
75
77
|
}
|
|
76
78
|
if (this.publishToMqtt) {
|
|
77
|
-
this.platform.mqtt.publishReading(this.deviceName, temperature, humidity, this.retain);
|
|
79
|
+
this.platform.mqtt.publishReading(this.deviceName, temperature, humidity, this.retain, this.lastSeenFormat);
|
|
78
80
|
}
|
|
79
81
|
}
|
|
80
82
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"temperatureHumiditySensorAccessory.js","sourceRoot":"","sources":["../../src/accessories/temperatureHumiditySensorAccessory.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"temperatureHumiditySensorAccessory.js","sourceRoot":"","sources":["../../src/accessories/temperatureHumiditySensorAccessory.ts"],"names":[],"mappings":"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"}
|
package/dist/configTypes.d.ts
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import type { PlatformConfig } from 'homebridge';
|
|
2
|
+
import type { LastSeenFormat } from './mqttLastSeen';
|
|
2
3
|
export interface RmDeviceConfig {
|
|
3
4
|
name: string;
|
|
4
5
|
ip: string;
|
|
5
6
|
enableTemperatureHumidity?: boolean;
|
|
6
7
|
enableMqttPublish?: boolean;
|
|
7
8
|
mqttRetain?: boolean;
|
|
9
|
+
mqttLastSeenFormat?: LastSeenFormat;
|
|
8
10
|
}
|
|
9
11
|
export type BasicAccessoryType = 'light' | 'switch' | 'outlet' | 'fan';
|
|
10
12
|
export interface BasicAccessoryConfig {
|
|
@@ -124,4 +126,5 @@ export interface BlasterPlatformConfig extends PlatformConfig {
|
|
|
124
126
|
mqttUsername?: string;
|
|
125
127
|
mqttPassword?: string;
|
|
126
128
|
mqttBaseTopic?: string;
|
|
129
|
+
mqttLastSeenFormat?: LastSeenFormat;
|
|
127
130
|
}
|
package/dist/mqttClient.d.ts
CHANGED
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
import type { Logger } from 'homebridge';
|
|
2
|
+
import type { LastSeenFormat } from './mqttLastSeen';
|
|
2
3
|
export declare const DEFAULT_MQTT_BASE_TOPIC = "broadlinkrm";
|
|
3
4
|
export declare function buildTopic(baseTopic: string, deviceName: string): string;
|
|
4
5
|
export declare class MqttBridge {
|
|
5
6
|
private readonly log;
|
|
6
7
|
private readonly baseTopic;
|
|
8
|
+
private readonly defaultLastSeenFormat;
|
|
7
9
|
private client?;
|
|
8
10
|
private loggedConnectionError;
|
|
9
11
|
private readonly handlers;
|
|
10
|
-
constructor(log: Logger, enabled: boolean, host: string | undefined, port: number | undefined, baseTopic: string, username?: string, password?: string);
|
|
12
|
+
constructor(log: Logger, enabled: boolean, host: string | undefined, port: number | undefined, baseTopic: string, username?: string, password?: string, defaultLastSeenFormat?: LastSeenFormat);
|
|
11
13
|
get enabled(): boolean;
|
|
12
14
|
private deviceTopic;
|
|
13
15
|
subscribeToCommands(topic: string, handler: (payload: string) => void): boolean;
|
|
14
16
|
publishState(topic: string, on: boolean, retain: boolean): void;
|
|
17
|
+
private withLastSeen;
|
|
15
18
|
private subscribeToTopic;
|
|
16
|
-
publishReading(deviceName: string, temperature: number, humidity: number, retain: boolean): void;
|
|
19
|
+
publishReading(deviceName: string, temperature: number, humidity: number, retain: boolean, lastSeenFormat?: LastSeenFormat): void;
|
|
17
20
|
}
|
package/dist/mqttClient.js
CHANGED
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.MqttBridge = exports.DEFAULT_MQTT_BASE_TOPIC = void 0;
|
|
7
7
|
exports.buildTopic = buildTopic;
|
|
8
8
|
const mqtt_1 = __importDefault(require("mqtt"));
|
|
9
|
+
const mqttLastSeen_1 = require("./mqttLastSeen");
|
|
9
10
|
exports.DEFAULT_MQTT_BASE_TOPIC = 'broadlinkrm';
|
|
10
11
|
function buildTopic(baseTopic, deviceName) {
|
|
11
12
|
const slug = deviceName.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '');
|
|
@@ -19,12 +20,14 @@ function buildTopic(baseTopic, deviceName) {
|
|
|
19
20
|
class MqttBridge {
|
|
20
21
|
log;
|
|
21
22
|
baseTopic;
|
|
23
|
+
defaultLastSeenFormat;
|
|
22
24
|
client;
|
|
23
25
|
loggedConnectionError = false;
|
|
24
26
|
handlers = new Map();
|
|
25
|
-
constructor(log, enabled, host, port, baseTopic, username, password) {
|
|
27
|
+
constructor(log, enabled, host, port, baseTopic, username, password, defaultLastSeenFormat = mqttLastSeen_1.DEFAULT_LAST_SEEN_FORMAT) {
|
|
26
28
|
this.log = log;
|
|
27
29
|
this.baseTopic = baseTopic;
|
|
30
|
+
this.defaultLastSeenFormat = defaultLastSeenFormat;
|
|
28
31
|
if (!enabled || !host || !port) {
|
|
29
32
|
return;
|
|
30
33
|
}
|
|
@@ -77,12 +80,20 @@ class MqttBridge {
|
|
|
77
80
|
return;
|
|
78
81
|
}
|
|
79
82
|
const stateTopic = this.deviceTopic(topic);
|
|
80
|
-
this.
|
|
83
|
+
const payload = this.withLastSeen({ state: on ? 'ON' : 'OFF' }, this.defaultLastSeenFormat);
|
|
84
|
+
this.client.publish(stateTopic, JSON.stringify(payload), { retain }, (error) => {
|
|
81
85
|
if (error) {
|
|
82
86
|
this.log.warn(`Failed to publish MQTT state to ${stateTopic}: ${error.message}`);
|
|
83
87
|
}
|
|
84
88
|
});
|
|
85
89
|
}
|
|
90
|
+
// Every publish - sensor readings and accessory state alike - can carry a
|
|
91
|
+
// last_seen field, same idea as zigbee2mqtt. Accessory state always uses
|
|
92
|
+
// the platform-wide default; a reading can override it per RM device.
|
|
93
|
+
withLastSeen(body, format) {
|
|
94
|
+
const lastSeen = (0, mqttLastSeen_1.formatLastSeen)(format, new Date());
|
|
95
|
+
return lastSeen === undefined ? body : { ...body, last_seen: lastSeen };
|
|
96
|
+
}
|
|
86
97
|
subscribeToTopic(topic) {
|
|
87
98
|
this.client?.subscribe(topic, (error) => {
|
|
88
99
|
if (error) {
|
|
@@ -90,12 +101,13 @@ class MqttBridge {
|
|
|
90
101
|
}
|
|
91
102
|
});
|
|
92
103
|
}
|
|
93
|
-
publishReading(deviceName, temperature, humidity, retain) {
|
|
104
|
+
publishReading(deviceName, temperature, humidity, retain, lastSeenFormat) {
|
|
94
105
|
if (!this.client) {
|
|
95
106
|
return;
|
|
96
107
|
}
|
|
97
108
|
const topic = buildTopic(this.baseTopic, deviceName);
|
|
98
|
-
this.
|
|
109
|
+
const payload = this.withLastSeen({ temperature, humidity }, lastSeenFormat ?? this.defaultLastSeenFormat);
|
|
110
|
+
this.client.publish(topic, JSON.stringify(payload), { retain }, (error) => {
|
|
99
111
|
if (error) {
|
|
100
112
|
this.log.warn(`Failed to publish MQTT reading: ${error.message}`);
|
|
101
113
|
}
|
package/dist/mqttClient.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqttClient.js","sourceRoot":"","sources":["../src/mqttClient.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"mqttClient.js","sourceRoot":"","sources":["../src/mqttClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_LAST_SEEN_FORMAT = void 0;
|
|
4
|
+
exports.formatLastSeen = formatLastSeen;
|
|
5
|
+
exports.DEFAULT_LAST_SEEN_FORMAT = 'iso8601';
|
|
6
|
+
// Every MQTT publish (sensor readings and accessory state) can carry a
|
|
7
|
+
// last_seen field, same idea as zigbee2mqtt. `now` is a parameter rather
|
|
8
|
+
// than read internally so this stays pure and testable.
|
|
9
|
+
function formatLastSeen(format, now) {
|
|
10
|
+
switch (format) {
|
|
11
|
+
case 'iso8601':
|
|
12
|
+
return now.toISOString();
|
|
13
|
+
case 'iso8601local':
|
|
14
|
+
return toLocalIso8601(now);
|
|
15
|
+
case 'epoch':
|
|
16
|
+
return now.getTime();
|
|
17
|
+
case 'disabled':
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
function pad(value, width = 2) {
|
|
22
|
+
return String(value).padStart(width, '0');
|
|
23
|
+
}
|
|
24
|
+
// Date's own toISOString() is always UTC - this builds the same shape using
|
|
25
|
+
// the local wall-clock time plus that same local offset.
|
|
26
|
+
function toLocalIso8601(date) {
|
|
27
|
+
const offsetMinutes = -date.getTimezoneOffset();
|
|
28
|
+
const sign = offsetMinutes >= 0 ? '+' : '-';
|
|
29
|
+
const absOffset = Math.abs(offsetMinutes);
|
|
30
|
+
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`
|
|
31
|
+
+ `T${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}.${pad(date.getMilliseconds(), 3)}`
|
|
32
|
+
+ `${sign}${pad(Math.floor(absOffset / 60))}:${pad(absOffset % 60)}`;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=mqttLastSeen.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mqttLastSeen.js","sourceRoot":"","sources":["../src/mqttLastSeen.ts"],"names":[],"mappings":";;;AAOA,wCAWC;AAhBY,QAAA,wBAAwB,GAAmB,SAAS,CAAC;AAElE,uEAAuE;AACvE,yEAAyE;AACzE,wDAAwD;AACxD,SAAgB,cAAc,CAAC,MAAsB,EAAE,GAAS;IAC9D,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,GAAG,CAAC,WAAW,EAAE,CAAC;QAC3B,KAAK,cAAc;YACjB,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;QAC7B,KAAK,OAAO;YACV,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC;QACvB,KAAK,UAAU;YACb,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,KAAK,GAAG,CAAC;IACnC,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,4EAA4E;AAC5E,yDAAyD;AACzD,SAAS,cAAc,CAAC,IAAU;IAChC,MAAM,aAAa,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAChD,MAAM,IAAI,GAAG,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAE1C,OAAO,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE;UAC7E,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE;UAChH,GAAG,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,IAAI,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC,EAAE,CAAC;AACzE,CAAC"}
|
package/dist/platform.js
CHANGED
|
@@ -69,7 +69,7 @@ class BroadlinkRMBlasterPlatform {
|
|
|
69
69
|
deviceNames.set(rmDevice.ip, rmDevice.name);
|
|
70
70
|
}
|
|
71
71
|
this.notifier = new ntfyNotifier_1.NtfyNotifier(this.log, blasterConfig.ntfyTopic, deviceNames);
|
|
72
|
-
this.mqtt = new mqttClient_1.MqttBridge(this.log, !!blasterConfig.enableMqtt, blasterConfig.mqttHost, blasterConfig.mqttPort, blasterConfig.mqttBaseTopic ?? mqttClient_1.DEFAULT_MQTT_BASE_TOPIC, blasterConfig.mqttUsername, blasterConfig.mqttPassword);
|
|
72
|
+
this.mqtt = new mqttClient_1.MqttBridge(this.log, !!blasterConfig.enableMqtt, blasterConfig.mqttHost, blasterConfig.mqttPort, blasterConfig.mqttBaseTopic ?? mqttClient_1.DEFAULT_MQTT_BASE_TOPIC, blasterConfig.mqttUsername, blasterConfig.mqttPassword, blasterConfig.mqttLastSeenFormat);
|
|
73
73
|
this.broadlinkClient = new broadlinkClient_1.BroadlinkClient(this.log, this.notifier);
|
|
74
74
|
this.api.on('didFinishLaunching', () => {
|
|
75
75
|
this.discoverAccessories();
|
|
@@ -209,12 +209,12 @@ class BroadlinkRMBlasterPlatform {
|
|
|
209
209
|
const sensorName = `${rmDevice.name} Sensor`;
|
|
210
210
|
const uuid = this.api.hap.uuid.generate(`${settings_1.PLUGIN_NAME}:sensor:${rmDevice.name}`);
|
|
211
211
|
this.upsertAccessory(uuid, sensorName, (accessory) => {
|
|
212
|
-
new temperatureHumiditySensorAccessory_1.TemperatureHumiditySensorAccessory(this, accessory, rmDevice.ip, sensorName, rmDevice.name, publishToMqtt, rmDevice.mqttRetain !== false);
|
|
212
|
+
new temperatureHumiditySensorAccessory_1.TemperatureHumiditySensorAccessory(this, accessory, rmDevice.ip, sensorName, rmDevice.name, publishToMqtt, rmDevice.mqttRetain !== false, rmDevice.mqttLastSeenFormat);
|
|
213
213
|
});
|
|
214
214
|
}
|
|
215
215
|
else {
|
|
216
216
|
// MQTT-only: no HomeKit accessory needed, just poll and publish.
|
|
217
|
-
new temperatureHumiditySensorAccessory_1.TemperatureHumiditySensorAccessory(this, undefined, rmDevice.ip, rmDevice.name, rmDevice.name, publishToMqtt, rmDevice.mqttRetain !== false);
|
|
217
|
+
new temperatureHumiditySensorAccessory_1.TemperatureHumiditySensorAccessory(this, undefined, rmDevice.ip, rmDevice.name, rmDevice.name, publishToMqtt, rmDevice.mqttRetain !== false, rmDevice.mqttLastSeenFormat);
|
|
218
218
|
}
|
|
219
219
|
}
|
|
220
220
|
this.pruneStaleAccessories();
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AAYzB,uDAAoD;AACpD,iDAA8C;AAC9C,6CAAmE;AACnE,yCAAwD;AAExD,6CAAyG;AAEzG,iEAA8D;AAC9D,uEAAoE;AACpE,mEAAgE;AAChE,6DAA0D;AAC1D,2DAAwD;AACxD,yGAAsG;AAEtG,MAAa,0BAA0B;IAYnB;IACA;IACA;IAbF,OAAO,CAAiB;IACxB,cAAc,CAAwB;IAEtC,WAAW,GAAwB,EAAE,CAAC;IACtC,eAAe,CAAkB;IACjC,QAAQ,CAAe;IACvB,IAAI,CAAa;IAEhB,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IAEjD,YACkB,GAAW,EACX,MAAsB,EACtB,GAAQ;QAFR,QAAG,GAAH,GAAG,CAAQ;QACX,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QAExB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QACpC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC;QAElD,MAAM,aAAa,GAAG,MAA+B,CAAC;QACtD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAkB,CAAC;QAC9C,KAAK,MAAM,QAAQ,IAAI,aAAa,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;YACrD,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,CAAC,QAAQ,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACjF,IAAI,CAAC,IAAI,GAAG,IAAI,uBAAU,CACxB,IAAI,CAAC,GAAG,EACR,CAAC,CAAC,aAAa,CAAC,UAAU,EAC1B,aAAa,CAAC,QAAQ,EACtB,aAAa,CAAC,QAAQ,EACtB,aAAa,CAAC,aAAa,IAAI,oCAAuB,EACtD,aAAa,CAAC,YAAY,EAC1B,aAAa,CAAC,YAAY,CAC3B,CAAC;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,iCAAe,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEpE,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACrC,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,SAA4B;QAC7C,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAED,uEAAuE;IACvE,yEAAyE;IACzE,0EAA0E;IAClE,YAAY,CAAC,IAAwB,EAAE,IAAY;QACzD,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACxB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,IAAI,iDAAiD,CAAC,CAAC;QAC3F,OAAO,IAAI,CAAC;IACd,CAAC;IAED,sEAAsE;IACtE,yEAAyE;IACzE,yEAAyE;IACzE,0EAA0E;IAC1E,qBAAqB;IACb,iBAAiB;QACvB,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9C,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;YACzF,MAAM,aAAa,GAAG,IAAA,8BAAiB,EAAC,UAAU,CAAC,CAAC;YACpD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,IAAA,8BAAiB,EAAC,aAAa,CAAC,CAAC;YACtE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YACD,IAAA,yBAAY,EAAC,UAAU,CAAC,CAAC;YACzB,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YACtC,IAAA,kCAAqB,EAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAC9C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mCAAmC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;QAC3G,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4CAA6C,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAEO,mBAAmB;QACzB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAA+B,CAAC;QACpD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAEzB,KAAK,MAAM,eAAe,IAAI,MAAM,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;YACvD,IAAI,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;gBAC1D,SAAS;YACX,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,uBAAuB,eAAe,CAAC,IAAI,0BAA0B,eAAe,CAAC,QAAQ,cAAc,CAC5G,CAAC;gBACF,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,sBAAW,IAAI,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;YAClF,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE;gBAC7D,SAAS,CAAC,OAAO,CAAC,eAAe,GAAG,eAAe,CAAC;gBACpD,IAAI,+BAAc,CAAC,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,mBAAmB,IAAI,EAAE,EAAE,CAAC;YAC9D,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,IAAI,EAAE,oBAAoB,CAAC,EAAE,CAAC;gBAClE,SAAS;YACX,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;YACnE,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,gCAAgC,cAAc,CAAC,IAAI,0BAA0B,cAAc,CAAC,QAAQ,cAAc,CACnH,CAAC;gBACF,SAAS;YACX,CAAC;YACD,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gCAAgC,cAAc,CAAC,IAAI,0BAA0B,CAAC,CAAC;gBAC7F,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,sBAAW,aAAa,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE;gBAC5D,SAAS,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;gBAClD,IAAI,qCAAiB,CAAC,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC;YAC1C,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC9C,SAAS;YACX,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC9D,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,SAAS,CAAC,IAAI,0BAA0B,SAAS,CAAC,QAAQ,cAAc,CAAC,CAAC;gBACzG,SAAS;YACX,CAAC;YACD,qEAAqE;YACrE,oDAAoD;YACpD,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,CAAC,SAAS;mBACjE,CAAC,CAAC,SAAS,CAAC,eAAe,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY;mBAClF,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,SAAS,CAAC,IAAI,qCAAqC,CAAC,CAAC;gBACpF,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,sBAAW,QAAQ,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;YAChF,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE;gBACvD,SAAS,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;gBACxC,IAAI,2BAAY,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAChD,IAAI,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACpD,SAAS;YACX,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC;YACjE,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,YAAY,CAAC,IAAI,0BAA0B,YAAY,CAAC,QAAQ,cAAc,CAAC,CAAC;gBAClH,SAAS;YACX,CAAC;YACD,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,YAAY,CAAC,IAAI,oCAAoC,CAAC,CAAC;gBACzF,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,sBAAW,WAAW,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;YACtF,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC,SAAS,EAAE,EAAE;gBAC1D,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,YAAY,CAAC;gBAC9C,IAAI,iCAAe,CAAC,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAElC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,CAAC;YAC9C,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;gBACnD,SAAS;YACX,CAAC;YACD,MAAM,aAAa,GAAG,CAAC,CAAC,QAAQ,CAAC,yBAAyB,CAAC;YAC3D,MAAM,aAAa,GAAG,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC;YACnD,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,EAAE,CAAC;gBACrC,SAAS;YACX,CAAC;YAED,IAAI,aAAa,EAAE,CAAC;gBAClB,MAAM,UAAU,GAAG,GAAG,QAAQ,CAAC,IAAI,SAAS,CAAC;gBAC7C,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,sBAAW,WAAW,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClF,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,CAAC,SAAS,EAAE,EAAE;oBACnD,IAAI,uEAAkC,CACpC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,UAAU,KAAK,KAAK,CACtG,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,iEAAiE;gBACjE,IAAI,uEAAkC,CACpC,IAAI,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,UAAU,KAAK,KAAK,CACzG,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAED,yEAAyE;IACzE,2EAA2E;IAC3E,0DAA0D;IAClD,iBAAiB,CAAC,MAA6B,EAAE,YAAoB;QAC3E,OAAO,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,EAAE,EAAE,CAAC;IAC9E,CAAC;IAED,2EAA2E;IAC3E,qEAAqE;IACrE,wEAAwE;IACxE,2EAA2E;IAC3E,0EAA0E;IAC1E,mEAAmE;IACnE,sEAAsE;IACtE,0EAA0E;IAC1E,0EAA0E;IAC1E,wEAAwE;IAChE,oBAAoB,CAAC,MAA6B;QACxD,MAAM,mBAAmB,GAAwB,EAAE,CAAC;QAEpD,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;gBAC5C,SAAS;YACX,CAAC;YACD,MAAM,EAAE,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC7D,IAAI,CAAC,EAAE,EAAE,CAAC;gBACR,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,QAAQ,CAAC,IAAI,0BAA0B,QAAQ,CAAC,QAAQ,cAAc,CAAC,CAAC;gBACtG,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,sBAAW,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9E,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACtE,SAAS,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YACtC,2DAA2D;YAC3D,mEAAmE;YACnE,uEAAuE;YACvE,IAAI,yBAAW,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC/C,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,cAAc,mBAAmB,CAAC,MAAM,mCAAmC;gBAC3E,iFAAiF,CAClF,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,0BAA0B,CAAC,sBAAW,EAAE,mBAAmB,CAAC,CAAC;QACxE,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,IAAY,EAAE,IAAY,EAAE,KAA6C;QAC/F,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE3B,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAExF,IAAI,iBAAiB,EAAE,CAAC;YACtB,KAAK,CAAC,iBAAiB,CAAC,CAAC;YACzB,IAAI,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;YAC3C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC7D,KAAK,CAAC,SAAS,CAAC,CAAC;YACjB,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9E,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAEO,qBAAqB;QAC3B,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QACvG,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAClC,OAAO;QACT,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6BAA6B,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,sBAAW,EAAE,wBAAa,EAAE,gBAAgB,CAAC,CAAC;QACrF,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAClD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACjB,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACpC,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAnSD,gEAmSC"}
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED