node-switchbot 4.0.7 → 5.1.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.
Files changed (79) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/ble.d.ts.map +1 -1
  3. package/dist/ble.js +10 -6
  4. package/dist/ble.js.map +1 -1
  5. package/dist/devices/air-purifier-api.d.ts +16 -0
  6. package/dist/devices/air-purifier-api.d.ts.map +1 -0
  7. package/dist/devices/air-purifier-api.js +24 -0
  8. package/dist/devices/air-purifier-api.js.map +1 -0
  9. package/dist/devices/base.d.ts +5 -0
  10. package/dist/devices/base.d.ts.map +1 -1
  11. package/dist/devices/base.js +31 -25
  12. package/dist/devices/base.js.map +1 -1
  13. package/dist/devices/device-override-state-during-connection.d.ts.map +1 -1
  14. package/dist/devices/device-override-state-during-connection.js +2 -3
  15. package/dist/devices/device-override-state-during-connection.js.map +1 -1
  16. package/dist/devices/wo-air-purifier-pm25.d.ts.map +1 -1
  17. package/dist/devices/wo-air-purifier-pm25.js +7 -6
  18. package/dist/devices/wo-air-purifier-pm25.js.map +1 -1
  19. package/dist/devices/wo-air-purifier.d.ts.map +1 -1
  20. package/dist/devices/wo-air-purifier.js +4 -3
  21. package/dist/devices/wo-air-purifier.js.map +1 -1
  22. package/dist/devices/wo-blind-tilt.d.ts +23 -0
  23. package/dist/devices/wo-blind-tilt.d.ts.map +1 -1
  24. package/dist/devices/wo-blind-tilt.js +42 -77
  25. package/dist/devices/wo-blind-tilt.js.map +1 -1
  26. package/dist/devices/wo-bulb.d.ts.map +1 -1
  27. package/dist/devices/wo-bulb.js +2 -1
  28. package/dist/devices/wo-bulb.js.map +1 -1
  29. package/dist/devices/wo-hand.js +1 -1
  30. package/dist/devices/wo-hand.js.map +1 -1
  31. package/dist/devices/wo-lock-pro.js +2 -2
  32. package/dist/devices/wo-lock-pro.js.map +1 -1
  33. package/dist/devices/wo-lock.js +2 -2
  34. package/dist/devices/wo-lock.js.map +1 -1
  35. package/dist/devices/wo-rgbic-neon-wire-rope-light.js +2 -2
  36. package/dist/devices/wo-rgbic-neon-wire-rope-light.js.map +1 -1
  37. package/dist/devices/wo-vacuum-k10-pro-combo.d.ts +5 -0
  38. package/dist/devices/wo-vacuum-k10-pro-combo.d.ts.map +1 -1
  39. package/dist/devices/wo-vacuum-k10-pro-combo.js +4 -0
  40. package/dist/devices/wo-vacuum-k10-pro-combo.js.map +1 -1
  41. package/dist/devices/wo-vacuum-k11-plus.d.ts +5 -0
  42. package/dist/devices/wo-vacuum-k11-plus.d.ts.map +1 -1
  43. package/dist/devices/wo-vacuum-k11-plus.js +4 -0
  44. package/dist/devices/wo-vacuum-k11-plus.js.map +1 -1
  45. package/dist/devices/wo-vacuum-k20.d.ts +5 -0
  46. package/dist/devices/wo-vacuum-k20.d.ts.map +1 -1
  47. package/dist/devices/wo-vacuum-k20.js +4 -0
  48. package/dist/devices/wo-vacuum-k20.js.map +1 -1
  49. package/dist/devices/wo-vacuum-s10.d.ts +5 -0
  50. package/dist/devices/wo-vacuum-s10.d.ts.map +1 -1
  51. package/dist/devices/wo-vacuum-s10.js +4 -0
  52. package/dist/devices/wo-vacuum-s10.js.map +1 -1
  53. package/dist/devices/wo-vacuum-s20.d.ts +5 -0
  54. package/dist/devices/wo-vacuum-s20.d.ts.map +1 -1
  55. package/dist/devices/wo-vacuum-s20.js +4 -0
  56. package/dist/devices/wo-vacuum-s20.js.map +1 -1
  57. package/dist/devices/wo-vacuum.d.ts +8 -0
  58. package/dist/devices/wo-vacuum.d.ts.map +1 -1
  59. package/dist/devices/wo-vacuum.js +13 -4
  60. package/dist/devices/wo-vacuum.js.map +1 -1
  61. package/dist/settings.d.ts.map +1 -1
  62. package/dist/settings.js +94 -22
  63. package/dist/settings.js.map +1 -1
  64. package/dist/switchbot.d.ts.map +1 -1
  65. package/dist/switchbot.js +24 -26
  66. package/dist/switchbot.js.map +1 -1
  67. package/dist/types/api.d.ts +1 -1
  68. package/dist/types/api.d.ts.map +1 -1
  69. package/dist/types/ble.d.ts +10 -4
  70. package/dist/types/ble.d.ts.map +1 -1
  71. package/dist/types/ble.js +12 -4
  72. package/dist/types/ble.js.map +1 -1
  73. package/dist/types/index.d.ts +2 -0
  74. package/dist/types/index.d.ts.map +1 -1
  75. package/dist/types/index.js.map +1 -1
  76. package/dist/utils/circuit-breaker.d.ts.map +1 -1
  77. package/dist/utils/circuit-breaker.js +2 -0
  78. package/dist/utils/circuit-breaker.js.map +1 -1
  79. package/package.json +1 -1
@@ -3,5 +3,10 @@ import { WoVacuum } from './wo-vacuum.js';
3
3
  * Robot Vacuum Cleaner K11+
4
4
  */
5
5
  export declare class WoVacuumK11Plus extends WoVacuum {
6
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
7
+ protected apiCleanCommand(): {
8
+ command: string;
9
+ parameter?: unknown;
10
+ };
6
11
  }
7
12
  //# sourceMappingURL=wo-vacuum-k11-plus.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-k11-plus.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k11-plus.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,eAAgB,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-k11-plus.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k11-plus.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,eAAgB,SAAQ,QAAQ;IAC3C,sDAAsD;cACnC,eAAe,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;CAG/E"}
@@ -7,5 +7,9 @@ import { WoVacuum } from './wo-vacuum.js';
7
7
  * Robot Vacuum Cleaner K11+
8
8
  */
9
9
  export class WoVacuumK11Plus extends WoVacuum {
10
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
11
+ apiCleanCommand() {
12
+ return { command: 'startClean', parameter: { action: 'sweep', param: { fanLevel: 1, times: 1 } } };
13
+ }
10
14
  }
11
15
  //# sourceMappingURL=wo-vacuum-k11-plus.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-k11-plus.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k11-plus.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-k11-plus.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k11-plus.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,eAAgB,SAAQ,QAAQ;IAC3C,sDAAsD;IACnC,eAAe;QAChC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAA;IACpG,CAAC;CACF"}
@@ -3,5 +3,10 @@ import { WoVacuum } from './wo-vacuum.js';
3
3
  * Robot Vacuum Cleaner K20
4
4
  */
5
5
  export declare class WoVacuumK20 extends WoVacuum {
6
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
7
+ protected apiCleanCommand(): {
8
+ command: string;
9
+ parameter?: unknown;
10
+ };
6
11
  }
7
12
  //# sourceMappingURL=wo-vacuum-k20.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-k20.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k20.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-k20.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k20.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;IACvC,sDAAsD;cACnC,eAAe,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;CAG/E"}
@@ -7,5 +7,9 @@ import { WoVacuum } from './wo-vacuum.js';
7
7
  * Robot Vacuum Cleaner K20
8
8
  */
9
9
  export class WoVacuumK20 extends WoVacuum {
10
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
11
+ apiCleanCommand() {
12
+ return { command: 'startClean', parameter: { action: 'sweep', param: { fanLevel: 1, times: 1 } } };
13
+ }
10
14
  }
11
15
  //# sourceMappingURL=wo-vacuum-k20.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-k20.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k20.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-k20.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-k20.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC,sDAAsD;IACnC,eAAe;QAChC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAA;IACpG,CAAC;CACF"}
@@ -3,5 +3,10 @@ import { WoVacuum } from './wo-vacuum.js';
3
3
  * Robot Vacuum Cleaner S10
4
4
  */
5
5
  export declare class WoVacuumS10 extends WoVacuum {
6
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
7
+ protected apiCleanCommand(): {
8
+ command: string;
9
+ parameter?: unknown;
10
+ };
6
11
  }
7
12
  //# sourceMappingURL=wo-vacuum-s10.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-s10.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s10.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-s10.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s10.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;IACvC,sDAAsD;cACnC,eAAe,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;CAG/E"}
@@ -7,5 +7,9 @@ import { WoVacuum } from './wo-vacuum.js';
7
7
  * Robot Vacuum Cleaner S10
8
8
  */
9
9
  export class WoVacuumS10 extends WoVacuum {
10
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
11
+ apiCleanCommand() {
12
+ return { command: 'startClean', parameter: { action: 'sweep', param: { fanLevel: 1, waterLevel: 1, times: 1 } } };
13
+ }
10
14
  }
11
15
  //# sourceMappingURL=wo-vacuum-s10.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-s10.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s10.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-s10.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s10.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC,sDAAsD;IACnC,eAAe;QAChC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAA;IACnH,CAAC;CACF"}
@@ -3,5 +3,10 @@ import { WoVacuum } from './wo-vacuum.js';
3
3
  * Robot Vacuum Cleaner S20
4
4
  */
5
5
  export declare class WoVacuumS20 extends WoVacuum {
6
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
7
+ protected apiCleanCommand(): {
8
+ command: string;
9
+ parameter?: unknown;
10
+ };
6
11
  }
7
12
  //# sourceMappingURL=wo-vacuum-s20.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-s20.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s20.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-s20.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s20.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,qBAAa,WAAY,SAAQ,QAAQ;IACvC,sDAAsD;cACnC,eAAe,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;CAG/E"}
@@ -7,5 +7,9 @@ import { WoVacuum } from './wo-vacuum.js';
7
7
  * Robot Vacuum Cleaner S20
8
8
  */
9
9
  export class WoVacuumS20 extends WoVacuum {
10
+ /** OpenAPI `startClean`: sweep once at fan level 1 */
11
+ apiCleanCommand() {
12
+ return { command: 'startClean', parameter: { action: 'sweep', param: { fanLevel: 1, waterLevel: 1, times: 1 } } };
13
+ }
10
14
  }
11
15
  //# sourceMappingURL=wo-vacuum-s20.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum-s20.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s20.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;CAAG"}
1
+ {"version":3,"file":"wo-vacuum-s20.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum-s20.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,QAAQ;IACvC,sDAAsD;IACnC,eAAe;QAChC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,CAAA;IACnH,CAAC;CACF"}
@@ -4,6 +4,14 @@ import { SequenceDevice } from './sequence-device.js';
4
4
  * Vacuum Device
5
5
  */
6
6
  export declare class WoVacuum extends SequenceDevice implements VacuumCommands {
7
+ /**
8
+ * OpenAPI command that starts cleaning. The S1, S1 Plus, K10+ and K10+ Pro use `start`; newer
9
+ * models (S10, S20, K10+ Pro Combo, K11+, K20+ Pro) only accept `startClean` and override this.
10
+ */
11
+ protected apiCleanCommand(): {
12
+ command: string;
13
+ parameter?: unknown;
14
+ };
7
15
  /**
8
16
  * Start cleaning (BLE-first, API-fallback)
9
17
  */
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD;;GAEG;AACH,qBAAa,QAAS,SAAQ,cAAe,YAAW,cAAc;IACpE;;OAEG;IACG,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyBxD;;OAEG;IACG,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyB7D;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,SAAS;IAKhC;;OAEG;IACH,aAAa,IAAI,MAAM,GAAG,SAAS;IAKnC;;OAEG;IACH,qBAAqB,IAAI,OAAO,GAAG,SAAS;IAK5C;;OAEG;IACH,yBAAyB,IAAI,OAAO,GAAG,SAAS;IAKhD;;OAEG;IACH,yBAAyB,IAAI,OAAO,GAAG,SAAS;IAKhD;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA0BxC,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,SAAS;CAGlB"}
1
+ {"version":3,"file":"wo-vacuum.d.ts","sourceRoot":"","sources":["../../src/devices/wo-vacuum.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAErD;;GAEG;AACH,qBAAa,QAAS,SAAQ,cAAe,YAAW,cAAc;IACpE;;;OAGG;IACH,SAAS,CAAC,eAAe,IAAI;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAIrE;;OAEG;IACG,OAAO,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA2BxD;;OAEG;IACG,YAAY,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAyB7D;;OAEG;IACH,UAAU,IAAI,MAAM,GAAG,SAAS;IAKhC;;OAEG;IACH,aAAa,IAAI,MAAM,GAAG,SAAS;IAKnC;;OAEG;IACH,qBAAqB,IAAI,OAAO,GAAG,SAAS;IAK5C;;OAEG;IACH,yBAAyB,IAAI,OAAO,GAAG,SAAS;IAKhD;;OAEG;IACH,yBAAyB,IAAI,OAAO,GAAG,SAAS;IAKhD;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA0BxC,OAAO,CAAC,qBAAqB;IAW7B,OAAO,CAAC,0BAA0B;IAIlC,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,SAAS;CAGlB"}
@@ -8,6 +8,13 @@ import { SequenceDevice } from './sequence-device.js';
8
8
  * Vacuum Device
9
9
  */
10
10
  export class WoVacuum extends SequenceDevice {
11
+ /**
12
+ * OpenAPI command that starts cleaning. The S1, S1 Plus, K10+ and K10+ Pro use `start`; newer
13
+ * models (S10, S20, K10+ Pro Combo, K11+, K20+ Pro) only accept `startClean` and override this.
14
+ */
15
+ apiCleanCommand() {
16
+ return { command: 'start' };
17
+ }
11
18
  /**
12
19
  * Start cleaning (BLE-first, API-fallback)
13
20
  */
@@ -20,7 +27,8 @@ export class WoVacuum extends SequenceDevice {
20
27
  if (this.hasBLE()) {
21
28
  try {
22
29
  const command = this.getCommandForProtocol(DEVICE_COMMANDS.VACUUM.CLEAN_UP, protocolVersion);
23
- const result = await this.sendCommand(command, 'start', { protocolVersion });
30
+ const { command: apiCommand, parameter } = this.apiCleanCommand();
31
+ const result = await this.sendCommand(command, apiCommand, parameter);
24
32
  if (result.success) {
25
33
  return true;
26
34
  }
@@ -31,7 +39,8 @@ export class WoVacuum extends SequenceDevice {
31
39
  }
32
40
  // Fallback to API
33
41
  if (this.hasAPI()) {
34
- const apiResult = await this.sendAPICommand('start', { protocolVersion });
42
+ const { command: apiCommand, parameter } = this.apiCleanCommand();
43
+ const apiResult = await this.sendAPICommand(apiCommand, parameter);
35
44
  return apiResult.success;
36
45
  }
37
46
  throw new Error('No connection method available for cleanUp');
@@ -48,7 +57,7 @@ export class WoVacuum extends SequenceDevice {
48
57
  if (this.hasBLE()) {
49
58
  try {
50
59
  const command = this.getCommandForProtocol(DEVICE_COMMANDS.VACUUM.RETURN_TO_DOCK, protocolVersion);
51
- const result = await this.sendCommand(command, 'dock', { protocolVersion });
60
+ const result = await this.sendCommand(command, 'dock');
52
61
  if (result.success) {
53
62
  return true;
54
63
  }
@@ -59,7 +68,7 @@ export class WoVacuum extends SequenceDevice {
59
68
  }
60
69
  // Fallback to API
61
70
  if (this.hasAPI()) {
62
- const apiResult = await this.sendAPICommand('dock', { protocolVersion });
71
+ const apiResult = await this.sendAPICommand('dock');
63
72
  return apiResult.success;
64
73
  }
65
74
  throw new Error('No connection method available for returnToDock');
@@ -1 +1 @@
1
- {"version":3,"file":"wo-vacuum.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wo-vacuum.js","sourceRoot":"","sources":["../../src/devices/wo-vacuum.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,eAAO,MAAM,qBAAqB,QAAsB,CAAA;AAExD;;GAEG;AACH,eAAO,MAAM,gBAAgB,+BAA+B,CAAA;AAC5D,eAAO,MAAM,WAAW,SAAS,CAAA;AAEjC,eAAO,MAAM,IAAI,EAAE;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAMhB,CAAA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAKtD;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,qCAAqC,CAAA;AAClE,eAAO,MAAM,6BAA6B,qCAAqC,CAAA;AAC/E,eAAO,MAAM,8BAA8B,qCAAqC,CAAA;AAGhF,eAAO,MAAM,iBAAiB,yCAAyC,CAAA;AACvE,eAAO,MAAM,eAAe,yCAAyC,CAAA;AACrE,eAAO,MAAM,gBAAgB,yCAAyC,CAAA;AACtE,eAAO,MAAM,gBAAgB,yCAAyC,CAAA;AAEtE;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAQ,CAAA;AACrC,eAAO,MAAM,mBAAmB,QAAQ,CAAA;AACxC,eAAO,MAAM,mBAAmB,OAAO,CAAA;AACvC,eAAO,MAAM,iBAAiB,QAAQ,CAAA;AACtC,eAAO,MAAM,kBAAkB,QAAQ,CAAA;AAEvC;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4FlB,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,mBAAmB;;;CAGtB,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;CAIzB,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAqC1C,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CA+F1C,CAAA;AAEV;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEjE;AAMD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE7E;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;CAcX,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,QAAQ,SAA+B,CAAA;AACpD,eAAO,MAAM,QAAQ,SAAgC,CAAA;AACrD,eAAO,MAAM,aAAa,SAAuB,CAAA"}
1
+ {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA;;GAEG;AASH,eAAO,MAAM,qBAAqB,QAAsB,CAAA;AAExD;;GAEG;AACH,eAAO,MAAM,gBAAgB,+BAA+B,CAAA;AAC5D,eAAO,MAAM,WAAW,SAAS,CAAA;AAEjC,eAAO,MAAM,IAAI,EAAE;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;CAMhB,CAAA;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAKtD;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB,qCAAqC,CAAA;AAClE,eAAO,MAAM,6BAA6B,qCAAqC,CAAA;AAC/E,eAAO,MAAM,8BAA8B,qCAAqC,CAAA;AAGhF,eAAO,MAAM,iBAAiB,yCAAyC,CAAA;AACvE,eAAO,MAAM,eAAe,yCAAyC,CAAA;AACrE,eAAO,MAAM,gBAAgB,yCAAyC,CAAA;AACtE,eAAO,MAAM,gBAAgB,yCAAyC,CAAA;AAEtE;;GAEG;AACH,eAAO,MAAM,gBAAgB,QAAQ,CAAA;AACrC,eAAO,MAAM,mBAAmB,QAAQ,CAAA;AACxC,eAAO,MAAM,mBAAmB,OAAO,CAAA;AACvC,eAAO,MAAM,iBAAiB,QAAQ,CAAA;AACtC,eAAO,MAAM,kBAAkB,QAAQ,CAAA;AAEvC;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4FlB,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,mBAAmB;;;CAGtB,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,sBAAsB;;;;CAIzB,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAiG1C,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CA2G1C,CAAA;AAEV;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAEjE;AAMD;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE7E;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;CAcX,CAAA;AAEV;;GAEG;AACH,eAAO,MAAM,QAAQ,SAA+B,CAAA;AACpD,eAAO,MAAM,QAAQ,SAAgC,CAAA;AACrD,eAAO,MAAM,aAAa,SAAuB,CAAA"}
package/dist/settings.js CHANGED
@@ -154,42 +154,102 @@ export const WoSmartLockProCommands = {
154
154
  * Device Model to Type Mapping
155
155
  */
156
156
  export const DEVICE_MODEL_MAP = {
157
+ // Codes are byte 0 of the service data with the top bit cleared, as in pySwitchbot's
158
+ // SUPPORTED_TYPES (switchbot/adv_parser.py). Most products have two codes.
157
159
  'H': 'Bot',
158
160
  'c': 'Curtain',
161
+ 'C': 'Curtain',
159
162
  '{': 'Curtain3',
160
- 'g': 'Plug',
161
- 'j': 'Plug Mini (US)',
163
+ '[': 'Curtain3',
164
+ 'x': 'Blind Tilt',
165
+ 'X': 'Blind Tilt',
166
+ ',': 'Roller Shade',
167
+ '\x0C': 'Roller Shade',
168
+ 'g': 'Plug Mini (US)',
169
+ 'G': 'Plug Mini (US)',
170
+ 'j': 'Plug Mini (JP)',
171
+ 'J': 'Plug Mini (JP)',
172
+ '?': 'Plug Mini (EU)',
173
+ '\x1F': 'Plug Mini (EU)',
174
+ ';': 'Relay Switch 1',
175
+ '\x1B': 'Relay Switch 1',
176
+ '<': 'Relay Switch 1PM',
177
+ '\x1C': 'Relay Switch 1PM',
178
+ '=': 'Relay Switch 2PM',
179
+ '\x1D': 'Relay Switch 2PM',
180
+ '>': 'Garage Door Opener',
181
+ '\x1E': 'Garage Door Opener',
162
182
  'T': 'Meter',
183
+ 't': 'Meter',
163
184
  'i': 'Meter Plus',
185
+ 'I': 'Meter Plus',
186
+ '4': 'Meter Pro',
187
+ '\x14': 'Meter Pro',
188
+ '5': 'Meter Pro (CO2)',
189
+ '\x15': 'Meter Pro (CO2)',
190
+ 'w': 'Indoor/Outdoor Thermo-Hygrometer',
191
+ 'W': 'Indoor/Outdoor Thermo-Hygrometer',
164
192
  'o': 'Lock',
165
- '\x11': 'Lock Pro',
166
- 'k': 'Keypad',
167
- '\x0B': 'Keypad Touch',
193
+ 'O': 'Lock',
194
+ '$': 'Lock Pro',
195
+ '\x04': 'Lock Pro',
196
+ '-': 'Lock Lite',
197
+ '\x0D': 'Lock Lite',
198
+ 'y': 'Keypad',
199
+ 'Y': 'Keypad',
168
200
  's': 'Motion Sensor',
201
+ 'S': 'Motion Sensor',
169
202
  'd': 'Contact Sensor',
203
+ 'D': 'Contact Sensor',
204
+ '&': 'Water Leak Detector',
205
+ '\x06': 'Water Leak Detector',
170
206
  'q': 'Ceiling Light',
171
- 'r': 'Ceiling Light Pro',
172
- 'p': 'Strip Light',
207
+ 'Q': 'Ceiling Light',
208
+ 'n': 'Ceiling Light Pro',
209
+ 'N': 'Ceiling Light Pro',
210
+ 'r': 'Strip Light',
211
+ 'R': 'Strip Light',
173
212
  'u': 'Color Bulb',
174
- '\x0A': 'Robot Vacuum Cleaner S1',
175
- '\x0C': 'Robot Vacuum Cleaner S1 Plus',
176
- '\x0F': 'Robot Vacuum Cleaner K10 Plus',
213
+ 'U': 'Color Bulb',
177
214
  'e': 'Humidifier',
178
- '\x07': 'Humidifier 2',
179
- 'x': 'Blind Tilt',
215
+ 'E': 'Humidifier',
216
+ '#': 'Evaporative Humidifier',
217
+ '\x03': 'Evaporative Humidifier',
218
+ '*': 'Air Purifier',
219
+ '\x0A': 'Air Purifier',
220
+ '+': 'Air Purifier',
221
+ '\x0B': 'Air Purifier',
222
+ '7': 'Air Purifier Table',
223
+ '\x17': 'Air Purifier Table',
224
+ '8': 'Air Purifier Table',
225
+ '\x18': 'Air Purifier Table',
226
+ '~': 'Circulator Fan',
227
+ '^': 'Circulator Fan',
228
+ 'v': 'Hub 2',
229
+ 'V': 'Hub 2',
230
+ '%': 'HubMini Matter',
231
+ '\x05': 'HubMini Matter',
232
+ 'b': 'Remote',
233
+ 'B': 'Remote',
234
+ 'z': 'Robot Vacuum Cleaner S10',
235
+ 'Z': 'Robot Vacuum Cleaner S10',
236
+ '}': 'Robot Vacuum Cleaner K10+',
237
+ ']': 'Robot Vacuum Cleaner K10+',
238
+ '(': 'Robot Vacuum Cleaner K10+ Pro',
239
+ '\x08': 'Robot Vacuum Cleaner K10+ Pro',
240
+ '3': 'K10+ Pro Combo',
241
+ '\x13': 'K10+ Pro Combo',
242
+ '.': 'Robot Vacuum Cleaner K20',
243
+ '\x0F': 'Robot Vacuum Cleaner K20',
244
+ // Codes not in pySwitchbot, kept from earlier node-switchbot releases
180
245
  '\x01': 'Hub 2',
181
246
  '\x02': 'Hub 3',
182
- '\x05': 'Remote',
183
- '\x04': 'Battery Circulator Fan',
184
- '\x08': 'Air Purifier',
185
247
  '\x09': 'Air Purifier Table',
186
- 'y': 'Water Leak Detector',
187
- '\x06': 'Presence Sensor',
188
- '\x0D': 'Relay Switch 1PM',
189
248
  '\x0E': 'Relay Switch 1',
190
249
  '\x10': 'K10+ Pro Combo',
191
- 'w': 'Meter Pro (CO2)',
192
- 'n': 'Outdoor Meter',
250
+ '\x11': 'Lock Pro',
251
+ 'k': 'Keypad',
252
+ 'p': 'Strip Light',
193
253
  };
194
254
  /**
195
255
  * Device Type to Class Name Mapping
@@ -198,18 +258,25 @@ export const DEVICE_CLASS_MAP = {
198
258
  'Bot': 'WoHand',
199
259
  'Curtain': 'WoCurtain',
200
260
  'Curtain3': 'WoCurtain',
261
+ 'WoCurtain3': 'WoCurtain',
201
262
  'Roller Shade': 'WoRollerShade',
202
263
  'SwitchBot Roller Shade': 'WoRollerShade',
203
264
  'Plug': 'WoPlugMiniUS',
204
265
  'WoPlugUS': 'WoPlugMiniUS',
205
266
  'Plug Mini (US)': 'WoPlugMiniUS',
206
267
  'Plug Mini (JP)': 'WoPlugMiniJP',
268
+ 'WoPlugJP': 'WoPlugMiniJP',
207
269
  'Plug Mini (EU)': 'WoPlugMiniEU',
208
270
  'Meter': 'WoSensorTH',
209
271
  'Meter Plus': 'WoSensorTHPlus',
272
+ 'WoMeterPlus': 'WoSensorTHPlus',
210
273
  'Meter Pro': 'WoSensorTHPro',
211
274
  'Meter Pro (CO2)': 'WoSensorTHProCO2',
275
+ 'WoTHPc': 'WoSensorTHProCO2',
276
+ 'Indoor/Outdoor Thermo-Hygrometer': 'WoIOSensorTH',
212
277
  'Outdoor Meter': 'WoIOSensorTH',
278
+ 'WoIOSensor': 'WoIOSensorTH',
279
+ 'WoIOSensorTH': 'WoIOSensorTH',
213
280
  'Lock': 'WoSmartLock',
214
281
  'Lock Lite': 'WoSmartLockLite',
215
282
  'Lock Pro': 'WoSmartLockPro',
@@ -226,6 +293,7 @@ export const DEVICE_CLASS_MAP = {
226
293
  'Contact Sensor': 'WoContact',
227
294
  'Ceiling Light': 'WoCeilingLight',
228
295
  'Ceiling Light Pro': 'WoCeilingLight',
296
+ 'WoCeilingPro': 'WoCeilingLight',
229
297
  'Strip Light': 'WoStrip',
230
298
  'Strip Light 3': 'WoStripLight3',
231
299
  'SwitchBot Strip Light 3': 'WoStripLight3',
@@ -238,13 +306,15 @@ export const DEVICE_CLASS_MAP = {
238
306
  'SwitchBot RGBICWW Floor Lamp': 'WoRGBICWWFloorLamp',
239
307
  'Art Frame': 'WoArtFrame',
240
308
  'SwitchBot Art Frame': 'WoArtFrame',
241
- 'Robot Vacuum Cleaner S1': 'WoVacuumS10',
242
- 'Robot Vacuum Cleaner S1 Plus': 'WoVacuumS20',
309
+ // S1 and S1 Plus use the original start/stop/dock OpenAPI commands, unlike the S10/S20
310
+ 'Robot Vacuum Cleaner S1': 'WoVacuum',
311
+ 'Robot Vacuum Cleaner S1 Plus': 'WoVacuum',
243
312
  'Robot Vacuum Cleaner K10 Plus': 'WoVacuumK10Plus',
244
313
  'Robot Vacuum Cleaner K10+': 'WoVacuumK10Plus',
245
314
  'Robot Vacuum Cleaner K10+ Pro': 'WoVacuumK10Pro',
246
315
  'Robot Vacuum Cleaner K11+': 'WoVacuumK11Plus',
247
316
  'Robot Vacuum Cleaner K20': 'WoVacuumK20',
317
+ 'Robot Vacuum Cleaner K20 Plus Pro': 'WoVacuumK20',
248
318
  'Robot Vacuum Cleaner S10': 'WoVacuumS10',
249
319
  'Robot Vacuum Cleaner S20': 'WoVacuumS20',
250
320
  'Humidifier': 'WoHumi',
@@ -257,7 +327,9 @@ export const DEVICE_CLASS_MAP = {
257
327
  'Hub 3': 'WoHub3',
258
328
  'SwitchBot Hub 3': 'WoHub3',
259
329
  'Hub Mini': 'WoHub2',
330
+ 'WoLinkMini': 'WoHub2',
260
331
  'HubMini Matter': 'WoHubMiniMatter',
332
+ 'WoLinkMatter': 'WoHubMiniMatter',
261
333
  'SwitchBot HubMini Matter': 'WoHubMiniMatter',
262
334
  'Hub Plus': 'WoHub2',
263
335
  'Remote': 'WoRemote',
@@ -1 +1 @@
1
- {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"settings.js","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"switchbot.d.ts","sourceRoot":"","sources":["../src/switchbot.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAkB,gBAAgB,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEnG,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAiB,UAAU,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AA4IjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,YAAY;IACzC,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,UAAU,CAAC,CAAY;IAC/B,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,OAAO,CAAC,SAAS,CAAC,CAAe;IACjC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,WAAW,CAAQ;IAE3B,OAAO,CAAC,uBAAuB,CAAsB;gBAEzC,MAAM,GAAE,eAAoB;IAoCxC;;OAEG;IACH,OAAO,CAAC,UAAU;IAgDlB;;;OAGG;IACG,QAAQ,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAwD1E;;OAEG;YACW,WAAW;IA8BzB;;OAEG;YACW,kBAAkB;IAiDhC;;OAEG;YACW,WAAW;IAiCzB;;;OAGG;YACW,kBAAkB;IAiDhC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAuC7B;;OAEG;YACW,YAAY;IA2B1B;;OAEG;IACH,IAAI,OAAO,IAAI,aAAa,CAE3B;IAED;;OAEG;IACH,aAAa,IAAI,UAAU,GAAG,SAAS;IAIvC;;OAEG;IACH,YAAY,IAAI,aAAa,GAAG,SAAS;IAIzC;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,eAAe,CAAC;IAItC;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAUlC;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAc/B"}
1
+ {"version":3,"file":"switchbot.d.ts","sourceRoot":"","sources":["../src/switchbot.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACxD,OAAO,KAAK,EAAkB,gBAAgB,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAEnG,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAiB,UAAU,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AA4IjD;;GAEG;AACH,qBAAa,SAAU,SAAQ,YAAY;IACzC,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,UAAU,CAAC,CAAY;IAC/B,OAAO,CAAC,aAAa,CAAC,CAAe;IACrC,OAAO,CAAC,SAAS,CAAC,CAAe;IACjC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,WAAW,CAAQ;IAE3B,OAAO,CAAC,uBAAuB,CAAsB;gBAEzC,MAAM,GAAE,eAAoB;IAoCxC;;OAEG;IACH,OAAO,CAAC,UAAU;IAgDlB;;;OAGG;IACG,QAAQ,CAAC,OAAO,GAAE,gBAAqB,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAwD1E;;OAEG;YACW,WAAW;IA8BzB;;OAEG;YACW,kBAAkB;IAiDhC;;OAEG;YACW,WAAW;IAiCzB;;;OAGG;YACW,kBAAkB;IAmDhC;;;OAGG;IACH,OAAO,CAAC,qBAAqB;IAgC7B;;OAEG;YACW,YAAY;IA2B1B;;OAEG;IACH,IAAI,OAAO,IAAI,aAAa,CAE3B;IAED;;OAEG;IACH,aAAa,IAAI,UAAU,GAAG,SAAS;IAIvC;;OAEG;IACH,YAAY,IAAI,aAAa,GAAG,SAAS;IAIzC;;OAEG;IACH,SAAS,IAAI,QAAQ,CAAC,eAAe,CAAC;IAItC;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAUlC;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACH,cAAc,IAAI,OAAO;IAIzB;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAc/B"}
package/dist/switchbot.js CHANGED
@@ -393,9 +393,9 @@ export class SwitchBot extends EventEmitter {
393
393
  async handleAPIDiscovery(apiDevice) {
394
394
  const { deviceId, deviceName, deviceType, enableCloudService, hubDeviceId, version } = apiDevice;
395
395
  this.logger.debug(`Processing API device: ${deviceName} (${deviceId}, type: ${deviceType})`);
396
- // Try to find matching BLE device
397
- // Strategy: look for BLE devices of the same type that haven't been fully populated yet
398
- const matchedBLEDevice = this.findMatchingBLEDevice(deviceType, deviceName);
396
+ // A BLE device's id is its MAC without colons, which is also its OpenAPI deviceId, so match
397
+ // on id first. Only a BLE device with no MAC (macOS) falls back to matching by type.
398
+ const matchedBLEDevice = this.deviceManager.get(deviceId) ?? this.findMatchingBLEDevice(deviceType, deviceName);
399
399
  if (matchedBLEDevice) {
400
400
  // Update existing BLE device with API information
401
401
  const deviceId_internal = matchedBLEDevice.getId();
@@ -405,6 +405,8 @@ export class SwitchBot extends EventEmitter {
405
405
  hubDeviceId,
406
406
  version,
407
407
  cloudServiceEnabled: enableCloudService,
408
+ // API calls must use the OpenAPI deviceId when the device is known by a BLE peripheral id
409
+ ...(deviceId_internal !== deviceId ? { apiDeviceId: deviceId } : {}),
408
410
  });
409
411
  this.logger.info(`Matched API device to existing BLE device: ${deviceName} (${deviceId_internal})`);
410
412
  this.emit('device-updated', matchedBLEDevice);
@@ -439,36 +441,32 @@ export class SwitchBot extends EventEmitter {
439
441
  * Returns a BLE device if a good match is found
440
442
  */
441
443
  findMatchingBLEDevice(apiDeviceType, apiDeviceName) {
442
- // Get all BLE devices
444
+ // Only BLE-only devices without a MAC are candidates. A device with a MAC has the same id as
445
+ // its OpenAPI record, so if the id did not match, it is a different physical device.
443
446
  const bleDevices = this.deviceManager.list().filter((device) => {
444
447
  const info = device.getInfo();
445
- return info.connectionTypes.includes('ble') && !info.connectionTypes.includes('api');
448
+ return info.connectionTypes.includes('ble') && !info.connectionTypes.includes('api') && !device.getMAC();
446
449
  });
447
- // Try exact device type match first
448
- const typeMatches = bleDevices.filter(device => device.getDeviceType() === apiDeviceType);
450
+ // BLE and OpenAPI spell types differently ("Meter Plus" vs "MeterPlus"), so compare the
451
+ // device class each resolves to.
452
+ const apiClass = resolveDeviceClassName(apiDeviceType);
453
+ if (!apiClass) {
454
+ return undefined;
455
+ }
456
+ const typeMatches = bleDevices.filter(device => resolveDeviceClassName(device.getDeviceType()) === apiClass);
449
457
  if (typeMatches.length === 1) {
450
- // If only one device of this type, it's likely a match
451
- this.logger.debug(`Found exact type match for ${apiDeviceType}`);
458
+ this.logger.debug(`Found type match for ${apiDeviceType}`);
452
459
  return typeMatches[0];
453
460
  }
454
- if (typeMatches.length > 1) {
455
- // If multiple devices of same type, try to match by name similarity
456
- const nameMatch = typeMatches.find((device) => {
457
- const devName = device.getName();
458
- // Simple name comparison (could be enhanced)
459
- return devName === apiDeviceName || devName.includes(apiDeviceName) || apiDeviceName.includes(devName);
460
- });
461
- if (nameMatch) {
462
- this.logger.debug(`Found name match for ${apiDeviceName}`);
463
- return nameMatch;
464
- }
465
- // No good name match, return the first one as fallback for single device
466
- // (better to merge than to duplicate)
467
- if (typeMatches.length === 1) {
468
- return typeMatches[0];
469
- }
461
+ // Several candidates: only merge on a name match rather than guess.
462
+ const nameMatch = typeMatches.find((device) => {
463
+ const devName = device.getName();
464
+ return devName === apiDeviceName || devName.includes(apiDeviceName) || apiDeviceName.includes(devName);
465
+ });
466
+ if (nameMatch) {
467
+ this.logger.debug(`Found name match for ${apiDeviceName}`);
470
468
  }
471
- return undefined;
469
+ return nameMatch;
472
470
  }
473
471
  /**
474
472
  * Create device instance