Skip to content

Commit cfbcfec

Browse files
Copilotdonavanbecker
Copilot
and
donavanbecker
committed
Fix: OpenAPI statusCode becomes undefined causing device status not to update
All device files incorrectly used `response.body` when assigning to deviceStatus, discarding the statusCode. The successfulStatusCodes() check then always received undefined, preventing updateCharacteristic from being called. Fixed by changing `const deviceStatus: any = response.body` to `const deviceStatus: any = response` in all 31 affected device and irdevice files. Co-authored-by: donavanbecker <9875439+donavanbecker@users.noreply.github.com>
1 parent 8031013 commit cfbcfec

31 files changed

+56
-56
lines changed

‎src/device/airpurifier.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ export class AirPurifier extends deviceBase {
368368
this.debugLog('openAPIRefreshStatus')
369369
try {
370370
const response = await this.deviceRefreshStatus()
371-
const deviceStatus: any = response.body
371+
const deviceStatus: any = response
372372
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
373373
if (await this.successfulStatusCodes(deviceStatus)) {
374374
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -487,7 +487,7 @@ export class AirPurifier extends deviceBase {
487487
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
488488
try {
489489
const response = await this.pushChangeRequest(bodyChange)
490-
const deviceStatus: any = response.body
490+
const deviceStatus: any = response
491491
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
492492
if (await this.successfulStatusCodes(deviceStatus)) {
493493
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/blindtilt.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ export class BlindTilt extends deviceBase {
515515
this.debugLog('openAPIRefreshStatus')
516516
try {
517517
const response = await this.deviceRefreshStatus()
518-
const deviceStatus: any = response.body
518+
const deviceStatus: any = response
519519
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
520520
if (await this.successfulStatusCodes(deviceStatus)) {
521521
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -651,7 +651,7 @@ export class BlindTilt extends deviceBase {
651651
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
652652
try {
653653
const response = await this.pushChangeRequest(bodyChange)
654-
const deviceStatus: any = response.body
654+
const deviceStatus: any = response
655655
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
656656
if (await this.successfulStatusCodes(deviceStatus)) {
657657
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/bot.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ export class Bot extends deviceBase {
431431
this.debugLog('openAPIRefreshStatus')
432432
try {
433433
const response = await this.deviceRefreshStatus()
434-
const deviceStatus: any = response.body
434+
const deviceStatus: any = response
435435
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
436436
if (await this.successfulStatusCodes(deviceStatus)) {
437437
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -596,7 +596,7 @@ export class Bot extends deviceBase {
596596
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
597597
try {
598598
const response = await this.pushChangeRequest(bodyChange)
599-
const deviceStatus: any = response.body
599+
const deviceStatus: any = response
600600
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
601601
if (await this.successfulStatusCodes(deviceStatus)) {
602602
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/ceilinglight.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export class CeilingLight extends deviceBase {
341341
this.debugLog('openAPIRefreshStatus')
342342
try {
343343
const response = await this.deviceRefreshStatus()
344-
const deviceStatus: any = response.body
344+
const deviceStatus: any = response
345345
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
346346
if (await this.successfulStatusCodes(deviceStatus)) {
347347
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -483,7 +483,7 @@ export class CeilingLight extends deviceBase {
483483
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
484484
try {
485485
const response = await this.pushChangeRequest(bodyChange)
486-
const deviceStatus: any = response.body
486+
const deviceStatus: any = response
487487
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
488488
if (await this.successfulStatusCodes(deviceStatus)) {
489489
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -515,7 +515,7 @@ export class CeilingLight extends deviceBase {
515515
this.debugLog(`(pushHueSaturationChanges) SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
516516
try {
517517
const response = await this.pushChangeRequest(bodyChange)
518-
const deviceStatus: any = response.body
518+
const deviceStatus: any = response
519519
this.debugLog(`(pushHueSaturationChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
520520
if (await this.successfulStatusCodes(deviceStatus)) {
521521
this.debugSuccessLog(`(pushHueSaturationChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -545,7 +545,7 @@ export class CeilingLight extends deviceBase {
545545
this.debugLog(`(pushColorTemperatureChanges) SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
546546
try {
547547
const response = await this.pushChangeRequest(bodyChange)
548-
const deviceStatus: any = response.body
548+
const deviceStatus: any = response
549549
this.debugLog(`(pushColorTemperatureChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
550550
if (await this.successfulStatusCodes(deviceStatus)) {
551551
this.debugSuccessLog(`(pushColorTemperatureChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -573,7 +573,7 @@ export class CeilingLight extends deviceBase {
573573
this.debugLog(`(pushBrightnessChanges) SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
574574
try {
575575
const response = await this.pushChangeRequest(bodyChange)
576-
const deviceStatus: any = response.body
576+
const deviceStatus: any = response
577577
this.debugLog(`(pushBrightnessChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
578578
if (await this.successfulStatusCodes(deviceStatus)) {
579579
this.debugSuccessLog(`(pushBrightnessChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/colorbulb.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export class ColorBulb extends deviceBase {
376376
this.debugLog('openAPIRefreshStatus')
377377
try {
378378
const response = await this.deviceRefreshStatus()
379-
const deviceStatus: any = response.body
379+
const deviceStatus: any = response
380380
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
381381
if (await this.successfulStatusCodes(deviceStatus)) {
382382
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -645,7 +645,7 @@ export class ColorBulb extends deviceBase {
645645
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
646646
try {
647647
const response = await this.pushChangeRequest(bodyChange)
648-
const deviceStatus: any = response.body
648+
const deviceStatus: any = response
649649
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
650650
if (await this.successfulStatusCodes(deviceStatus)) {
651651
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -676,7 +676,7 @@ export class ColorBulb extends deviceBase {
676676
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
677677
try {
678678
const response = await this.pushChangeRequest(bodyChange)
679-
const deviceStatus: any = response.body
679+
const deviceStatus: any = response
680680
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
681681
if (await this.successfulStatusCodes(deviceStatus)) {
682682
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -706,7 +706,7 @@ export class ColorBulb extends deviceBase {
706706
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
707707
try {
708708
const response = await this.pushChangeRequest(bodyChange)
709-
const deviceStatus: any = response.body
709+
const deviceStatus: any = response
710710
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
711711
if (await this.successfulStatusCodes(deviceStatus)) {
712712
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -734,7 +734,7 @@ export class ColorBulb extends deviceBase {
734734
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
735735
try {
736736
const response = await this.pushChangeRequest(bodyChange)
737-
const deviceStatus: any = response.body
737+
const deviceStatus: any = response
738738
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
739739
if (await this.successfulStatusCodes(deviceStatus)) {
740740
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/contact.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ export class Contact extends deviceBase {
357357
this.debugLog('openAPIRefreshStatus')
358358
try {
359359
const response = await this.deviceRefreshStatus()
360-
const deviceStatus: any = response.body
360+
const deviceStatus: any = response
361361
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
362362
if (await this.successfulStatusCodes(deviceStatus)) {
363363
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/curtain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ export class Curtain extends deviceBase {
672672
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
673673
try {
674674
const response = await this.pushChangeRequest(bodyChange)
675-
const deviceStatus: any = response.body
675+
const deviceStatus: any = response
676676
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
677677
if (await this.successfulStatusCodes(deviceStatus)) {
678678
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/fan.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export class Fan extends deviceBase {
379379
this.debugLog('openAPIRefreshStatus')
380380
try {
381381
const response = await this.deviceRefreshStatus()
382-
const deviceStatus: any = response.body
382+
const deviceStatus: any = response
383383
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
384384
if (await this.successfulStatusCodes(deviceStatus)) {
385385
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -515,7 +515,7 @@ export class Fan extends deviceBase {
515515
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
516516
try {
517517
const response = await this.pushChangeRequest(bodyChange)
518-
const deviceStatus: any = response.body
518+
const deviceStatus: any = response
519519
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
520520
if (await this.successfulStatusCodes(deviceStatus)) {
521521
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -543,7 +543,7 @@ export class Fan extends deviceBase {
543543
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
544544
try {
545545
const response = await this.pushChangeRequest(bodyChange)
546-
const deviceStatus: any = response.body
546+
const deviceStatus: any = response
547547
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
548548
if (await this.successfulStatusCodes(deviceStatus)) {
549549
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -572,7 +572,7 @@ export class Fan extends deviceBase {
572572
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
573573
try {
574574
const response = await this.pushChangeRequest(bodyChange)
575-
const deviceStatus: any = response.body
575+
const deviceStatus: any = response
576576
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
577577
if (await this.successfulStatusCodes(deviceStatus)) {
578578
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/hub.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ export class Hub extends deviceBase {
374374
this.debugLog('openAPIRefreshStatus')
375375
try {
376376
const response = await this.deviceRefreshStatus()
377-
const deviceStatus: any = response.body
377+
const deviceStatus: any = response
378378
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
379379
if (await this.successfulStatusCodes(deviceStatus)) {
380380
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

‎src/device/humidifier.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export class Humidifier extends deviceBase {
376376
this.debugLog('openAPIRefreshStatus')
377377
try {
378378
const response = await this.deviceRefreshStatus()
379-
const deviceStatus: any = response.body
379+
const deviceStatus: any = response
380380
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
381381
if (await this.successfulStatusCodes(deviceStatus)) {
382382
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -486,7 +486,7 @@ export class Humidifier extends deviceBase {
486486
this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
487487
try {
488488
const response = await this.pushChangeRequest(bodyChange)
489-
const deviceStatus: any = response.body
489+
const deviceStatus: any = response
490490
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
491491
if (await this.successfulStatusCodes(deviceStatus)) {
492492
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -520,7 +520,7 @@ export class Humidifier extends deviceBase {
520520
this.debugLog(`pushAutoChanges, SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
521521
try {
522522
const response = await this.pushChangeRequest(bodyChange)
523-
const deviceStatus: any = response.body
523+
const deviceStatus: any = response
524524
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
525525
if (await this.successfulStatusCodes(deviceStatus)) {
526526
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
@@ -552,7 +552,7 @@ export class Humidifier extends deviceBase {
552552
this.debugLog(`pushActiveChanges, SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
553553
try {
554554
const response = await this.pushChangeRequest(bodyChange)
555-
const deviceStatus: any = response.body
555+
const deviceStatus: any = response
556556
this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
557557
if (await this.successfulStatusCodes(deviceStatus)) {
558558
this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)

0 commit comments

Comments
 (0)