Skip to content

Commit

Permalink
more changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@donavanbecker
donavanbecker committed Sep 30, 2024
1 parent 8b6f906 commit 53c557e
Show file tree
Hide file tree
Showing 32 changed files with 314 additions and 352 deletions.
8 changes: 4 additions & 4 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"async-mqtt": "^2.6.3",
"fakegato-history": "^0.6.5",
"homebridge-lib": "^7.0.8",
"node-switchbot": "2.5.0-beta.22",
"node-switchbot": "2.5.0-beta.23",
"rxjs": "^7.8.1"
},
"devDependencies": {
Expand Down
25 changes: 12 additions & 13 deletions src/device/blindtilt.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,17 +504,17 @@ export class BlindTilt extends deviceBase {
async openAPIRefreshStatus(): Promise<void> {
await this.debugLog('openAPIRefreshStatus')
try {
const { body, statusCode } = await this.deviceRefreshStatus()
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.deviceRefreshStatus()
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
this.deviceStatus = deviceStatus.body
await this.openAPIparseStatus()
await this.updateHomeKitCharacteristics()
} else {
await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(statusCode, deviceStatus)
await this.debugWarnLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(deviceStatus)
}
} catch (e: any) {
await this.apiError(e)
Expand Down Expand Up @@ -636,14 +636,13 @@ export class BlindTilt extends deviceBase {
}
await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand Down
25 changes: 12 additions & 13 deletions src/device/bot.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,17 +598,17 @@ export class Bot extends deviceBase {
async openAPIRefreshStatus(): Promise<void> {
await this.debugLog('openAPIRefreshStatus')
try {
const { body, statusCode } = await this.deviceRefreshStatus()
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.deviceRefreshStatus()
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
this.deviceStatus = deviceStatus.body
await this.openAPIparseStatus()
await this.updateHomeKitCharacteristics()
} else {
await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(statusCode, deviceStatus)
await this.debugWarnLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(deviceStatus)
}
} catch (e: any) {
await this.apiError(e)
Expand Down Expand Up @@ -753,14 +753,13 @@ export class Bot extends deviceBase {
}
this.debugLog(`Sending request to SwitchBot API, body: ${JSON.stringify(bodyChange)},`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
if (this.device.bot?.mode === 'multipress') {
Expand Down
58 changes: 27 additions & 31 deletions src/device/ceilinglight.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,17 +332,17 @@ export class CeilingLight extends deviceBase {
async openAPIRefreshStatus(): Promise<void> {
await this.debugLog('openAPIRefreshStatus')
try {
const { body, statusCode } = await this.deviceRefreshStatus()
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.deviceRefreshStatus()
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
this.deviceStatus = deviceStatus.body
await this.openAPIparseStatus()
await this.updateHomeKitCharacteristics()
} else {
await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(statusCode, deviceStatus)
await this.debugWarnLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(deviceStatus)
}
} catch (e: any) {
await this.apiError(e)
Expand Down Expand Up @@ -470,14 +470,13 @@ export class CeilingLight extends deviceBase {
}
await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand All @@ -503,14 +502,13 @@ export class CeilingLight extends deviceBase {
}
await this.debugLog(`(pushHueSaturationChanges) SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`(pushHueSaturationChanges) statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`(pushHueSaturationChanges) statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`(pushHueSaturationChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`(pushHueSaturationChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand All @@ -534,14 +532,13 @@ export class CeilingLight extends deviceBase {
}
await this.debugLog(`(pushColorTemperatureChanges) SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`(pushColorTemperatureChanges) statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`(pushColorTemperatureChanges) statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`(pushColorTemperatureChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`(pushColorTemperatureChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand All @@ -563,14 +560,13 @@ export class CeilingLight extends deviceBase {
}
await this.debugLog(`(pushBrightnessChanges) SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`(pushBrightnessChanges) statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`(pushBrightnessChanges) statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`(pushBrightnessChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`(pushBrightnessChanges) statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand Down
58 changes: 27 additions & 31 deletions src/device/colorbulb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,17 +355,17 @@ export class ColorBulb extends deviceBase {
async openAPIRefreshStatus(): Promise<void> {
await this.debugLog('openAPIRefreshStatus')
try {
const { body, statusCode } = await this.deviceRefreshStatus()
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.deviceRefreshStatus()
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
this.deviceStatus = deviceStatus.body
await this.openAPIparseStatus()
await this.updateHomeKitCharacteristics()
} else {
await this.debugWarnLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(statusCode, deviceStatus)
await this.debugWarnLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.debugWarnLog(deviceStatus)
}
} catch (e: any) {
await this.apiError(e)
Expand Down Expand Up @@ -618,14 +618,13 @@ export class ColorBulb extends deviceBase {
}
await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand All @@ -650,14 +649,13 @@ export class ColorBulb extends deviceBase {
}
await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand All @@ -681,14 +679,13 @@ export class ColorBulb extends deviceBase {
}
await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand All @@ -710,14 +707,13 @@ export class ColorBulb extends deviceBase {
}
await this.debugLog(`SwitchBot OpenAPI bodyChange: ${JSON.stringify(bodyChange)}`)
try {
const { body, statusCode } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body.json()
await this.debugLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(statusCode, deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
const { body } = await this.pushChangeRequest(bodyChange)
const deviceStatus: any = await body
await this.debugLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
if (await this.successfulStatusCodes(deviceStatus)) {
await this.debugSuccessLog(`statusCode: ${deviceStatus.statusCode}, deviceStatus: ${JSON.stringify(deviceStatus)}`)
await this.updateHomeKitCharacteristics()
} else {
await this.statusCode(statusCode)
await this.statusCode(deviceStatus.statusCode)
}
} catch (e: any) {
Expand Down
Loading

0 comments on commit 53c557e

Please sign in to comment.