homebridge-openrgb-multi 8.0.0 → 8.0.1
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/dist/Device.js +8 -7
- package/dist/Device.js.map +1 -1
- package/dist/Zone.js +1 -0
- package/dist/Zone.js.map +1 -1
- package/dist/platformFactory.js +1 -0
- package/dist/platformFactory.js.map +1 -1
- package/package.json +3 -3
- package/src/Device.ts +10 -8
- package/src/Zone.ts +2 -0
- package/src/platformFactory.ts +5 -1
package/dist/Device.js
CHANGED
|
@@ -38,21 +38,22 @@ class Device {
|
|
|
38
38
|
initialize() {
|
|
39
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
40
|
if (this.virtual) {
|
|
41
|
-
this.context.log.info(`Initialized virtual device
|
|
41
|
+
this.context.log.info(`Initialized virtual device ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)}`);
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
this.context.openRgbClient.once('connect', () => __awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
this.context.log.debug(`Connected OpenRGB, initializing device ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)}`);
|
|
45
46
|
const openRgbDevices = yield this.context.openRgbClient.getAllControllerData();
|
|
46
47
|
const openRgbDevice = openRgbDevices.find((openRgb) => openRgb.serial.replace(/\s+$/g, '') ===
|
|
47
48
|
this.configuration.serial);
|
|
48
49
|
if (!openRgbDevice) {
|
|
49
|
-
this.context.log.warn(`Could not resolve device
|
|
50
|
+
this.context.log.warn(`Could not resolve device ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)} to OpenRGB controller`);
|
|
50
51
|
}
|
|
51
52
|
else {
|
|
52
53
|
this.openRgbDeviceId = openRgbDevice.deviceId;
|
|
53
54
|
this.size = openRgbDevice.leds.length;
|
|
54
55
|
this.colors = new Array(this.size).fill(palette_kit_core_1.DEFAULT_COLOR);
|
|
55
|
-
this.context.log.info(`Resolved device
|
|
56
|
+
this.context.log.info(`Resolved device ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)} to OpenRGB controller ID [${this.openRgbDeviceId}] with size ${this.size}`);
|
|
56
57
|
}
|
|
57
58
|
}));
|
|
58
59
|
});
|
|
@@ -60,11 +61,11 @@ class Device {
|
|
|
60
61
|
withWriteLock(callback) {
|
|
61
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
63
|
if (!this.virtual && this.openRgbDeviceId < 0) {
|
|
63
|
-
this.context.log.warn(`Ignoring write lock request because device
|
|
64
|
+
this.context.log.warn(`Ignoring write lock request because device ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)} was not initialized`);
|
|
64
65
|
return;
|
|
65
66
|
}
|
|
66
67
|
if (!this.virtual && !this.context.openRgbClient.isConnected) {
|
|
67
|
-
this.context.log.warn(`Ignoring write lock request for device
|
|
68
|
+
this.context.log.warn(`Ignoring write lock request for device ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)} because OpenRGB client is not connected`);
|
|
68
69
|
return;
|
|
69
70
|
}
|
|
70
71
|
return this.lock.writeLock((release) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -107,7 +108,7 @@ class Device {
|
|
|
107
108
|
yield this.withWriteLock(() => __awaiter(this, void 0, void 0, function* () {
|
|
108
109
|
if (this.virtual)
|
|
109
110
|
return;
|
|
110
|
-
this.context.log.debug(`Applied
|
|
111
|
+
this.context.log.debug(`Applied ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)}.active = ${(0, helpers_for_homebridge_1.logBoolean)(active)}`);
|
|
111
112
|
}));
|
|
112
113
|
});
|
|
113
114
|
}
|
|
@@ -132,7 +133,7 @@ class Device {
|
|
|
132
133
|
this.colors[index] = colors[index - fromIndex];
|
|
133
134
|
}
|
|
134
135
|
}
|
|
135
|
-
this.context.log.debug(`Applied
|
|
136
|
+
this.context.log.debug(`Applied ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)}[${fromIndex}-${toIndex}] = [\n${colors
|
|
136
137
|
.map(palette_kit_core_1.colorToString)
|
|
137
138
|
.map((colorString) => ' ' + colorString)
|
|
138
139
|
.join(',\n')}\n]`);
|
package/dist/Device.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../src/Device.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oDAAmC;AACnC,iCAAgC;AAChC,6CAAoD;AAEpD,kEAOqC;AAGrC,
|
|
1
|
+
{"version":3,"file":"Device.js","sourceRoot":"","sources":["../src/Device.ts"],"names":[],"mappings":"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"}
|
package/dist/Zone.js
CHANGED
|
@@ -42,6 +42,7 @@ class Zone extends effect_kit_1.Zone {
|
|
|
42
42
|
}
|
|
43
43
|
}));
|
|
44
44
|
this.context.openRgbClient.once('connect', () => __awaiter(this, void 0, void 0, function* () {
|
|
45
|
+
this.context.log.debug(`Connected OpenRGB, initializing zone ${(0, helpers_for_homebridge_1.logAccessoryName)(this.name)}`);
|
|
45
46
|
if (this.context.persistence) {
|
|
46
47
|
const active = yield this.context.persistence.getZoneActive(this.id);
|
|
47
48
|
const brightness = yield this.context.persistence.getZoneBrightness(this.id);
|
package/dist/Zone.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Zone.js","sourceRoot":"","sources":["../src/Zone.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Zone.js","sourceRoot":"","sources":["../src/Zone.ts"],"names":[],"mappings":"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"}
|
package/dist/platformFactory.js
CHANGED
|
@@ -60,6 +60,7 @@ const createPlatform = (homebridge) => {
|
|
|
60
60
|
while (!this.context.openRgbClient.isConnected) {
|
|
61
61
|
try {
|
|
62
62
|
yield this.context.openRgbClient.connect();
|
|
63
|
+
this.context.log.info(`Connected to OpenRGB server at ${this.configuration.openRgbHost}:${this.configuration.openRgbPort}`);
|
|
63
64
|
}
|
|
64
65
|
catch (error) {
|
|
65
66
|
this.context.log.warn(`Failed to connect to OpenRGB server at ${this.configuration.openRgbHost}:${this.configuration.openRgbPort}. Retrying in 5 seconds...`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformFactory.js","sourceRoot":"","sources":["../src/platformFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AAEtD,qCAAuC;AACvC,mEAAgE;AAChE,kEAAsD;AACtD,sEAA8D;AAG9D,yCAAgD;AAChD,+CAIuB;AACvB,iCAA8B;AAC9B,2CAAyE;AAElE,MAAM,cAAc,GAAG,CAAC,UAAe,EAAE,EAAE;IAChD,MAAM,QAAQ;QAIZ,YACE,aAAsB,EACb,aAAoC;;YAApC,kBAAa,GAAb,aAAa,CAAuB;YAJ/C,UAAK,GAAG,IAAI,GAAG,EAA8B,CAAC;YAM5C,MAAM,GAAG,GAAG,IAAA,sBAAY,EAAC;gBACvB,KAAK,EAAE,OAAO;gBACd,UAAU,EAAE;oBACV,IAAI,+CAAsB,CAAC,aAAa,CAAC;iBAC1C;aACF,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,6BAAkB,CAAC,MAAA,aAAa,CAAC,WAAW,mCAAI,EAAE,EAAE;gBAC1E,UAAU;gBACV,GAAG;aACJ,CAAC,CAAC;YAEH,MAAM,aAAa,GAAG,IAAI,oBAAa,CACrC,SAAS,EACT,MAAA,aAAa,CAAC,WAAW,mCAAI,gCAAoB,EACjD,MAAA,aAAa,CAAC,WAAW,mCAAI,gCAAoB,CAClD,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,0BAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,aAAa,CAAC,aAAa;gBAC/C,CAAC,CAAC,IAAI,kCAAa,CACf,aAAa,CAAC,aAAa,EAC3B;oBACE,GAAG;iBACJ,EACD,OAAO,CACR;gBACH,CAAC,CAAC,IAAI,CAAC;YAET,IAAI,CAAC,OAAO,GAAG;gBACb,UAAU;gBACV,aAAa;gBACb,OAAO;gBACP,aAAa;gBACb,GAAG;gBACH,WAAW;aACZ,CAAC;YAEF,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;gBAChD,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEvD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,CAAC;QAEK,oBAAoB;;gBACxB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;oBAC/C,IAAI,CAAC;wBACH,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"platformFactory.js","sourceRoot":"","sources":["../src/platformFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AAEtD,qCAAuC;AACvC,mEAAgE;AAChE,kEAAsD;AACtD,sEAA8D;AAG9D,yCAAgD;AAChD,+CAIuB;AACvB,iCAA8B;AAC9B,2CAAyE;AAElE,MAAM,cAAc,GAAG,CAAC,UAAe,EAAE,EAAE;IAChD,MAAM,QAAQ;QAIZ,YACE,aAAsB,EACb,aAAoC;;YAApC,kBAAa,GAAb,aAAa,CAAuB;YAJ/C,UAAK,GAAG,IAAI,GAAG,EAA8B,CAAC;YAM5C,MAAM,GAAG,GAAG,IAAA,sBAAY,EAAC;gBACvB,KAAK,EAAE,OAAO;gBACd,UAAU,EAAE;oBACV,IAAI,+CAAsB,CAAC,aAAa,CAAC;iBAC1C;aACF,CAAC,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,6BAAkB,CAAC,MAAA,aAAa,CAAC,WAAW,mCAAI,EAAE,EAAE;gBAC1E,UAAU;gBACV,GAAG;aACJ,CAAC,CAAC;YAEH,MAAM,aAAa,GAAG,IAAI,oBAAa,CACrC,SAAS,EACT,MAAA,aAAa,CAAC,WAAW,mCAAI,gCAAoB,EACjD,MAAA,aAAa,CAAC,WAAW,mCAAI,gCAAoB,CAClD,CAAC;YAEF,MAAM,OAAO,GAAG,IAAI,0BAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YACzC,MAAM,aAAa,GAAG,aAAa,CAAC,aAAa;gBAC/C,CAAC,CAAC,IAAI,kCAAa,CACf,aAAa,CAAC,aAAa,EAC3B;oBACE,GAAG;iBACJ,EACD,OAAO,CACR;gBACH,CAAC,CAAC,IAAI,CAAC;YAET,IAAI,CAAC,OAAO,GAAG;gBACb,UAAU;gBACV,aAAa;gBACb,OAAO;gBACP,aAAa;gBACb,GAAG;gBACH,WAAW;aACZ,CAAC;YAEF,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;gBAChD,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEvD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;QACL,CAAC;QAEK,oBAAoB;;gBACxB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,WAAW,EAAE,CAAC;oBAC/C,IAAI,CAAC;wBACH,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;wBAE3C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CACnB,kCAAkC,IAAI,CAAC,aAAa,CAAC,WAAW,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,EAAE,CACrG,CAAC;oBACJ,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CACnB,0CAA0C,IAAI,CAAC,aAAa,CAAC,WAAW,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,4BAA4B,CACvI,CAAC;wBAEF,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC;YACH,CAAC;SAAA;QAEY,WAAW,CAAC,QAAQ;;gBAC/B,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAE5B,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;gBAC3C,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;oBACjD,OAAO,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;gBACjC,CAAC,CAAA,CAAC,CACH,CAAC;gBAEF,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAC7D,CAAC,IAAI,EAAE,EAAE;oBACP,MAAM,mBAAmB,GAAG,IAAI,iCAAmB,CACjD,IAAI,EACJ,IAAI,CAAC,OAAO,CACb,CAAC;oBACF,MAAM,uBAAuB,GAAG,IAAI,qCAAuB,CACzD,IAAI,EACJ,IAAI,CAAC,OAAO,CACb,CAAC;oBACF,MAAM,4BAA4B,GAAG,IAAI,0CAA4B,CACnE,IAAI,EACJ,IAAI,CAAC,OAAO,CACb,CAAC;oBAEF,IAAI,CAAC,EAAE,CAAC,kBAAkB,EAAE,CAAC,UAAU,EAAE,EAAE;wBACzC,uBAAuB,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;oBACvD,CAAC,CAAC,CAAC;oBAEH,IAAI,CAAC,EAAE,CAAC,6BAA6B,EAAE,CAAC,qBAAqB,EAAE,EAAE;wBAC/D,4BAA4B,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;oBAC7D,CAAC,CAAC,CAAC;oBAEH,OAAO;wBACL,mBAAmB;wBACnB,uBAAuB;wBACvB,4BAA4B;qBAC7B,CAAC;gBACJ,CAAC,CACF,CAAC;gBAEF,MAAM,WAAW,GAAG,CAAC,GAAG,eAAe,CAAC,CAAC;gBAEzC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACxB,CAAC;SAAA;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAvHW,QAAA,cAAc,kBAuHzB"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "homebridge-openrgb-multi",
|
|
3
3
|
"displayName": "Homebridge OpenRGB Multi",
|
|
4
4
|
"description": "Homebridge plugin for multi-color dynamic effects for OpenRGB",
|
|
5
|
-
"version": "8.0.
|
|
5
|
+
"version": "8.0.1",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"homebridge-plugin"
|
|
8
8
|
],
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
},
|
|
20
20
|
"deprecated": false,
|
|
21
21
|
"engines": {
|
|
22
|
-
"node": "^24
|
|
22
|
+
"node": "^24",
|
|
23
23
|
"homebridge": "^2.0.0"
|
|
24
24
|
},
|
|
25
25
|
"scripts": {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"@manganese/effect-kit": "^3.4.0",
|
|
35
35
|
"@manganese/palette-kit-client": "^5.0.0",
|
|
36
36
|
"@manganese/palette-kit-core": "^5.0.0",
|
|
37
|
-
"helpers-for-homebridge": "^
|
|
37
|
+
"helpers-for-homebridge": "^7.0.0",
|
|
38
38
|
"lodash": "^4.17.21",
|
|
39
39
|
"openrgb-sdk": "^0.6.0",
|
|
40
40
|
"rwlock": "^5.0.0",
|
package/src/Device.ts
CHANGED
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
} from '@manganese/palette-kit-core';
|
|
13
13
|
import { Controller, ApplyParameters } from '@manganese/effect-kit';
|
|
14
14
|
import { Context, DeviceConfiguration } from './types';
|
|
15
|
-
import { logBoolean } from 'helpers-for-homebridge';
|
|
15
|
+
import { logAccessoryName, logBoolean } from 'helpers-for-homebridge';
|
|
16
16
|
|
|
17
17
|
export class Device implements Controller {
|
|
18
18
|
private openRgbDeviceId: number = -1;
|
|
@@ -43,13 +43,15 @@ export class Device implements Controller {
|
|
|
43
43
|
public async initialize() {
|
|
44
44
|
if (this.virtual) {
|
|
45
45
|
this.context.log.info(
|
|
46
|
-
`Initialized virtual device
|
|
46
|
+
`Initialized virtual device ${logAccessoryName(this.name)}`
|
|
47
47
|
);
|
|
48
48
|
|
|
49
49
|
return;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
this.context.openRgbClient.once('connect', async () => {
|
|
53
|
+
this.context.log.debug(`Connected OpenRGB, initializing device ${logAccessoryName(this.name)}`);
|
|
54
|
+
|
|
53
55
|
const openRgbDevices =
|
|
54
56
|
await (this.context.openRgbClient.getAllControllerData() as unknown as Promise<
|
|
55
57
|
OpenRGBDevice[]
|
|
@@ -62,14 +64,14 @@ export class Device implements Controller {
|
|
|
62
64
|
|
|
63
65
|
if (!openRgbDevice) {
|
|
64
66
|
this.context.log.warn(
|
|
65
|
-
`Could not resolve device
|
|
67
|
+
`Could not resolve device ${logAccessoryName(this.name)} to OpenRGB controller`
|
|
66
68
|
);
|
|
67
69
|
} else {
|
|
68
70
|
this.openRgbDeviceId = openRgbDevice.deviceId;
|
|
69
71
|
this.size = openRgbDevice.leds.length;
|
|
70
72
|
this.colors = new Array(this.size).fill(DEFAULT_COLOR);
|
|
71
73
|
this.context.log.info(
|
|
72
|
-
`Resolved device
|
|
74
|
+
`Resolved device ${logAccessoryName(this.name)} to OpenRGB controller ID [${this.openRgbDeviceId}] with size ${this.size}`
|
|
73
75
|
);
|
|
74
76
|
}
|
|
75
77
|
});
|
|
@@ -78,14 +80,14 @@ export class Device implements Controller {
|
|
|
78
80
|
private async withWriteLock(callback: () => Promise<void>) {
|
|
79
81
|
if (!this.virtual && this.openRgbDeviceId < 0) {
|
|
80
82
|
this.context.log.warn(
|
|
81
|
-
`Ignoring write lock request because device
|
|
83
|
+
`Ignoring write lock request because device ${logAccessoryName(this.name)} was not initialized`
|
|
82
84
|
);
|
|
83
85
|
|
|
84
86
|
return;
|
|
85
87
|
}
|
|
86
88
|
if (!this.virtual && !this.context.openRgbClient.isConnected) {
|
|
87
89
|
this.context.log.warn(
|
|
88
|
-
`Ignoring write lock request for device
|
|
90
|
+
`Ignoring write lock request for device ${logAccessoryName(this.name)} because OpenRGB client is not connected`
|
|
89
91
|
);
|
|
90
92
|
|
|
91
93
|
return;
|
|
@@ -137,7 +139,7 @@ export class Device implements Controller {
|
|
|
137
139
|
if (this.virtual) return;
|
|
138
140
|
|
|
139
141
|
this.context.log.debug(
|
|
140
|
-
`Applied
|
|
142
|
+
`Applied ${logAccessoryName(this.name)}.active = ${logBoolean(active)}`
|
|
141
143
|
);
|
|
142
144
|
});
|
|
143
145
|
}
|
|
@@ -176,7 +178,7 @@ export class Device implements Controller {
|
|
|
176
178
|
}
|
|
177
179
|
|
|
178
180
|
this.context.log.debug(
|
|
179
|
-
`Applied
|
|
181
|
+
`Applied ${logAccessoryName(this.name)}[${fromIndex}-${toIndex}] = [\n${colors
|
|
180
182
|
.map(colorToString)
|
|
181
183
|
.map((colorString) => ' ' + colorString)
|
|
182
184
|
.join(',\n')}\n]`
|
package/src/Zone.ts
CHANGED
|
@@ -42,6 +42,8 @@ export class Zone extends EffectKitZone {
|
|
|
42
42
|
});
|
|
43
43
|
|
|
44
44
|
this.context.openRgbClient.once('connect', async () => {
|
|
45
|
+
this.context.log.debug(`Connected OpenRGB, initializing zone ${logAccessoryName(this.name)}`);
|
|
46
|
+
|
|
45
47
|
if (this.context.persistence) {
|
|
46
48
|
const active = await this.context.persistence.getZoneActive(this.id);
|
|
47
49
|
const brightness = await this.context.persistence.getZoneBrightness(
|
package/src/platformFactory.ts
CHANGED
|
@@ -72,6 +72,10 @@ export const createPlatform = (homebridge: API) => {
|
|
|
72
72
|
while (!this.context.openRgbClient.isConnected) {
|
|
73
73
|
try {
|
|
74
74
|
await this.context.openRgbClient.connect();
|
|
75
|
+
|
|
76
|
+
this.context.log.info(
|
|
77
|
+
`Connected to OpenRGB server at ${this.configuration.openRgbHost}:${this.configuration.openRgbPort}`
|
|
78
|
+
);
|
|
75
79
|
} catch (error) {
|
|
76
80
|
this.context.log.warn(
|
|
77
81
|
`Failed to connect to OpenRGB server at ${this.configuration.openRgbHost}:${this.configuration.openRgbPort}. Retrying in 5 seconds...`
|
|
@@ -84,7 +88,7 @@ export const createPlatform = (homebridge: API) => {
|
|
|
84
88
|
|
|
85
89
|
public async accessories(callback) {
|
|
86
90
|
this.connectOpenRgbClient();
|
|
87
|
-
|
|
91
|
+
|
|
88
92
|
await this.context.paletteClient.connect();
|
|
89
93
|
await Promise.all(
|
|
90
94
|
Array.from(this.zones.values()).map(async (zone) => {
|