homebridge-orro 1.0.7 → 1.0.11
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C;;;;EAIE;AACF,qBAAa,MAAM;IAeX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAf9B,OAAO,CAAC,OAAO,CAAU;IAEzB;;;MAGE;IACF,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,UAAU,CAAY;gBAGT,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,iBAAiB;IAgCjD,OAAO,
|
|
1
|
+
{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C;;;;EAIE;AACF,qBAAa,MAAM;IAeX,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAf9B,OAAO,CAAC,OAAO,CAAU;IAEzB;;;MAGE;IACF,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,UAAU,CAAY;gBAGT,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,iBAAiB;IAgCjD,OAAO,sBA8CN;IAED;;;MAGE;IACI,KAAK,CAAC,KAAK,EAAE,mBAAmB;IA6BtC;;;;;;;;;;;;MAYE;IACI,KAAK,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAM3C;;;MAGE;IACI,aAAa,CAAC,KAAK,EAAE,mBAAmB;CA6BjD"}
|
|
@@ -25,15 +25,19 @@ class Switch {
|
|
|
25
25
|
this.connect = async () => {
|
|
26
26
|
const url = `ws://${this.accessory.context.device.ipAddress}:8080/edison/${this.platform.config.homeID}`;
|
|
27
27
|
this.platform.log.info('Connecting to:', url);
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
const connection = new ws_1.default(url, { headers: { 'offline-access-token': this.platform.config.accessToken } });
|
|
29
|
+
connection.on('open', () => {
|
|
30
30
|
this.platform.log.info(`Connected to ${this.accessory.context.device.name}`);
|
|
31
31
|
// listen for system events
|
|
32
32
|
this.connection.on('message', response => {
|
|
33
33
|
try {
|
|
34
|
-
|
|
35
|
-
const {
|
|
34
|
+
// prevent moving forward if event is not for this switch
|
|
35
|
+
const { data, targetId } = JSON.parse(response.toString());
|
|
36
|
+
if (targetId !== this.accessory.context.device.switchID) {
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
36
39
|
// update on/off state if changed externally
|
|
40
|
+
const { dimmerLevel, onOff } = data || {};
|
|
37
41
|
if (typeof (onOff) === 'boolean' && onOff !== this.state.On) {
|
|
38
42
|
this.platform.log.info(`Updated on to ${onOff ? 'true' : 'false'} from system event`);
|
|
39
43
|
this.state.On = onOff;
|
|
@@ -51,14 +55,15 @@ class Switch {
|
|
|
51
55
|
}
|
|
52
56
|
});
|
|
53
57
|
});
|
|
54
|
-
|
|
58
|
+
connection.on('close', () => {
|
|
55
59
|
this.platform.log.error(`Disconnected from ${this.accessory.context.device.name}`);
|
|
56
60
|
this.connect();
|
|
57
61
|
});
|
|
58
|
-
|
|
62
|
+
connection.on('error', error => {
|
|
59
63
|
this.platform.log.error(`${this.accessory.context.device.name} error: ${error.message}`);
|
|
60
64
|
this.connect();
|
|
61
65
|
});
|
|
66
|
+
this.connection = connection;
|
|
62
67
|
};
|
|
63
68
|
// set accessory information
|
|
64
69
|
this.accessory.getService(this.platform.Service.AccessoryInformation)
|
|
@@ -88,6 +93,7 @@ class Switch {
|
|
|
88
93
|
*/
|
|
89
94
|
async setOn(value) {
|
|
90
95
|
try {
|
|
96
|
+
this.platform.log.info('Set On');
|
|
91
97
|
const payload = JSON.stringify({
|
|
92
98
|
targetId: this.accessory.context.device.switchID,
|
|
93
99
|
clientId: 'homebridge-orro',
|
|
@@ -97,10 +103,17 @@ class Switch {
|
|
|
97
103
|
command: value ? 'on' : 'off'
|
|
98
104
|
}
|
|
99
105
|
});
|
|
100
|
-
this.platform.log.info(this.connection);
|
|
101
106
|
this.connection.send(payload);
|
|
102
107
|
this.state.On = value;
|
|
103
|
-
this.platform.log.
|
|
108
|
+
this.platform.log.info('Set Characteristic On ->', {
|
|
109
|
+
targetId: this.accessory.context.device.switchID,
|
|
110
|
+
clientId: 'homebridge-orro',
|
|
111
|
+
type: 'RemoteCommand',
|
|
112
|
+
timestamp: Date.now(),
|
|
113
|
+
data: {
|
|
114
|
+
command: value ? 'on' : 'off'
|
|
115
|
+
}
|
|
116
|
+
});
|
|
104
117
|
}
|
|
105
118
|
catch (e) {
|
|
106
119
|
this.platform.log.error('Set Characteristic On Error -> ', e.message);
|
|
@@ -121,7 +134,7 @@ class Switch {
|
|
|
121
134
|
*/
|
|
122
135
|
async getOn() {
|
|
123
136
|
const isOn = this.state.On;
|
|
124
|
-
this.platform.log.
|
|
137
|
+
this.platform.log.info('Get Characteristic On ->', isOn);
|
|
125
138
|
return isOn;
|
|
126
139
|
}
|
|
127
140
|
/**
|
|
@@ -142,7 +155,16 @@ class Switch {
|
|
|
142
155
|
});
|
|
143
156
|
this.connection.send(payload);
|
|
144
157
|
this.state.Brightness = value;
|
|
145
|
-
this.platform.log.
|
|
158
|
+
this.platform.log.info('Set Characteristic Brightness -> ', {
|
|
159
|
+
targetId: this.accessory.context.device.switchID,
|
|
160
|
+
clientId: 'homebridge-orro',
|
|
161
|
+
type: 'RemoteCommand',
|
|
162
|
+
timestamp: Date.now(),
|
|
163
|
+
data: {
|
|
164
|
+
command: 'dimmer_set',
|
|
165
|
+
value: value
|
|
166
|
+
}
|
|
167
|
+
});
|
|
146
168
|
}
|
|
147
169
|
catch (e) {
|
|
148
170
|
this.platform.log.error('Set Characteristic Brightness Error -> ', e.message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":";;;;;;AAEA,4CAA2B;AAE3B;;;;EAIE;AACF,MAAa,MAAM;IAcf,YACqB,QAAsB,EACtB,SAA4B;QAD5B,aAAQ,GAAR,QAAQ,CAAc;QACtB,cAAS,GAAT,SAAS,CAAmB;QAbjD;;;UAGE;QACM,UAAK,GAAG;YACZ,EAAE,EAAE,KAAK;YACT,UAAU,EAAE,CAAC;SAChB,CAAC;QAsCF,YAAO,GAAG,KAAK,IAAI,EAAE;YAEjB,MAAM,GAAG,GAAG,QAAQ,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,gBAAgB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACzG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;YAC9C,
|
|
1
|
+
{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"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"}
|