@homebridge-plugins/homebridge-updater 3.1.8 → 3.1.9-beta.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 +287 -0
- package/CLAUDE.md +43 -0
- package/README.md +59 -117
- package/config.schema.json +7 -0
- package/dist/Platform.HAP.js +1 -1
- package/dist/Platform.HAP.js.map +1 -1
- package/dist/Platform.HAP.test.js +12 -11
- package/dist/Platform.HAP.test.js.map +1 -1
- package/dist/Platform.Matter.js +1 -1
- package/dist/Platform.Matter.js.map +1 -1
- package/dist/Platform.Matter.test.js +1 -1
- package/dist/configMigration.d.ts.map +1 -1
- package/dist/configMigration.js +1 -1
- package/dist/configMigration.js.map +1 -1
- package/dist/configMigration.test.js +3 -3
- package/dist/configMigration.test.js.map +1 -1
- package/dist/configTypes.d.ts +1 -0
- package/dist/configTypes.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/sensorBase.d.ts +2 -0
- package/dist/sensorBase.d.ts.map +1 -1
- package/dist/sensorBase.js +16 -4
- package/dist/sensorBase.js.map +1 -1
- package/dist/ui-api.d.ts +22 -0
- package/dist/ui-api.d.ts.map +1 -1
- package/dist/ui-api.js +80 -9
- package/dist/ui-api.js.map +1 -1
- package/dist/updateCheckCore.autoupdate.test.d.ts +2 -0
- package/dist/updateCheckCore.autoupdate.test.d.ts.map +1 -0
- package/dist/updateCheckCore.autoupdate.test.js +55 -0
- package/dist/updateCheckCore.autoupdate.test.js.map +1 -0
- package/dist/updateCheckCore.beta.test.d.ts +2 -0
- package/dist/updateCheckCore.beta.test.d.ts.map +1 -0
- package/dist/updateCheckCore.beta.test.js +48 -0
- package/dist/updateCheckCore.beta.test.js.map +1 -0
- package/dist/updateCheckCore.d.ts +29 -0
- package/dist/updateCheckCore.d.ts.map +1 -1
- package/dist/updateCheckCore.js +181 -19
- package/dist/updateCheckCore.js.map +1 -1
- package/dist/updateCheckCore.route.test.d.ts +2 -0
- package/dist/updateCheckCore.route.test.d.ts.map +1 -0
- package/dist/updateCheckCore.route.test.js +71 -0
- package/dist/updateCheckCore.route.test.js.map +1 -0
- package/dist/updateSensor.d.ts.map +1 -1
- package/dist/updateSensor.js +16 -2
- package/dist/updateSensor.js.map +1 -1
- package/dist/updateSensor.test.js +61 -15
- package/dist/updateSensor.test.js.map +1 -1
- package/dist/utils.test.js +6 -6
- package/dist/utils.test.js.map +1 -1
- package/package.json +22 -31
- package/typedoc.json +17 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { describe, expect, it, vi } from 'vitest';
|
|
2
|
-
import {
|
|
2
|
+
import { FAILURE_SENSOR_UUID_KEY, LEGACY_UPDATE_SENSOR_UUID_KEY, PLATFORM_NAME, PLUGIN_NAME, UPDATE_SENSOR_UUID_KEY } from './settings.js';
|
|
3
3
|
/**
|
|
4
4
|
* Unit tests for the legacy UUID migration logic in PluginUpdatePlatform.
|
|
5
5
|
*
|
|
@@ -8,7 +8,7 @@ import { LEGACY_UPDATE_SENSOR_UUID_KEY, UPDATE_SENSOR_UUID_KEY, FAILURE_SENSOR_U
|
|
|
8
8
|
* 2. Both legacy and current UUID in cache — must unregister the stale legacy accessory.
|
|
9
9
|
* 3. Normal v3 operation (no legacy) — must leave the current accessory untouched.
|
|
10
10
|
*/
|
|
11
|
-
describe('
|
|
11
|
+
describe('pluginUpdatePlatform legacy UUID migration', () => {
|
|
12
12
|
function buildMocks(options = {}) {
|
|
13
13
|
// Map uuid key → deterministic UUID value
|
|
14
14
|
const uuidMap = {
|
|
@@ -70,8 +70,8 @@ describe('PluginUpdatePlatform legacy UUID migration', () => {
|
|
|
70
70
|
function runMigrationSimulation(mockApi, mockLog, mockUpdateSensor, uuidMap, cachedAccessories) {
|
|
71
71
|
const updateSensorUuid = mockApi.hap.uuid.generate(UPDATE_SENSOR_UUID_KEY);
|
|
72
72
|
const legacyUpdateSensorUuid = mockApi.hap.uuid.generate(LEGACY_UPDATE_SENSOR_UUID_KEY);
|
|
73
|
-
let cachedLegacyUpdateAccessory
|
|
74
|
-
let cachedCurrentUpdateAccessory
|
|
73
|
+
let cachedLegacyUpdateAccessory;
|
|
74
|
+
let cachedCurrentUpdateAccessory;
|
|
75
75
|
let updateSensorCached = false;
|
|
76
76
|
// Simulate configureAccessory for each cached accessory
|
|
77
77
|
for (const accessory of cachedAccessories) {
|
|
@@ -90,8 +90,9 @@ describe('PluginUpdatePlatform legacy UUID migration', () => {
|
|
|
90
90
|
// handleLegacyMigration (fires first on didFinishLaunching)
|
|
91
91
|
let registered = updateSensorCached;
|
|
92
92
|
function handleLegacyMigration() {
|
|
93
|
-
if (!cachedLegacyUpdateAccessory)
|
|
93
|
+
if (!cachedLegacyUpdateAccessory) {
|
|
94
94
|
return;
|
|
95
|
+
}
|
|
95
96
|
if (updateSensorCached) {
|
|
96
97
|
// Both UUIDs found — remove the newer empty accessory, promote the legacy one
|
|
97
98
|
// so the user's HomeKit customisations are preserved.
|
|
@@ -121,8 +122,8 @@ describe('PluginUpdatePlatform legacy UUID migration', () => {
|
|
|
121
122
|
addUpdateSensor();
|
|
122
123
|
return { registered, cachedLegacyUpdateAccessory };
|
|
123
124
|
}
|
|
124
|
-
it('
|
|
125
|
-
const { mockLog, mockApi, mockUpdateSensor, uuidMap
|
|
125
|
+
it('scenario A: only legacy UUID in cache — must restore without creating a duplicate', () => {
|
|
126
|
+
const { mockLog, mockApi, mockUpdateSensor, uuidMap } = buildMocks();
|
|
126
127
|
const legacyAccessory = { UUID: uuidMap[LEGACY_UPDATE_SENSOR_UUID_KEY], displayName: 'Plugin Update Check' };
|
|
127
128
|
const { registered } = runMigrationSimulation(mockApi, mockLog, mockUpdateSensor, uuidMap, [legacyAccessory]);
|
|
128
129
|
// Legacy accessory used as update sensor
|
|
@@ -138,7 +139,7 @@ describe('PluginUpdatePlatform legacy UUID migration', () => {
|
|
|
138
139
|
expect(mockLog.warn).not.toHaveBeenCalled();
|
|
139
140
|
expect(registered).toBe(true);
|
|
140
141
|
});
|
|
141
|
-
it('
|
|
142
|
+
it('scenario B: both legacy and current UUID in cache — must preserve legacy accessory and remove the newer empty duplicate', () => {
|
|
142
143
|
const { mockLog, mockApi, mockUpdateSensor, uuidMap } = buildMocks();
|
|
143
144
|
const v3Accessory = { UUID: uuidMap[UPDATE_SENSOR_UUID_KEY], displayName: 'PluginUpdate' };
|
|
144
145
|
const legacyAccessory = { UUID: uuidMap[LEGACY_UPDATE_SENSOR_UUID_KEY], displayName: 'Plugin Update Check' };
|
|
@@ -154,7 +155,7 @@ describe('PluginUpdatePlatform legacy UUID migration', () => {
|
|
|
154
155
|
expect(mockApi.registerPlatformAccessories).not.toHaveBeenCalled();
|
|
155
156
|
expect(mockLog.info).toHaveBeenCalledWith(expect.stringContaining('Migrated update sensor to legacy cached accessory'));
|
|
156
157
|
});
|
|
157
|
-
it('
|
|
158
|
+
it('scenario B (legacy processed first): same result regardless of configureAccessory order', () => {
|
|
158
159
|
const { mockLog, mockApi, mockUpdateSensor, uuidMap } = buildMocks();
|
|
159
160
|
const v3Accessory = { UUID: uuidMap[UPDATE_SENSOR_UUID_KEY], displayName: 'PluginUpdate' };
|
|
160
161
|
const legacyAccessory = { UUID: uuidMap[LEGACY_UPDATE_SENSOR_UUID_KEY], displayName: 'Plugin Update Check' };
|
|
@@ -168,7 +169,7 @@ describe('PluginUpdatePlatform legacy UUID migration', () => {
|
|
|
168
169
|
expect(mockApi.unregisterPlatformAccessories).toHaveBeenCalledWith(PLUGIN_NAME, PLATFORM_NAME, [v3Accessory]);
|
|
169
170
|
expect(mockApi.registerPlatformAccessories).not.toHaveBeenCalled();
|
|
170
171
|
});
|
|
171
|
-
it('
|
|
172
|
+
it('scenario C: normal v3 operation — no legacy accessory, no side effects', () => {
|
|
172
173
|
const { mockLog, mockApi, mockUpdateSensor, uuidMap } = buildMocks();
|
|
173
174
|
const v3Accessory = { UUID: uuidMap[UPDATE_SENSOR_UUID_KEY], displayName: 'PluginUpdate' };
|
|
174
175
|
runMigrationSimulation(mockApi, mockLog, mockUpdateSensor, uuidMap, [v3Accessory]);
|
|
@@ -178,7 +179,7 @@ describe('PluginUpdatePlatform legacy UUID migration', () => {
|
|
|
178
179
|
expect(mockLog.info).not.toHaveBeenCalled();
|
|
179
180
|
expect(mockLog.warn).not.toHaveBeenCalled();
|
|
180
181
|
});
|
|
181
|
-
it('
|
|
182
|
+
it('scenario D: no cached accessories at all — creates new accessory normally', () => {
|
|
182
183
|
const { mockLog, mockApi, mockUpdateSensor, uuidMap } = buildMocks();
|
|
183
184
|
const { registered } = runMigrationSimulation(mockApi, mockLog, mockUpdateSensor, uuidMap, []);
|
|
184
185
|
expect(mockUpdateSensor.configureAccessory).not.toHaveBeenCalled();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.HAP.test.js","sourceRoot":"","sources":["../src/Platform.HAP.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAA;AAEjD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Platform.HAP.test.js","sourceRoot":"","sources":["../src/Platform.HAP.test.ts"],"names":[],"mappings":"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"}
|
package/dist/Platform.Matter.js
CHANGED
|
@@ -12,7 +12,7 @@ export class PluginUpdateMatterPlatform {
|
|
|
12
12
|
this.failureSensor = new FailureSensor(log, api, config.failureSensorType || config.sensorType, 'matter');
|
|
13
13
|
this.updateSensor = new UpdateSensor(log, config, api, {
|
|
14
14
|
protocol: 'matter',
|
|
15
|
-
onFailureStateChange: isFailureSensorEnabled(config) ?
|
|
15
|
+
onFailureStateChange: isFailureSensorEnabled(config) ? failed => this.failureSensor.setState(failed) : undefined,
|
|
16
16
|
});
|
|
17
17
|
// Register the failure sensor as a separate Matter device only when enabled
|
|
18
18
|
if (isFailureSensorEnabled(config)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Platform.Matter.js","sourceRoot":"","sources":["../src/Platform.Matter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnD,MAAM,OAAO,0BAA0B;IACpB,GAAG,CAAK;IACjB,YAAY,CAAc;IAC1B,aAAa,CAAe;IACnB,gBAAgB,GAAwB,EAAE,CAAA;IAE3D,YAAY,GAAY,EAAE,MAAsB,EAAE,GAAQ;QACxD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QACzG,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE;YACrD,QAAQ,EAAE,QAAQ;YAClB,oBAAoB,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"Platform.Matter.js","sourceRoot":"","sources":["../src/Platform.Matter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAEnD,MAAM,OAAO,0BAA0B;IACpB,GAAG,CAAK;IACjB,YAAY,CAAc;IAC1B,aAAa,CAAe;IACnB,gBAAgB,GAAwB,EAAE,CAAA;IAE3D,YAAY,GAAY,EAAE,MAAsB,EAAE,GAAQ;QACxD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;QACd,IAAI,CAAC,aAAa,GAAG,IAAI,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QACzG,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE;YACrD,QAAQ,EAAE,QAAQ;YAClB,oBAAoB,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;SACjH,CAAC,CAAA;QACF,4EAA4E;QAC5E,IAAI,sBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,MAAM,UAAU,GAAI,MAAc,CAAC,IAAI,IAAI,qBAAqB,CAAA;YAChE,MAAM,iBAAiB,GAAG,GAAG,UAAU,UAAU,CAAA;YACjD,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,iBAAiB,EAAS,CAAC,CAAA;QACzE,CAAC;QACD,+EAA+E;QAC/E,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACtE,CAAC;IAED;;;;;OAKG;IACH,kBAAkB,CAAC,SAA4B;QAC7C,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IACvC,CAAC;IAEO,sBAAsB;QAC5B,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvC,OAAM;QACR,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;QAC9F,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAA;IAClC,CAAC;CACF"}
|
|
@@ -12,7 +12,7 @@ import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
|
|
|
12
12
|
* bridge is fully initialized) causes Homebridge to throw
|
|
13
13
|
* "Cannot find the bridged Accessory to remove."
|
|
14
14
|
*/
|
|
15
|
-
describe('
|
|
15
|
+
describe('pluginUpdateMatterPlatform stale HAP cleanup', () => {
|
|
16
16
|
function buildMocks() {
|
|
17
17
|
const unregisterCalls = [];
|
|
18
18
|
const didFinishListeners = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configMigration.d.ts","sourceRoot":"","sources":["../src/configMigration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAoB,MAAM,YAAY,CAAA;AAUvD,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAc5E;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"configMigration.d.ts","sourceRoot":"","sources":["../src/configMigration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAoB,MAAM,YAAY,CAAA;AAUvD,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAc5E;AAED,wBAAsB,0BAA0B,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDxE"}
|
package/dist/configMigration.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { readFileSync, writeFileSync } from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
-
import {
|
|
3
|
+
import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
|
|
4
4
|
import { UiApi } from './ui-api.js';
|
|
5
5
|
const LEGACY_PLATFORM_NAME = 'PluginUpdate';
|
|
6
6
|
export function migratePlatformAliasInPluginConfigs(configs) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configMigration.js","sourceRoot":"","sources":["../src/configMigration.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACrD,OAAO,IAAI,MAAM,WAAW,CAAA;AAE5B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"configMigration.js","sourceRoot":"","sources":["../src/configMigration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import * as fs from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
4
|
+
import { migrateLegacyPlatformAlias, migratePlatformAliasInPluginConfigs } from './configMigration.js';
|
|
3
5
|
// Mock node:fs before any imports that use it — vitest hoists vi.mock automatically.
|
|
4
6
|
vi.mock('node:fs', () => ({
|
|
5
7
|
readFileSync: vi.fn(),
|
|
6
8
|
writeFileSync: vi.fn(),
|
|
7
9
|
}));
|
|
8
|
-
import * as fs from 'node:fs';
|
|
9
|
-
import { migratePlatformAliasInPluginConfigs, migrateLegacyPlatformAlias } from './configMigration.js';
|
|
10
10
|
describe('config migration', () => {
|
|
11
11
|
it('should migrate legacy platform alias in plugin config entries', () => {
|
|
12
12
|
const pluginConfigs = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configMigration.test.js","sourceRoot":"","sources":["../src/configMigration.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"configMigration.test.js","sourceRoot":"","sources":["../src/configMigration.test.ts"],"names":[],"mappings":"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"}
|
package/dist/configTypes.d.ts
CHANGED
|
@@ -17,6 +17,7 @@ export interface PluginUpdatePlatformConfig {
|
|
|
17
17
|
autoUpdatePlugins?: boolean;
|
|
18
18
|
allowDirectNpmUpdates?: boolean;
|
|
19
19
|
autoRestartAfterUpdates?: boolean;
|
|
20
|
+
autoUpdateSkipMajorVersions?: boolean;
|
|
20
21
|
failureSensorType?: string;
|
|
21
22
|
respectDisabledPlugins?: boolean;
|
|
22
23
|
enableMatter?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../src/configTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAElE,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,YAAY,GAAG,kBAAkB,CAAA;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB"}
|
|
1
|
+
{"version":3,"file":"configTypes.d.ts","sourceRoot":"","sources":["../src/configTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAElE,MAAM,WAAW,0BAA0B;IACzC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,YAAY,GAAG,kBAAkB,CAAA;IAC3C,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { migrateLegacyPlatformAlias } from './configMigration.js';
|
|
1
2
|
import { PluginUpdatePlatform } from './Platform.HAP.js';
|
|
2
3
|
import { PluginUpdateMatterPlatform } from './Platform.Matter.js';
|
|
3
|
-
import { migrateLegacyPlatformAlias } from './configMigration.js';
|
|
4
4
|
import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
|
|
5
5
|
import { createPlatformProxy } from './utils.js';
|
|
6
6
|
// Register our platform with homebridge using HAP/Matter proxy.
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAEhD,gEAAgE;AAChE,eAAe,CAAC,GAAQ,EAAQ,EAAE;IAChC,KAAK,0BAA0B,CAAC,GAAG,CAAC,CAAA;IACpC,MAAM,SAAS,GAAG,mBAAmB,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,CAAA;IACvF,GAAG,CAAC,gBAAgB,CAAC,WAAW,EAAE,aAAa,EAAE,SAAgB,CAAC,CAAA;AACpE,CAAC,CAAA"}
|
package/dist/sensorBase.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { API, Logging, PlatformAccessory } from 'homebridge';
|
|
|
2
2
|
export interface SensorProtocol {
|
|
3
3
|
configure: (accessory: PlatformAccessory) => void;
|
|
4
4
|
setState: (state: boolean) => void;
|
|
5
|
+
updateName?: (name: string) => void;
|
|
5
6
|
}
|
|
6
7
|
export interface SensorOptions {
|
|
7
8
|
log: Logging;
|
|
@@ -16,6 +17,7 @@ export declare class HAPSensor implements SensorProtocol {
|
|
|
16
17
|
constructor(options: SensorOptions);
|
|
17
18
|
configure(accessory: PlatformAccessory): void;
|
|
18
19
|
setState(tripped: boolean): void;
|
|
20
|
+
updateName(name: string): void;
|
|
19
21
|
private getSensorInfo;
|
|
20
22
|
}
|
|
21
23
|
export declare class MatterSensor implements SensorProtocol {
|
package/dist/sensorBase.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sensorBase.d.ts","sourceRoot":"","sources":["../src/sensorBase.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAA4C,OAAO,EAAE,iBAAiB,EAAqB,MAAM,YAAY,CAAA;AAI9H,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACjD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;
|
|
1
|
+
{"version":3,"file":"sensorBase.d.ts","sourceRoot":"","sources":["../src/sensorBase.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAA4C,OAAO,EAAE,iBAAiB,EAAqB,MAAM,YAAY,CAAA;AAI9H,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,CAAC,SAAS,EAAE,iBAAiB,KAAK,IAAI,CAAA;IACjD,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAA;IAClC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;CACpC;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,OAAO,CAAA;IACZ,GAAG,EAAE,GAAG,CAAA;IACR,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAGD,qBAAa,SAAU,YAAW,cAAc;IAC9C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAK;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAK1B;IAED,OAAO,CAAC,OAAO,CAAC,CAAS;gBAEb,OAAO,EAAE,aAAa;IAMlC,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAO7C,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAQhC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAO9B,OAAO,CAAC,aAAa;CAyBtB;AAED,qBAAa,YAAa,YAAW,cAAc;IACjD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAK;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAQ;IACnC,OAAO,CAAC,UAAU,CAMjB;IAED,OAAO,CAAC,IAAI,CAAC,CAAQ;IACrB,OAAO,CAAC,UAAU,CAAiB;gBAEvB,OAAO,EAAE,aAAa;IAOlC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,MAAM;oBAKJ,MAAM;iBAAW,MAAM;mBAAa,MAAM;sBAAgB,GAAG;wBAAkB,GAAG;;IA6FhI,SAAS,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAkJ7C,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAajC"}
|
package/dist/sensorBase.js
CHANGED
|
@@ -25,6 +25,12 @@ export class HAPSensor {
|
|
|
25
25
|
this.log.debug(`Set HAP sensor to ${tripped ? 'triggered' : 'normal'} state`);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
|
+
updateName(name) {
|
|
29
|
+
if (this.service) {
|
|
30
|
+
this.service.setCharacteristic(this.hap.Characteristic.Name, name);
|
|
31
|
+
this.service.displayName = name;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
28
34
|
getSensorInfo(sensorType) {
|
|
29
35
|
switch (sensorType?.toLowerCase()) {
|
|
30
36
|
case 'contact':
|
|
@@ -127,11 +133,17 @@ export class MatterSensor {
|
|
|
127
133
|
untrippedValue: 5500, // 55%
|
|
128
134
|
},
|
|
129
135
|
dioxide: {
|
|
136
|
+
// HAP exposes a real CarbonDioxideSensor, but the Homebridge Matter
|
|
137
|
+
// runtime has no carbon-dioxide cluster, so under Matter we register
|
|
138
|
+
// and update the airQuality cluster (the same one configure() sets up
|
|
139
|
+
// for the AirQualitySensor device type). Using carbonDioxideMeasurement
|
|
140
|
+
// here left setState updating a cluster that was never registered,
|
|
141
|
+
// which rolled back with "Unknown cluster name" every time (#256).
|
|
130
142
|
deviceType: 'AirQualitySensor',
|
|
131
|
-
cluster: '
|
|
132
|
-
attribute: '
|
|
133
|
-
trippedValue:
|
|
134
|
-
untrippedValue:
|
|
143
|
+
cluster: 'airQuality',
|
|
144
|
+
attribute: 'airQuality',
|
|
145
|
+
trippedValue: 5, // Very Poor
|
|
146
|
+
untrippedValue: 1, // Good
|
|
135
147
|
},
|
|
136
148
|
air: {
|
|
137
149
|
deviceType: 'AirQualitySensor',
|
package/dist/sensorBase.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sensorBase.js","sourceRoot":"","sources":["../src/sensorBase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sensorBase.js","sourceRoot":"","sources":["../src/sensorBase.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,8DAA8D;AAI9D,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAc1D,qBAAqB;AACrB,MAAM,OAAO,SAAS;IACH,GAAG,CAAS;IACZ,GAAG,CAAK;IACR,UAAU,CAK1B;IAEO,OAAO,CAAU;IAEzB,YAAY,OAAsB;QAChC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAA;QAC1B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC1D,CAAC;IAED,SAAS,CAAC,SAA4B;QACpC,kDAAkD;QAClD,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,WAAiC,CAAC,CAAA;QAC5I,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IACtB,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAA;YACrF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;YACzE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,QAAQ,CAAC,CAAA;QAC/E,CAAC;IACH,CAAC;IAED,UAAU,CAAC,IAAY;QACrB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAClE,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAA;QACjC,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,UAAmB;QACvC,QAAQ,UAAU,EAAE,WAAW,EAAE,EAAE,CAAC;YAClC,KAAK,SAAS;gBACZ,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,kBAAkB,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;YAC5J,KAAK,WAAW;gBACd,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,iBAAiB,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;YAC7J,KAAK,OAAO;gBACV,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,aAAa,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;YACrJ,KAAK,MAAM;gBACT,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;YACnJ,KAAK,OAAO;gBACV,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,wBAAwB,EAAE,cAAc,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CAAA;YAC1K,KAAK,UAAU;gBACb,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,uBAAuB,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAA;YACpK,KAAK,UAAU;gBACb,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;YACvK,KAAK,SAAS;gBACZ,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,qBAAqB,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;YACrK,KAAK,KAAK;gBACR,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAA;YACvJ,KAAK,QAAQ,CAAC;YACd;gBACE,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,IAAI,EAAE,CAAA;QAChK,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,YAAY;IACN,GAAG,CAAS;IACZ,GAAG,CAAK;IACR,UAAU,CAAQ;IAC3B,UAAU,CAMjB;IAEO,IAAI,CAAS;IACb,UAAU,GAAY,KAAK,CAAA;IAEnC,YAAY,OAAsB;QAChC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;QACtB,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,QAAQ,CAAA;QAChD,IAAI,CAAC,UAAU,GAAG,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;IACzE,CAAC;IAED,MAAM,CAAC,aAAa,CAAC,GAAQ,EAAE,UAAmB;QAChD,6CAA6C;QAC7C,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;QAC7C,CAAC;QACD,MAAM,OAAO,GAAuH;YAClI,OAAO,EAAE;gBACP,UAAU,EAAE,eAAe;gBAC3B,OAAO,EAAE,cAAc;gBACvB,SAAS,EAAE,YAAY;gBACvB,YAAY,EAAE,KAAK,EAAE,4BAA4B;gBACjD,cAAc,EAAE,IAAI,EAAE,gBAAgB;aACvC;YACD,SAAS,EAAE;gBACT,UAAU,EAAE,cAAc;gBAC1B,OAAO,EAAE,kBAAkB;gBAC3B,SAAS,EAAE,WAAW;gBACtB,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAChC,cAAc,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;aACpC;YACD,MAAM,EAAE;gBACN,UAAU,EAAE,cAAc;gBAC1B,OAAO,EAAE,kBAAkB;gBAC3B,SAAS,EAAE,WAAW;gBACtB,YAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAChC,cAAc,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;aACpC;YACD,KAAK,EAAE;gBACL,UAAU,EAAE,aAAa;gBACzB,OAAO,EAAE,cAAc;gBACvB,SAAS,EAAE,YAAY;gBACvB,YAAY,EAAE,CAAC,EAAE,WAAW;gBAC5B,cAAc,EAAE,CAAC,EAAE,SAAS;aAC7B;YACD,QAAQ,EAAE;gBACR,UAAU,EAAE,aAAa;gBACzB,OAAO,EAAE,cAAc;gBACvB,SAAS,EAAE,SAAS;gBACpB,YAAY,EAAE,CAAC,EAAE,WAAW;gBAC5B,cAAc,EAAE,CAAC,EAAE,SAAS;aAC7B;YACD,IAAI,EAAE;gBACJ,UAAU,EAAE,YAAY;gBACxB,OAAO,EAAE,cAAc;gBACvB,SAAS,EAAE,YAAY;gBACvB,YAAY,EAAE,IAAI,EAAE,gBAAgB;gBACpC,cAAc,EAAE,KAAK,EAAE,MAAM;aAC9B;YACD,KAAK,EAAE;gBACL,UAAU,EAAE,aAAa;gBACzB,OAAO,EAAE,wBAAwB;gBACjC,SAAS,EAAE,eAAe;gBAC1B,YAAY,EAAE,KAAK,EAAE,WAAW;gBAChC,cAAc,EAAE,IAAI,EAAE,YAAY;aACnC;YACD,QAAQ,EAAE;gBACR,UAAU,EAAE,gBAAgB;gBAC5B,OAAO,EAAE,6BAA6B;gBACtC,SAAS,EAAE,eAAe;gBAC1B,YAAY,EAAE,IAAI,EAAE,QAAQ;gBAC5B,cAAc,EAAE,IAAI,EAAE,MAAM;aAC7B;YACD,OAAO,EAAE;gBACP,oEAAoE;gBACpE,qEAAqE;gBACrE,sEAAsE;gBACtE,wEAAwE;gBACxE,mEAAmE;gBACnE,mEAAmE;gBACnE,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,YAAY;gBACrB,SAAS,EAAE,YAAY;gBACvB,YAAY,EAAE,CAAC,EAAE,YAAY;gBAC7B,cAAc,EAAE,CAAC,EAAE,OAAO;aAC3B;YACD,GAAG,EAAE;gBACH,UAAU,EAAE,kBAAkB;gBAC9B,OAAO,EAAE,YAAY;gBACrB,SAAS,EAAE,YAAY;gBACvB,YAAY,EAAE,CAAC,EAAE,YAAY;gBAC7B,cAAc,EAAE,CAAC,EAAE,OAAO;aAC3B;YACD,WAAW,EAAE;gBACX,UAAU,EAAE,mBAAmB;gBAC/B,OAAO,EAAE,wBAAwB;gBACjC,SAAS,EAAE,eAAe;gBAC1B,YAAY,EAAE,IAAI,EAAE,SAAS;gBAC7B,cAAc,EAAE,IAAI,EAAE,SAAS;aAChC;SACF,CAAA;QACD,MAAM,GAAG,GAAG,CAAC,UAAU,IAAI,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAA;QAClD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,CAAA;QAC3C,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7C,OAAO,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,UAAU,iBAAiB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACjI,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,SAAS,CAAC,SAA4B;QACpC,0DAA0D;QAC1D,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACxC,OAAM;QACR,CAAC;QACD,MAAM,UAAU,GAAG,SAAS,CAAC,WAAW,IAAI,sBAAsB,CAAA;QAClE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACtD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,gBAAgB,CAAA;QACpB,IAAI,QAAQ,CAAA;QACZ,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAA;QAC5B,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,UAAU,KAAK,cAAc,EAAE,CAAC;YACvC,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAC9D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CACrG,CAAA;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,qFAAqF,CAAC,EAAE,CAAC,CAAA;gBAC1G,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAA;YAC7D,CAAC;YACD,QAAQ,GAAG;gBACT,mBAAmB,EAAE;oBACnB,SAAS,EAAE,CAAC;oBACZ,mBAAmB,EAAE,CAAC;oBACtB,yBAAyB,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE;iBACpF;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,eAAe,EAAE,CAAC;YAC/C,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,CAC/D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,YAAY,CAAC,+BAA+B,CACvF,CAAA;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,+FAA+F,CAAC,EAAE,CAAC,CAAA;gBACpH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAA;YAC9D,CAAC;YACD,QAAQ,GAAG;gBACT,aAAa,EAAE;oBACb,YAAY,EAAE,CAAC;iBAChB;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,aAAa,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAC7D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,kBAAkB,CACxE,CAAA;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,gFAAgF,CAAC,EAAE,CAAC,CAAA;gBACrG,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAA;YAC5D,CAAC;YACD,QAAQ,GAAG;gBACT,YAAY,EAAE;oBACZ,UAAU,EAAE,CAAC;oBACb,OAAO,EAAE,CAAC;iBACX;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAC5D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,kBAAkB,CACvE,CAAA;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,gFAAgF,CAAC,EAAE,CAAC,CAAA;gBACrG,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAA;YAC3D,CAAC;YACD,QAAQ,GAAG;gBACT,aAAa,EAAE;oBACb,SAAS,EAAE,CAAC;iBACb;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,aAAa,EAAE,CAAC;YAC7C,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAC7D,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,4BAA4B,CAClF,CAAA;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,0FAA0F,CAAC,EAAE,CAAC,CAAA;gBAC/G,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAA;YAC5D,CAAC;YACD,QAAQ,GAAG;gBACT,sBAAsB,EAAE;oBACtB,aAAa,EAAE,CAAC;iBACjB;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,gBAAgB,EAAE,CAAC;YAChD,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,IAAI,CAChE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,YAAY,CAAC,iCAAiC,CAC1F,CAAA;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,kGAAkG,CAAC,EAAE,CAAC,CAAA;gBACvH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAA;YAC/D,CAAC;YACD,QAAQ,GAAG;gBACT,2BAA2B,EAAE;oBAC3B,aAAa,EAAE,CAAC;iBACjB;aACF,CAAA;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,KAAK,kBAAkB,EAAE,CAAC;YAClD,IAAI,CAAC;gBACH,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,IAAI,CAClE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAC,YAAY,CAAC,gBAAgB,CAC3E,CAAA;YACH,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,mFAAmF,CAAC,EAAE,CAAC,CAAA;gBACxG,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,CAAA;YACjE,CAAC;YACD,QAAQ,GAAG;gBACT,UAAU,EAAE;oBACV,UAAU,EAAE,CAAC;iBACd;aACF,CAAA;QACH,CAAC;aAAM,CAAC;YACN,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC/D,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,gCAAgC,IAAI,CAAC,UAAU,uBAAuB,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;gBAC5G,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAA;YACnE,CAAC;YACD,QAAQ,GAAG;gBACT,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;oBACd,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,cAAc;iBACtC;aACF,CAAA;QACH,CAAC;QACD,MAAM,YAAY,GAAG,UAAU,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,CAAA;QACrE,MAAM,eAAe,GAAG;YACtB,WAAW,EAAE,UAAU;YACvB,IAAI,EAAE,IAAI;YACV,UAAU,EAAE,gBAAgB;YAC5B,YAAY;YACZ,YAAY,EAAE,oBAAoB;YAClC,KAAK,EAAE,cAAc;YACrB,gBAAgB,EAAE,OAAO;YACzB,gBAAgB,EAAE,OAAO;YACzB,OAAO,EAAE,EAAE;YACX,QAAQ;SACT,CAAA;QACD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,2BAA2B,EAAE,CAC3C,WAAW,EACX,aAAa,EACb,CAAC,eAAe,CAAC,CAClB,CAAA;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;IACxB,CAAC;IAED,QAAQ,CAAC,OAAgB;QACvB,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACnC,OAAM;QACR,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAA;QAC5B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,EAAE,CACpC,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,OAAO,EACZ;YACE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc;SACpE,CACF,CAAA;IACH,CAAC;CACF"}
|
package/dist/ui-api.d.ts
CHANGED
|
@@ -14,8 +14,20 @@ export declare class UiApi {
|
|
|
14
14
|
private readonly dockerUrl?;
|
|
15
15
|
private readonly cacheable;
|
|
16
16
|
private readonly hbStoragePath;
|
|
17
|
+
private readonly uiUpdatePolicy;
|
|
17
18
|
constructor(hbStoragePath: string, log: Logging);
|
|
18
19
|
isConfigured(): boolean;
|
|
20
|
+
/**
|
|
21
|
+
* The Homebridge UI's own update policy for itself (`homebridgeUiUpdatePolicy`).
|
|
22
|
+
* The generic `/api/plugins` list only applies the per-plugin beta preference,
|
|
23
|
+
* so this is needed to honour a `beta` policy for homebridge-config-ui-x (#255).
|
|
24
|
+
*/
|
|
25
|
+
getHomebridgeUiUpdatePolicy(): 'all' | 'beta' | 'major' | 'none';
|
|
26
|
+
/**
|
|
27
|
+
* Fetch the npm dist-tags (e.g. `latest`, `beta`, `next`) for a package,
|
|
28
|
+
* mapping each tag to its published version.
|
|
29
|
+
*/
|
|
30
|
+
getNpmDistTags(packageName: string): Promise<Record<string, string>>;
|
|
19
31
|
getHomebridge(): Promise<InstalledPlugin>;
|
|
20
32
|
getPlugins(): Promise<Array<InstalledPlugin>>;
|
|
21
33
|
getIgnoredPlugins(): Promise<Array<string>>;
|
|
@@ -24,6 +36,16 @@ export declare class UiApi {
|
|
|
24
36
|
savePluginConfig(pluginName: string): Promise<void>;
|
|
25
37
|
getDocker(): Promise<InstalledPlugin>;
|
|
26
38
|
updateHomebridge(targetVersion?: string): Promise<boolean>;
|
|
39
|
+
/**
|
|
40
|
+
* Ask the Homebridge UI to update a package (`homebridge`, `homebridge-config-ui-x`
|
|
41
|
+
* or a plugin) through its own plugin management. Unlike a direct `npm install -g`,
|
|
42
|
+
* this installs into the path Homebridge actually loads plugins from (e.g. the
|
|
43
|
+
* hb-service / Docker custom plugin path), so the update genuinely takes effect (#257).
|
|
44
|
+
*
|
|
45
|
+
* The UI queues the install in the background and performs the appropriate restart
|
|
46
|
+
* itself, so callers must NOT also restart. Returns true once the update is queued.
|
|
47
|
+
*/
|
|
48
|
+
triggerUpdate(packageName: string, targetVersion?: string): Promise<boolean>;
|
|
27
49
|
updatePlugin(pluginName: string, targetVersion?: string): Promise<boolean>;
|
|
28
50
|
updateNpm(targetVersion?: string): Promise<boolean>;
|
|
29
51
|
private runNpmCommand;
|
package/dist/ui-api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ui-api.d.ts","sourceRoot":"","sources":["../src/ui-api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ui-api.d.ts","sourceRoot":"","sources":["../src/ui-api.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,OAAO,EAGR,MAAM,YAAY,CAAA;AAcnB,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,gBAAgB,EAAE,MAAM,CAAA;IACxB,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,OAAO,CAAA;CACzB;AA8BD,qBAAa,KAAK;IAChB,OAAO,CAAC,GAAG,CAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAa;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAQ;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAa;IACzC,OAAO,CAAC,KAAK,CAAC,CAAQ;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAQ;IACnC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiB;IAC3C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;gBAEtD,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO;IAqCxC,YAAY,IAAI,OAAO;IAI9B;;;;OAIG;IACI,2BAA2B,IAAI,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM;IAIvE;;;OAGG;IACU,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAqBpE,aAAa,IAAI,OAAO,CAAC,eAAe,CAAC;IAiBzC,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAQ7C,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IA6B3C,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IA4B5E,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBnG,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;IAsCrC,gBAAgB,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAcvE;;;;;;;;OAQG;IACU,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA4B5E,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc1E,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAclD,aAAa;IAmCd,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;IAqChC,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;YA4CpC,eAAe;YAyBf,cAAc;YAYd,cAAc;YAiBd,QAAQ;YAwBR,sBAAsB;IAiBpC,OAAO,CAAC,aAAa;IAyEd,QAAQ,IAAI,MAAM;CAoB1B"}
|
package/dist/ui-api.js
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
|
-
/* eslint-disable style/brace-style */
|
|
2
1
|
/* eslint-disable style/operator-linebreak */
|
|
2
|
+
import { Buffer } from 'node:buffer';
|
|
3
3
|
import { spawn } from 'node:child_process';
|
|
4
4
|
import { createHash } from 'node:crypto';
|
|
5
5
|
import { readFileSync } from 'node:fs';
|
|
6
|
-
import
|
|
6
|
+
import { request as httpRequest } from 'node:http';
|
|
7
|
+
import https, { request as httpsRequest } from 'node:https';
|
|
7
8
|
import path from 'node:path';
|
|
8
9
|
import process from 'node:process';
|
|
9
|
-
import { request as httpRequest } from 'node:http';
|
|
10
|
-
import { request as httpsRequest } from 'node:https';
|
|
11
10
|
import CacheableLookup from 'cacheable-lookup';
|
|
12
11
|
import jwt from 'jsonwebtoken';
|
|
13
12
|
class ApiPluginEndpoints {
|
|
@@ -28,6 +27,7 @@ export class UiApi {
|
|
|
28
27
|
dockerUrl;
|
|
29
28
|
cacheable;
|
|
30
29
|
hbStoragePath;
|
|
30
|
+
uiUpdatePolicy;
|
|
31
31
|
constructor(hbStoragePath, log) {
|
|
32
32
|
this.log = log;
|
|
33
33
|
this.hbStoragePath = hbStoragePath;
|
|
@@ -36,6 +36,7 @@ export class UiApi {
|
|
|
36
36
|
const configPath = path.resolve(hbStoragePath, 'config.json');
|
|
37
37
|
const hbConfig = JSON.parse(readFileSync(configPath, 'utf8'));
|
|
38
38
|
const config = hbConfig.platforms.find((config) => config.platform === 'config' || config.platform === 'homebridge-config-ui-x.config');
|
|
39
|
+
this.uiUpdatePolicy = config?.homebridgeUiUpdatePolicy || 'all';
|
|
39
40
|
if (config) {
|
|
40
41
|
const secretPath = path.resolve(hbStoragePath, '.uix-secrets');
|
|
41
42
|
this.secrets = JSON.parse(readFileSync(secretPath, 'utf8'));
|
|
@@ -55,6 +56,39 @@ export class UiApi {
|
|
|
55
56
|
isConfigured() {
|
|
56
57
|
return this.secrets !== undefined;
|
|
57
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* The Homebridge UI's own update policy for itself (`homebridgeUiUpdatePolicy`).
|
|
61
|
+
* The generic `/api/plugins` list only applies the per-plugin beta preference,
|
|
62
|
+
* so this is needed to honour a `beta` policy for homebridge-config-ui-x (#255).
|
|
63
|
+
*/
|
|
64
|
+
getHomebridgeUiUpdatePolicy() {
|
|
65
|
+
return this.uiUpdatePolicy;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Fetch the npm dist-tags (e.g. `latest`, `beta`, `next`) for a package,
|
|
69
|
+
* mapping each tag to its published version.
|
|
70
|
+
*/
|
|
71
|
+
async getNpmDistTags(packageName) {
|
|
72
|
+
const url = `https://registry.npmjs.org/${encodeURIComponent(packageName).replace(/^%40/, '@')}`;
|
|
73
|
+
return await new Promise((resolve, reject) => {
|
|
74
|
+
const req = https.get(url, { headers: { accept: 'application/vnd.npm.install-v1+json' } }, (res) => {
|
|
75
|
+
let data = '';
|
|
76
|
+
res.on('data', (chunk) => {
|
|
77
|
+
data += chunk;
|
|
78
|
+
});
|
|
79
|
+
res.on('end', () => {
|
|
80
|
+
try {
|
|
81
|
+
const body = JSON.parse(data);
|
|
82
|
+
resolve(body['dist-tags'] ?? {});
|
|
83
|
+
}
|
|
84
|
+
catch (error) {
|
|
85
|
+
reject(error);
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
req.on('error', reject);
|
|
90
|
+
});
|
|
91
|
+
}
|
|
58
92
|
async getHomebridge() {
|
|
59
93
|
if (this.isConfigured()) {
|
|
60
94
|
const result = await this.makeCall(ApiPluginEndpoints.getHomebridgeVersion);
|
|
@@ -201,6 +235,43 @@ export class UiApi {
|
|
|
201
235
|
return false;
|
|
202
236
|
}
|
|
203
237
|
}
|
|
238
|
+
/**
|
|
239
|
+
* Ask the Homebridge UI to update a package (`homebridge`, `homebridge-config-ui-x`
|
|
240
|
+
* or a plugin) through its own plugin management. Unlike a direct `npm install -g`,
|
|
241
|
+
* this installs into the path Homebridge actually loads plugins from (e.g. the
|
|
242
|
+
* hb-service / Docker custom plugin path), so the update genuinely takes effect (#257).
|
|
243
|
+
*
|
|
244
|
+
* The UI queues the install in the background and performs the appropriate restart
|
|
245
|
+
* itself, so callers must NOT also restart. Returns true once the update is queued.
|
|
246
|
+
*/
|
|
247
|
+
async triggerUpdate(packageName, targetVersion) {
|
|
248
|
+
if (!this.isConfigured()) {
|
|
249
|
+
return false;
|
|
250
|
+
}
|
|
251
|
+
const query = targetVersion ? `?version=${encodeURIComponent(targetVersion)}` : '';
|
|
252
|
+
const apiPath = `/api/plugins/update/${encodeURIComponent(packageName)}${query}`;
|
|
253
|
+
try {
|
|
254
|
+
const response = await this.nativeRequestWithRetry('POST', this.baseUrl + apiPath, {
|
|
255
|
+
headers: {
|
|
256
|
+
Authorization: `Bearer ${this.getToken()}`,
|
|
257
|
+
},
|
|
258
|
+
body: {},
|
|
259
|
+
agent: this.httpsAgent,
|
|
260
|
+
lookup: this.cacheable.lookup,
|
|
261
|
+
timeout: 60000,
|
|
262
|
+
});
|
|
263
|
+
if (response?.ok === true) {
|
|
264
|
+
this.log.info(`Queued update for ${packageName}${targetVersion ? ` to ${targetVersion}` : ''} via the Homebridge UI`);
|
|
265
|
+
return true;
|
|
266
|
+
}
|
|
267
|
+
this.log.warn(`Homebridge UI did not confirm the update for ${packageName}: ${JSON.stringify(response)}`);
|
|
268
|
+
return false;
|
|
269
|
+
}
|
|
270
|
+
catch (error) {
|
|
271
|
+
this.log.error(`Failed to queue update for ${packageName} via the Homebridge UI: ${error}`);
|
|
272
|
+
return false;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
204
275
|
async updatePlugin(pluginName, targetVersion) {
|
|
205
276
|
this.log.info(`Attempting to update plugin ${pluginName}${targetVersion ? ` to ${targetVersion}` : ' to latest version'}`);
|
|
206
277
|
try {
|
|
@@ -235,11 +306,9 @@ export class UiApi {
|
|
|
235
306
|
});
|
|
236
307
|
let stdout = '';
|
|
237
308
|
let stderr = '';
|
|
238
|
-
// eslint-disable-next-line node/prefer-global/buffer
|
|
239
309
|
npm.stdout.on('data', (chunk) => {
|
|
240
310
|
stdout += chunk.toString();
|
|
241
311
|
});
|
|
242
|
-
// eslint-disable-next-line node/prefer-global/buffer
|
|
243
312
|
npm.stderr.on('data', (chunk) => {
|
|
244
313
|
stderr += chunk.toString();
|
|
245
314
|
});
|
|
@@ -410,7 +479,7 @@ export class UiApi {
|
|
|
410
479
|
this.log.error(`${error.code} error connecting to ${this.baseUrl + apiPath}`);
|
|
411
480
|
if (error.code === 'ERR_BAD_REQUEST' && error.status === 404 && apiPath === ApiPluginEndpoints.getIgnoredPluginList) {
|
|
412
481
|
this.log.debug(`Error: ${JSON.stringify(error, undefined, 2)}`);
|
|
413
|
-
this.log.warn(
|
|
482
|
+
this.log.warn('This feature requires a newer version of Homebridge UI. Please update to the latest version.');
|
|
414
483
|
}
|
|
415
484
|
return [];
|
|
416
485
|
}
|
|
@@ -466,7 +535,9 @@ export class UiApi {
|
|
|
466
535
|
};
|
|
467
536
|
const req = (isHttps ? httpsRequest : httpRequest)(reqOptions, (res) => {
|
|
468
537
|
let data = '';
|
|
469
|
-
res.on('data', (chunk) => {
|
|
538
|
+
res.on('data', (chunk) => {
|
|
539
|
+
data += chunk;
|
|
540
|
+
});
|
|
470
541
|
res.on('end', () => {
|
|
471
542
|
try {
|
|
472
543
|
// Check for HTTP error status codes
|
|
@@ -488,7 +559,7 @@ export class UiApi {
|
|
|
488
559
|
}
|
|
489
560
|
});
|
|
490
561
|
});
|
|
491
|
-
req.on('error',
|
|
562
|
+
req.on('error', err => reject(err));
|
|
492
563
|
req.on('timeout', () => {
|
|
493
564
|
req.destroy();
|
|
494
565
|
reject(new Error('ETIMEOUT'));
|