homebridge-soundtouchspeaker 0.2.3-beta.0 → 0.2.4-beta.2
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/README.md +1 -1
- package/dist/__tests__/ExternalPlatformConfig.test.js +1 -1
- package/dist/__tests__/ExternalPlatformConfig.test.js.map +1 -1
- package/dist/__tests__/PlatformConfiguration.test.d.ts +1 -0
- package/dist/__tests__/PlatformConfiguration.test.js +97 -0
- package/dist/__tests__/PlatformConfiguration.test.js.map +1 -0
- package/dist/accessories/SoundTouchSpeakerPlatformAccessory.d.ts +2 -0
- package/dist/accessories/SoundTouchSpeakerPlatformAccessory.js +12 -2
- package/dist/accessories/SoundTouchSpeakerPlatformAccessory.js.map +1 -1
- package/dist/accessories/services/SoundTouchSpeakerOnCharacteristic.js +1 -6
- package/dist/accessories/services/SoundTouchSpeakerOnCharacteristic.js.map +1 -1
- package/dist/devices/SoundTouch/__tests__/SoundTouchDeviceConfiguration.test.d.ts +1 -0
- package/dist/devices/SoundTouch/__tests__/SoundTouchDeviceConfiguration.test.js +120 -0
- package/dist/devices/SoundTouch/__tests__/SoundTouchDeviceConfiguration.test.js.map +1 -0
- package/dist/devices/SoundTouch/api/api.js +3 -2
- package/dist/devices/SoundTouch/api/api.js.map +1 -1
- package/dist/platform.js +41 -27
- package/dist/platform.js.map +1 -1
- package/dist/utils/FormattedLogger.d.ts +1 -1
- package/dist/utils/FormattedLogger.js +6 -6
- package/dist/utils/FormattedLogger.js.map +1 -1
- package/dist/utils/__tests__/FormattedLogger.test.js +105 -49
- package/dist/utils/__tests__/FormattedLogger.test.js.map +1 -1
- package/jest.config.ts +4 -2
- package/package.json +5 -5
- package/.idea/workspace.xml +0 -720
package/README.md
CHANGED
|
@@ -11,7 +11,7 @@ Attempts to repair the [plugin](https://github.com/bbriatte/homebridge-soundtouc
|
|
|
11
11
|
made by [@bbriatte](http://github.com/bbriatte) to work on Homebridge v1.8.
|
|
12
12
|
|
|
13
13
|
Initial version only supports a switch accessory type, to power a speaker on and off. Future versions hope to reinstate support
|
|
14
|
-
other features like volume control, sources, presets, lightbulb mode if there is demand.
|
|
14
|
+
for other features like volume control, sources, presets, lightbulb mode if there is demand.
|
|
15
15
|
|
|
16
16
|
## Prerequisites
|
|
17
17
|
1. [Homebridge](https://github.com/homebridge/homebridge) v1.8.0 or later
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { flattenAccessoryConfiguration } from '../ExternalPlatformConfig';
|
|
1
|
+
import { flattenAccessoryConfiguration } from '../ExternalPlatformConfig.js';
|
|
2
2
|
describe('calculateResultingAccessoryConfiguration', () => {
|
|
3
3
|
test('it merges accessory and global configurations', () => {
|
|
4
4
|
const result = flattenAccessoryConfiguration({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExternalPlatformConfig.test.js","sourceRoot":"","sources":["../../src/__tests__/ExternalPlatformConfig.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"ExternalPlatformConfig.test.js","sourceRoot":"","sources":["../../src/__tests__/ExternalPlatformConfig.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAE7E,QAAQ,CAAC,0CAA0C,EAAE,GAAG,EAAE;IACxD,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACzD,MAAM,MAAM,GAAG,6BAA6B,CAAC;YAC3C,YAAY,EAAE;gBACZ,OAAO,EAAE,IAAI;gBACb,eAAe,EAAE,IAAI;aACtB;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,KAAK;gBACd,eAAe,EAAE,IAAI;aACtB;SACF,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,KAAK;YACd,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC5D,MAAM,MAAM,GAAG,6BAA6B,CAAC;YAC3C,YAAY,EAAE;gBACZ,OAAO,EAAE,SAAS;gBAClB,eAAe,EAAE,SAAS;aAC3B;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,KAAK;gBACd,eAAe,EAAE,IAAI;aACtB;SACF,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,KAAK;YACd,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC/D,MAAM,MAAM,GAAG,6BAA6B,CAAC;YAC3C,YAAY,EAAE;gBACZ,OAAO,EAAE,IAAI;gBACb,eAAe,EAAE,IAAI;aACtB;YACD,SAAS,EAAE;gBACT,OAAO,EAAE,SAAS;gBAClB,eAAe,EAAE,SAAS;aAC3B;SACF,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,IAAI;YACb,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACxD,MAAM,MAAM,GAAG,6BAA6B,CAAC;YAC3C,YAAY,EAAE,SAAS;YACvB,SAAS,EAAE;gBACT,OAAO,EAAE,IAAI;gBACb,eAAe,EAAE,IAAI;aACtB;SACF,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,IAAI;YACb,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC5D,MAAM,MAAM,GAAG,6BAA6B,CAAC;YAC3C,YAAY,EAAE,SAAS;YACvB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
import { describe, expect, test } from '@jest/globals';
|
|
2
|
+
import { PlatformConfiguration } from '../PlatformConfiguration.js';
|
|
3
|
+
import { PLATFORM_NAME } from '../settings.js';
|
|
4
|
+
describe('PlatformConfiguration', () => {
|
|
5
|
+
describe('fromExternalConfiguration', () => {
|
|
6
|
+
test('applies defaults when no config is provided', () => {
|
|
7
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
8
|
+
platform: PLATFORM_NAME,
|
|
9
|
+
});
|
|
10
|
+
expect(config.discoverAllAccessories).toBe(false);
|
|
11
|
+
expect(config.verbose).toBe(false);
|
|
12
|
+
expect(config.pollingInterval).toBe(2000);
|
|
13
|
+
expect(config.accessories).toEqual([]);
|
|
14
|
+
expect(config.name).toBe(PLATFORM_NAME);
|
|
15
|
+
});
|
|
16
|
+
test('uses provided name over default', () => {
|
|
17
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
18
|
+
platform: PLATFORM_NAME,
|
|
19
|
+
name: 'My Speaker Hub',
|
|
20
|
+
});
|
|
21
|
+
expect(config.name).toBe('My Speaker Hub');
|
|
22
|
+
});
|
|
23
|
+
test('sets discoverAllAccessories when provided', () => {
|
|
24
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
25
|
+
platform: PLATFORM_NAME,
|
|
26
|
+
discoverAllAccessories: true,
|
|
27
|
+
});
|
|
28
|
+
expect(config.discoverAllAccessories).toBe(true);
|
|
29
|
+
});
|
|
30
|
+
test('builds IP-based accessory from config', () => {
|
|
31
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
32
|
+
platform: PLATFORM_NAME,
|
|
33
|
+
accessories: [{ name: 'Kitchen', ip: '192.168.1.10', port: 8090 }],
|
|
34
|
+
});
|
|
35
|
+
expect(config.accessories).toHaveLength(1);
|
|
36
|
+
expect(config.accessories[0].type).toBe('ip');
|
|
37
|
+
expect(config.accessories[0].ip).toBe('192.168.1.10');
|
|
38
|
+
expect(config.accessories[0].port).toBe(8090);
|
|
39
|
+
expect(config.accessories[0].name).toBe('Kitchen');
|
|
40
|
+
});
|
|
41
|
+
test('builds room-based accessory from config', () => {
|
|
42
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
43
|
+
platform: PLATFORM_NAME,
|
|
44
|
+
accessories: [{ name: 'Living Room', room: 'Living Room' }],
|
|
45
|
+
});
|
|
46
|
+
expect(config.accessories).toHaveLength(1);
|
|
47
|
+
expect(config.accessories[0].type).toBe('room');
|
|
48
|
+
expect(config.accessories[0].room).toBe('Living Room');
|
|
49
|
+
});
|
|
50
|
+
test('merges global config into accessories', () => {
|
|
51
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
52
|
+
platform: PLATFORM_NAME,
|
|
53
|
+
global: { pollingInterval: 5000 },
|
|
54
|
+
accessories: [{ name: 'Bedroom', ip: '192.168.1.11' }],
|
|
55
|
+
});
|
|
56
|
+
expect(config.accessories[0].pollingInterval).toBe(5000);
|
|
57
|
+
});
|
|
58
|
+
test('accessory-level pollingInterval overrides global', () => {
|
|
59
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
60
|
+
platform: PLATFORM_NAME,
|
|
61
|
+
global: { pollingInterval: 5000 },
|
|
62
|
+
accessories: [
|
|
63
|
+
{ name: 'Office', ip: '192.168.1.12', pollingInterval: 1000 },
|
|
64
|
+
],
|
|
65
|
+
});
|
|
66
|
+
expect(config.accessories[0].pollingInterval).toBe(1000);
|
|
67
|
+
});
|
|
68
|
+
test('accessories without ip or room are excluded', () => {
|
|
69
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
70
|
+
platform: PLATFORM_NAME,
|
|
71
|
+
accessories: [{ name: 'Mystery' }],
|
|
72
|
+
});
|
|
73
|
+
expect(config.accessories).toHaveLength(0);
|
|
74
|
+
});
|
|
75
|
+
test('handles multiple accessories', () => {
|
|
76
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
77
|
+
platform: PLATFORM_NAME,
|
|
78
|
+
accessories: [
|
|
79
|
+
{ name: 'Kitchen', ip: '192.168.1.10' },
|
|
80
|
+
{ name: 'Lounge', room: 'Lounge' },
|
|
81
|
+
],
|
|
82
|
+
});
|
|
83
|
+
expect(config.accessories).toHaveLength(2);
|
|
84
|
+
expect(config.accessories[0].type).toBe('ip');
|
|
85
|
+
expect(config.accessories[1].type).toBe('room');
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
describe('toJson', () => {
|
|
89
|
+
test('serialises to valid JSON', () => {
|
|
90
|
+
const config = PlatformConfiguration.fromExternalConfiguration({
|
|
91
|
+
platform: PLATFORM_NAME,
|
|
92
|
+
});
|
|
93
|
+
expect(() => JSON.parse(config.toJson())).not.toThrow();
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
});
|
|
97
|
+
//# sourceMappingURL=PlatformConfiguration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PlatformConfiguration.test.js","sourceRoot":"","sources":["../../src/__tests__/PlatformConfiguration.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;QACzC,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACvD,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;aACxB,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;YAC3C,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,IAAI,EAAE,gBAAgB;aACvB,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACrD,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,sBAAsB,EAAE,IAAI;aAC7B,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;YACjD,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;aACnE,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YACtD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACnD,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;aAC5D,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uCAAuC,EAAE,GAAG,EAAE;YACjD,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,MAAM,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE;gBACjC,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC;aACvD,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;YAC5D,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,MAAM,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE;gBACjC,WAAW,EAAE;oBACX,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,cAAc,EAAE,eAAe,EAAE,IAAI,EAAE;iBAC9D;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;YACvD,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,WAAW,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;aACnC,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,8BAA8B,EAAE,GAAG,EAAE;YACxC,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;gBACvB,WAAW,EAAE;oBACX,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE;oBACvC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;iBACnC;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;YAC3C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,IAAI,CAAC,0BAA0B,EAAE,GAAG,EAAE;YACpC,MAAM,MAAM,GAAG,qBAAqB,CAAC,yBAAyB,CAAC;gBAC7D,QAAQ,EAAE,aAAa;aACxB,CAAC,CAAC;YAEH,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { SoundTouchHomebridgePlatform } from '../platform.js';
|
|
|
4
4
|
import { SoundTouchSpeakerCharacteristic } from './services/SoundTouchSpeakerCharacteristic.js';
|
|
5
5
|
export declare class SoundTouchSpeakerPlatformAccessory extends SoundTouchSpeakerCharacteristic {
|
|
6
6
|
private readonly speakerCharacteristics;
|
|
7
|
+
private _isPolling;
|
|
7
8
|
constructor({ speakerCharacteristics, ...props }: {
|
|
8
9
|
accessory: PlatformAccessory;
|
|
9
10
|
device: SoundTouchDevice;
|
|
@@ -12,6 +13,7 @@ export declare class SoundTouchSpeakerPlatformAccessory extends SoundTouchSpeake
|
|
|
12
13
|
});
|
|
13
14
|
init(): Promise<void>;
|
|
14
15
|
refresh(): Promise<void>;
|
|
16
|
+
stopPolling(): void;
|
|
15
17
|
private _refreshDeviceServices;
|
|
16
18
|
static createAccessory(props: {
|
|
17
19
|
platform: SoundTouchHomebridgePlatform;
|
|
@@ -25,6 +25,7 @@ export class SoundTouchSpeakerPlatformAccessory extends SoundTouchSpeakerCharact
|
|
|
25
25
|
constructor(_a) {
|
|
26
26
|
var { speakerCharacteristics } = _a, props = __rest(_a, ["speakerCharacteristics"]);
|
|
27
27
|
super(props);
|
|
28
|
+
this._isPolling = false;
|
|
28
29
|
this.speakerCharacteristics = speakerCharacteristics;
|
|
29
30
|
}
|
|
30
31
|
init() {
|
|
@@ -35,6 +36,7 @@ export class SoundTouchSpeakerPlatformAccessory extends SoundTouchSpeakerCharact
|
|
|
35
36
|
}
|
|
36
37
|
}
|
|
37
38
|
if (this.device.configuration.pollingInterval !== undefined) {
|
|
39
|
+
this._isPolling = true;
|
|
38
40
|
this._refreshDeviceServices().then(() => {
|
|
39
41
|
//no-op
|
|
40
42
|
});
|
|
@@ -51,11 +53,19 @@ export class SoundTouchSpeakerPlatformAccessory extends SoundTouchSpeakerCharact
|
|
|
51
53
|
}
|
|
52
54
|
});
|
|
53
55
|
}
|
|
56
|
+
stopPolling() {
|
|
57
|
+
this._isPolling = false;
|
|
58
|
+
}
|
|
54
59
|
_refreshDeviceServices() {
|
|
55
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
|
-
while (
|
|
61
|
+
while (this._isPolling) {
|
|
57
62
|
yield new Promise((resolve) => setTimeout(resolve, this.device.configuration.pollingInterval));
|
|
58
|
-
|
|
63
|
+
try {
|
|
64
|
+
yield this.refresh();
|
|
65
|
+
}
|
|
66
|
+
catch (e) {
|
|
67
|
+
this.log.error('Polling refresh failed', e);
|
|
68
|
+
}
|
|
59
69
|
}
|
|
60
70
|
});
|
|
61
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SoundTouchSpeakerPlatformAccessory.js","sourceRoot":"","sources":["../../src/accessories/SoundTouchSpeakerPlatformAccessory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAGA,OAAO,EACL,cAAc,EACd,WAAW,EACX,+BAA+B,GAChC,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAAE,0CAA0C,EAAE,MAAM,0DAA0D,CAAC;AACtH,OAAO,EAAE,iCAAiC,EAAE,MAAM,iDAAiD,CAAC;AAEpG,MAAM,OAAO,kCAAmC,SAAQ,+BAA+B;
|
|
1
|
+
{"version":3,"file":"SoundTouchSpeakerPlatformAccessory.js","sourceRoot":"","sources":["../../src/accessories/SoundTouchSpeakerPlatformAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,12 +50,7 @@ export class SoundTouchSpeakerOnCharacteristic extends SoundTouchSpeakerCharacte
|
|
|
50
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
51
51
|
const desiredPowerStatus = value;
|
|
52
52
|
try {
|
|
53
|
-
if (desiredPowerStatus
|
|
54
|
-
this.characteristic.value !== desiredPowerStatus) {
|
|
55
|
-
yield this.device.api.pressKey(KeyValue.power);
|
|
56
|
-
}
|
|
57
|
-
else if (!desiredPowerStatus &&
|
|
58
|
-
this.characteristic.value !== desiredPowerStatus) {
|
|
53
|
+
if (this.characteristic.value !== desiredPowerStatus) {
|
|
59
54
|
yield this.device.api.pressKey(KeyValue.power);
|
|
60
55
|
}
|
|
61
56
|
this.log.success('set status - %s', desiredPowerStatus ? 'on' : 'off');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SoundTouchSpeakerOnCharacteristic.js","sourceRoot":"","sources":["../../../src/accessories/services/SoundTouchSpeakerOnCharacteristic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAEhF,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AACjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,MAAM,OAAO,iCAAkC,SAAQ,+BAA+B;IAKpF,YAAY,EAQX;YARW,EACV,OAAO,OAOR,EANI,KAAK,cAFE,WAGX,CADS;QAOR,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAClD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAChC,CAAC;QAEF,IAAI,CAAC,cAAc;aAChB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEK,IAAI;;YACR,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;KAAA;IAEK,OAAO;;YACX,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC/B,IAAI,IAAI,KAAK,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBACvC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;KAAA;IAEK,KAAK,CAAC,KAA0B;;YACpC,MAAM,kBAAkB,GAAG,KAAgB,CAAC;YAE5C,IAAI,CAAC;gBACH,
|
|
1
|
+
{"version":3,"file":"SoundTouchSpeakerOnCharacteristic.js","sourceRoot":"","sources":["../../../src/accessories/services/SoundTouchSpeakerOnCharacteristic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAEhF,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AACjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAC;AAEvF,MAAM,OAAO,iCAAkC,SAAQ,+BAA+B;IAKpF,YAAY,EAQX;YARW,EACV,OAAO,OAOR,EANI,KAAK,cAFE,WAGX,CADS;QAOR,KAAK,CAAC,KAAK,CAAC,CAAC;QAEb,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAClD,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAChC,CAAC;QAEF,IAAI,CAAC,cAAc;aAChB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC5B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IAEK,IAAI;;YACR,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;KAAA;IAEK,OAAO;;YACX,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC/B,IAAI,IAAI,KAAK,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBACvC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;KAAA;IAEK,KAAK,CAAC,KAA0B;;YACpC,MAAM,kBAAkB,GAAG,KAAgB,CAAC;YAE5C,IAAI,CAAC;gBACH,IAAI,IAAI,CAAC,cAAc,CAAC,KAAK,KAAK,kBAAkB,EAAE,CAAC;oBACrD,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACjD,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACzE,CAAC;YAAC,OAAO,CAAU,EAAE,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;gBAC7C,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,4EAE7C,CAAC;YACJ,CAAC;oBAAS,CAAC;gBACT,uCAAuC;gBACvC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;KAAA;IAEK,KAAK;;YACT,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED,MAAM,CAAO,MAAM,CAAC,KAKnB;;YACC,OAAO,IAAI,iCAAiC,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC;KAAA;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import { describe, expect, test } from '@jest/globals';
|
|
2
|
+
import { DeviceConfiguration } from '../SoundTouchDeviceConfiguration.js';
|
|
3
|
+
const DEFAULT_POLLING_INTERVAL = 2000;
|
|
4
|
+
describe('DeviceConfiguration', () => {
|
|
5
|
+
describe('createForRoom', () => {
|
|
6
|
+
test('creates a room-type configuration', () => {
|
|
7
|
+
const config = DeviceConfiguration.createForRoom({
|
|
8
|
+
name: 'Kitchen',
|
|
9
|
+
room: 'Kitchen',
|
|
10
|
+
});
|
|
11
|
+
expect(config.type).toBe('room');
|
|
12
|
+
expect(config.room).toBe('Kitchen');
|
|
13
|
+
expect(config.ip).toBeUndefined();
|
|
14
|
+
expect(config.port).toBeUndefined();
|
|
15
|
+
});
|
|
16
|
+
test('applies default pollingInterval', () => {
|
|
17
|
+
const config = DeviceConfiguration.createForRoom({ name: 'Kitchen' });
|
|
18
|
+
expect(config.pollingInterval).toBe(DEFAULT_POLLING_INTERVAL);
|
|
19
|
+
});
|
|
20
|
+
test('uses provided pollingInterval', () => {
|
|
21
|
+
const config = DeviceConfiguration.createForRoom({
|
|
22
|
+
name: 'Kitchen',
|
|
23
|
+
pollingInterval: 5000,
|
|
24
|
+
});
|
|
25
|
+
expect(config.pollingInterval).toBe(5000);
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
describe('createForIp', () => {
|
|
29
|
+
test('creates an ip-type configuration', () => {
|
|
30
|
+
const config = DeviceConfiguration.createForIp({
|
|
31
|
+
name: 'Lounge',
|
|
32
|
+
ip: '192.168.1.10',
|
|
33
|
+
port: 8090,
|
|
34
|
+
});
|
|
35
|
+
expect(config.type).toBe('ip');
|
|
36
|
+
expect(config.ip).toBe('192.168.1.10');
|
|
37
|
+
expect(config.port).toBe(8090);
|
|
38
|
+
expect(config.room).toBeUndefined();
|
|
39
|
+
});
|
|
40
|
+
test('applies default pollingInterval', () => {
|
|
41
|
+
const config = DeviceConfiguration.createForIp({
|
|
42
|
+
name: 'Lounge',
|
|
43
|
+
ip: '192.168.1.10',
|
|
44
|
+
});
|
|
45
|
+
expect(config.pollingInterval).toBe(DEFAULT_POLLING_INTERVAL);
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
describe('create', () => {
|
|
49
|
+
test('creates a discovered-type configuration', () => {
|
|
50
|
+
const config = DeviceConfiguration.create({ name: 'Office' });
|
|
51
|
+
expect(config.type).toBe('discovered');
|
|
52
|
+
expect(config.ip).toBeUndefined();
|
|
53
|
+
expect(config.room).toBeUndefined();
|
|
54
|
+
});
|
|
55
|
+
test('applies default verboseLogging', () => {
|
|
56
|
+
const config = DeviceConfiguration.create({ name: 'Office' });
|
|
57
|
+
expect(config.verboseLogging).toBe(false);
|
|
58
|
+
});
|
|
59
|
+
test('uses provided verboseLogging', () => {
|
|
60
|
+
const config = DeviceConfiguration.create({
|
|
61
|
+
name: 'Office',
|
|
62
|
+
verboseLogging: true,
|
|
63
|
+
});
|
|
64
|
+
expect(config.verboseLogging).toBe(true);
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
describe('fromAccessoryConfiguration', () => {
|
|
68
|
+
test('returns ip-type config when ip is present', () => {
|
|
69
|
+
const config = DeviceConfiguration.fromAccessoryConfiguration({
|
|
70
|
+
name: 'Kitchen',
|
|
71
|
+
accessoryConfig: { ip: '10.0.0.1', port: 8090 },
|
|
72
|
+
});
|
|
73
|
+
expect(config === null || config === void 0 ? void 0 : config.type).toBe('ip');
|
|
74
|
+
expect(config === null || config === void 0 ? void 0 : config.ip).toBe('10.0.0.1');
|
|
75
|
+
expect(config === null || config === void 0 ? void 0 : config.port).toBe(8090);
|
|
76
|
+
});
|
|
77
|
+
test('prefers ip over room when both are present', () => {
|
|
78
|
+
const config = DeviceConfiguration.fromAccessoryConfiguration({
|
|
79
|
+
name: 'Kitchen',
|
|
80
|
+
accessoryConfig: { ip: '10.0.0.1', room: 'Kitchen' },
|
|
81
|
+
});
|
|
82
|
+
expect(config === null || config === void 0 ? void 0 : config.type).toBe('ip');
|
|
83
|
+
});
|
|
84
|
+
test('returns room-type config when only room is present', () => {
|
|
85
|
+
const config = DeviceConfiguration.fromAccessoryConfiguration({
|
|
86
|
+
name: 'Lounge',
|
|
87
|
+
accessoryConfig: { room: 'Lounge' },
|
|
88
|
+
});
|
|
89
|
+
expect(config === null || config === void 0 ? void 0 : config.type).toBe('room');
|
|
90
|
+
expect(config === null || config === void 0 ? void 0 : config.room).toBe('Lounge');
|
|
91
|
+
});
|
|
92
|
+
test('returns undefined when neither ip nor room provided', () => {
|
|
93
|
+
const config = DeviceConfiguration.fromAccessoryConfiguration({
|
|
94
|
+
name: 'Mystery',
|
|
95
|
+
accessoryConfig: {},
|
|
96
|
+
});
|
|
97
|
+
expect(config).toBeUndefined();
|
|
98
|
+
});
|
|
99
|
+
test('name from props takes precedence over accessoryConfig name', () => {
|
|
100
|
+
const config = DeviceConfiguration.fromAccessoryConfiguration({
|
|
101
|
+
name: 'Override Name',
|
|
102
|
+
accessoryConfig: { ip: '10.0.0.1', name: 'Config Name' },
|
|
103
|
+
});
|
|
104
|
+
expect(config === null || config === void 0 ? void 0 : config.name).toBe('Override Name');
|
|
105
|
+
});
|
|
106
|
+
test('falls back to accessoryConfig name when props name is absent', () => {
|
|
107
|
+
const config = DeviceConfiguration.fromAccessoryConfiguration({
|
|
108
|
+
accessoryConfig: { ip: '10.0.0.1', name: 'Config Name' },
|
|
109
|
+
});
|
|
110
|
+
expect(config === null || config === void 0 ? void 0 : config.name).toBe('Config Name');
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
describe('toJson', () => {
|
|
114
|
+
test('serialises to valid JSON', () => {
|
|
115
|
+
const config = DeviceConfiguration.create({ name: 'Test' });
|
|
116
|
+
expect(() => JSON.parse(config.toJson())).not.toThrow();
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
//# sourceMappingURL=SoundTouchDeviceConfiguration.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SoundTouchDeviceConfiguration.test.js","sourceRoot":"","sources":["../../../../src/devices/SoundTouch/__tests__/SoundTouchDeviceConfiguration.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ import { presetFromElement } from './preset.js';
|
|
|
24
24
|
import { groupFromElement } from './group.js';
|
|
25
25
|
import { promisify } from 'util';
|
|
26
26
|
import { contentItemToElement } from './content-item.js';
|
|
27
|
-
import
|
|
27
|
+
import { create as axiosCreate } from 'axios';
|
|
28
28
|
const parseXML = promisify((xml, options, cb) =>
|
|
29
29
|
// @ts-expect-error wip
|
|
30
30
|
parseString(xml, options, cb));
|
|
@@ -32,7 +32,8 @@ export class API {
|
|
|
32
32
|
constructor(host, port = 8090) {
|
|
33
33
|
this.host = host;
|
|
34
34
|
this.port = port;
|
|
35
|
-
this.axiosInstance =
|
|
35
|
+
this.axiosInstance = axiosCreate({
|
|
36
|
+
timeout: 10000,
|
|
36
37
|
headers: {
|
|
37
38
|
'content-type': 'application/xml',
|
|
38
39
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/devices/SoundTouch/api/api.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;;;AAEb,OAAO,EAAQ,eAAe,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,OAAO,IAAI,UAAU,EAGrB,WAAW,GACZ,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAY,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAc,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAU,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAW,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAQ,eAAe,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAEL,2BAA2B,GAC5B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAQ,eAAe,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAU,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAS,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,EAAe,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/devices/SoundTouch/api/api.ts"],"names":[],"mappings":"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"}
|
package/dist/platform.js
CHANGED
|
@@ -45,47 +45,61 @@ export class SoundTouchHomebridgePlatform {
|
|
|
45
45
|
logger: this.logger,
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
|
-
|
|
48
|
+
const results = yield Promise.allSettled(this.configuration.accessories.map((accessoryConfig) => SoundTouchDevice.fromConfiguredAccessory({
|
|
49
49
|
accessoryConfig,
|
|
50
50
|
logger: this.logger,
|
|
51
51
|
})));
|
|
52
|
+
return results.flatMap((result) => {
|
|
53
|
+
if (result.status === 'fulfilled') {
|
|
54
|
+
return [result.value];
|
|
55
|
+
}
|
|
56
|
+
this.logger.error('Failed to load configured accessory', result.reason);
|
|
57
|
+
return [];
|
|
58
|
+
});
|
|
52
59
|
});
|
|
53
60
|
}
|
|
54
61
|
discoverDevices() {
|
|
55
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
63
|
this.logger.debug('searching for devices', this.configuration);
|
|
57
|
-
|
|
64
|
+
let accessories;
|
|
65
|
+
try {
|
|
66
|
+
accessories = yield this.searchDevices();
|
|
67
|
+
}
|
|
68
|
+
catch (e) {
|
|
69
|
+
this.logger.error('Device discovery failed', e);
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
58
72
|
this.logger.debug('loaded devices', accessories);
|
|
59
73
|
for (const device of accessories) {
|
|
60
74
|
const uuid = this.api.hap.uuid.generate(device.id);
|
|
61
|
-
// see if an accessory with the same uuid has already been registered and restored from
|
|
62
|
-
// the cached devices we stored in the `configureAccessory` method above
|
|
63
75
|
const existingAccessory = this._accessories.get(uuid);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
76
|
+
try {
|
|
77
|
+
if (existingAccessory) {
|
|
78
|
+
this.logger.info('Restoring existing accessory from cache:', existingAccessory.displayName);
|
|
79
|
+
yield SoundTouchSpeakerPlatformAccessory.create({
|
|
80
|
+
platform: this,
|
|
81
|
+
accessory: existingAccessory,
|
|
82
|
+
device,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
this.logger.info('Adding new accessory:', device.name);
|
|
87
|
+
const accessory = new this.api.platformAccessory(device.name, uuid);
|
|
88
|
+
accessory.context.device = device;
|
|
89
|
+
yield SoundTouchSpeakerPlatformAccessory.create({
|
|
90
|
+
platform: this,
|
|
91
|
+
accessory,
|
|
92
|
+
device,
|
|
93
|
+
});
|
|
94
|
+
this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [
|
|
95
|
+
accessory,
|
|
96
|
+
]);
|
|
97
|
+
}
|
|
98
|
+
this._discoveredCacheUUIDs.push(uuid);
|
|
72
99
|
}
|
|
73
|
-
|
|
74
|
-
this.logger.
|
|
75
|
-
const accessory = new this.api.platformAccessory(device.name, uuid);
|
|
76
|
-
accessory.context.device = device;
|
|
77
|
-
yield SoundTouchSpeakerPlatformAccessory.create({
|
|
78
|
-
platform: this,
|
|
79
|
-
accessory,
|
|
80
|
-
device,
|
|
81
|
-
});
|
|
82
|
-
// link the accessory to your platform
|
|
83
|
-
this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [
|
|
84
|
-
accessory,
|
|
85
|
-
]);
|
|
100
|
+
catch (e) {
|
|
101
|
+
this.logger.error(`Failed to initialise accessory: ${device.name}`, e);
|
|
86
102
|
}
|
|
87
|
-
// push into _discoveredCacheUUIDs
|
|
88
|
-
this._discoveredCacheUUIDs.push(uuid);
|
|
89
103
|
}
|
|
90
104
|
for (const [uuid, accessory] of this._accessories) {
|
|
91
105
|
if (!this._discoveredCacheUUIDs.includes(uuid)) {
|
package/dist/platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;;;;;;;AAUA,OAAO,EAAE,gBAAgB,EAAE,MAAM,0CAA0C,CAAC;AAC5E,OAAO,EAAE,kCAAkC,EAAE,MAAM,qDAAqD,CAAC;AACzG,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,MAAM,OAAO,4BAA4B;IAUvC,YACE,gBAAyB,EACzB,gBAAwC,EACxC,aAAkB;QANH,iBAAY,GAAmC,IAAI,GAAG,EAAE,CAAC;QACzD,0BAAqB,GAAa,EAAE,CAAC;QAOpD,IAAI,CAAC,GAAG,GAAG,aAAa,CAAC;QACzB,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,IAAI,CAAC,aAAa;YAChB,qBAAqB,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,CAAC;QAEpE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,mBAAmB,CAAC;YACvC,MAAM,EAAE,gBAAgB;YACxB,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,8BAAgB,CAAC,2BAAc;SACnE,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,iCAAiC,EACjC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAC5B,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAS,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAC5D,CAAC,CAAA,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,SAA4B;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAEzE,0GAA0G;QAC1G,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;IAEK,aAAa;;YACjB,IAAI,IAAI,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAC;gBAC9C,OAAO,gBAAgB,CAAC,sBAAsB,CAAC;oBAC7C,MAAM,EAAE,IAAI,CAAC,aAAa;oBAC1B,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB,CAAC,CAAC;YACL,CAAC;YAED,OAAO,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export declare class Logger implements Partial<Logging> {
|
|
|
7
7
|
homebridgeLogger: Logging;
|
|
8
8
|
level: LogLevel;
|
|
9
9
|
});
|
|
10
|
-
static excludeLog(level: LogLevel,
|
|
10
|
+
static excludeLog(level: LogLevel, requiredLevel: LogLevel): boolean;
|
|
11
11
|
log(level: LogLevel, message: string, ...parameters: any[]): void;
|
|
12
12
|
info(message: string, ...parameters: any[]): void;
|
|
13
13
|
success(message: string, ...parameters: any[]): void;
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
const logLevelSeverityMap = {
|
|
2
2
|
["debug" /* LogLevel.DEBUG */]: 0,
|
|
3
|
-
["
|
|
4
|
-
["
|
|
5
|
-
["
|
|
6
|
-
["
|
|
3
|
+
["info" /* LogLevel.INFO */]: 1,
|
|
4
|
+
["success" /* LogLevel.SUCCESS */]: 2,
|
|
5
|
+
["warn" /* LogLevel.WARN */]: 2,
|
|
6
|
+
["error" /* LogLevel.ERROR */]: 3,
|
|
7
7
|
};
|
|
8
8
|
export class Logger {
|
|
9
9
|
constructor({ homebridgeLogger, level, }) {
|
|
10
10
|
this.homebridgeLogger = homebridgeLogger;
|
|
11
11
|
this.requiredLogLevel = level;
|
|
12
12
|
}
|
|
13
|
-
static excludeLog(level,
|
|
14
|
-
return
|
|
13
|
+
static excludeLog(level, requiredLevel) {
|
|
14
|
+
return logLevelSeverityMap[level] < logLevelSeverityMap[requiredLevel];
|
|
15
15
|
}
|
|
16
16
|
//eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
17
17
|
log(level, message, ...parameters) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormattedLogger.js","sourceRoot":"","sources":["../../src/utils/FormattedLogger.ts"],"names":[],"mappings":"AAGA,MAAM,mBAAmB,GAAG;IAC1B,8BAAgB,EAAE,CAAC;IACnB,
|
|
1
|
+
{"version":3,"file":"FormattedLogger.js","sourceRoot":"","sources":["../../src/utils/FormattedLogger.ts"],"names":[],"mappings":"AAGA,MAAM,mBAAmB,GAAG;IAC1B,8BAAgB,EAAE,CAAC;IACnB,4BAAe,EAAE,CAAC;IAClB,kCAAkB,EAAE,CAAC;IACrB,4BAAe,EAAE,CAAC;IAClB,8BAAgB,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,OAAO,MAAM;IAIjB,YAAY,EACV,gBAAgB,EAChB,KAAK,GAIN;QACC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,KAAe,EAAE,aAAuB;QACxD,OAAO,mBAAmB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACzE,CAAC;IAED,6DAA6D;IAC7D,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,GAAG,UAAiB;QACxD,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC;YAAE,OAAO;QAC5D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED,6DAA6D;IAC7D,IAAI,CAAC,OAAe,EAAE,GAAG,UAAiB;QACxC,IAAI,CAAC,GAAG,6BAAgB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IAClD,CAAC;IAED,6DAA6D;IAC7D,OAAO,CAAC,OAAe,EAAE,GAAG,UAAiB;QAC3C,IAAI,CAAC,GAAG,mCAAmB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACrD,CAAC;IAED,6DAA6D;IAC7D,IAAI,CAAC,OAAe,EAAE,GAAG,UAAiB;QACxC,IAAI,CAAC,GAAG,6BAAgB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IAClD,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,OAAe,EAAE,GAAG,UAAiB;QACzC,IAAI,CAAC,GAAG,+BAAiB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,6DAA6D;IAC7D,KAAK,CAAC,OAAe,EAAE,GAAG,UAAiB;QACzC,IAAI,CAAC,GAAG,+BAAiB,OAAO,EAAE,GAAG,UAAU,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,mBAAmB,CAAC,EACzB,MAAM,EACN,KAAK,GAIN;QACC,OAAO,IAAI,MAAM,CAAC,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACzD,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,MAAM;IAGtC,YAAY,EACV,gBAAgB,EAChB,KAAK,EACL,MAAM,GAKP;QACC,KAAK,CAAC,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,6DAA6D;IAC7D,GAAG,CAAC,KAAe,EAAE,OAAe,EAAE,GAAG,UAAiB;QACxD,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,OAAO,EAAE,CAAC;QAE1D,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,EAChB,MAAM,EACN,MAAM,GAIP;QACC,OAAO,IAAI,YAAY,CAAC;YACtB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,KAAK,EAAE,MAAM,CAAC,gBAAgB;YAC9B,MAAM;SACP,CAAC,CAAC;IACL,CAAC;CACF"}
|