@switchbot/homebridge-switchbot 5.0.0-beta.32 → 5.0.0-beta.34

package/dist/platform-hap.js

@@ -36,7 +36,7 @@ import { TV } from './irdevice/tv.js';
 import { VacuumCleaner } from './irdevice/vacuumcleaner.js';
 import { WaterHeater } from './irdevice/waterheater.js';
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
-import { ApiRequestTracker, cleanDeviceConfig, createPlatformLogger, formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, safeStringify, sleep } from './utils.js';
+import { ApiRequestTracker, cleanDeviceConfig, createPlatformLogger, formatDeviceIdAsMac, isBlindTiltDevice, isCurtainDevice, isSuccessfulStatusCode, logStatusCode, mergeByDeviceId, safeStringify, sleep } from './utils.js';
 /**
  * HomebridgePlatform
  * This class is the main constructor for your plugin, this is where you should
@@ -507,8 +507,12 @@ export class SwitchBotHAPPlatform {
             this.errorLog('Neither SwitchBot Token or Device Config are set.');
         }
     }
+    /**
+     * Check if an API status code indicates success
+     * @deprecated Use shared isSuccessfulStatusCode from utils.js instead
+     */
     isSuccessfulResponse(apiStatusCode) {
-        return (apiStatusCode === 200 || apiStatusCode === 100);
+        return isSuccessfulStatusCode(apiStatusCode);
     }
     async handleDevices(deviceLists) {
         if (!this.config.options?.devices && !this.config.options?.deviceConfig) {
@@ -593,12 +597,12 @@ export class SwitchBotHAPPlatform {
             }
         }
     }
+    /**
+     * Merge two arrays by deviceId
+     * @deprecated Use shared mergeByDeviceId from utils.js instead
+     */
     mergeByDeviceId(a1, a2) {
-        const normalizeDeviceId = (deviceId) => deviceId.toUpperCase().replace(/[^A-Z0-9]+/g, '');
-        return a1.map((itm) => {
-            const matchingItem = a2.find(item => normalizeDeviceId(item.deviceId) === normalizeDeviceId(itm.deviceId));
-            return { ...matchingItem, ...itm };
-        });
+        return mergeByDeviceId(a1, a2, false);
     }
     async handleErrorResponse(apiStatusCode, retryCount, maxRetries, delayBetweenRetries) {
         await this.statusCode(apiStatusCode);
@@ -2655,40 +2659,13 @@ export class SwitchBotHAPPlatform {
      *
      * @param statusCode - The status code returned by the device.
      * @returns A promise that resolves when the logging is complete.
+     * @deprecated Use shared logStatusCode from utils.js instead
      */
     async statusCode(statusCode) {
-        const messages = {
-            151: `Command not supported by this device type, statusCode: ${statusCode}, Submit Feature Request Here: 
-            https://tinyurl.com/SwitchBotFeatureRequest`,
-            152: `Device not found, statusCode: ${statusCode}`,
-            160: `Command is not supported, statusCode: ${statusCode}, Submit Bugs Here: https://tinyurl.com/SwitchBotBug`,
-            161: `Device is offline, statusCode: ${statusCode}`,
-            171: `is offline, statusCode: ${statusCode}`,
-            190: `Requests reached the daily limit, statusCode: ${statusCode}`,
-            100: `Command successfully sent, statusCode: ${statusCode}`,
-            200: `Request successful, statusCode: ${statusCode}`,
-            400: `Bad Request, The client has issued an invalid request. This is commonly used to specify validation errors in a request payload, 
-            statusCode: ${statusCode}`,
-            401: `Unauthorized, Authorization for the API is required, but the request has not been authenticated, statusCode: ${statusCode}`,
-            403: `Forbidden, The request has been authenticated but does not have appropriate permissions, or a requested resource is not found, 
-            statusCode: ${statusCode}`,
-            404: `Not Found, Specifies the requested path does not exist, statusCode: ${statusCode}`,
-            406: `Not Acceptable, The client has requested a MIME type via the Accept header for a value not supported by the server, 
-            statusCode: ${statusCode}`,
-            415: `Unsupported Media Type, The client has defined a contentType header that is not supported by the server, statusCode: ${statusCode}`,
-            422: `Unprocessable Entity, The client has made a valid request, but the server cannot process it. This is often used for APIs for which 
-            certain limits have been exceeded, statusCode: ${statusCode}`,
-            429: `Too Many Requests, The client has exceeded the number of requests allowed for a given time window, statusCode: ${statusCode}`,
-            500: `Internal Server Error, An unexpected error on the SmartThings servers has occurred. These errors should be rare, 
-            statusCode: ${statusCode}`,
-        };
-        const message = messages[statusCode] ?? `Unknown statusCode, statusCode: ${statusCode}, Submit Bugs Here: https://tinyurl.com/SwitchBotBug`;
-        if ([100, 200].includes(statusCode)) {
-            this.debugLog(message);
-        }
-        else {
-            this.errorLog(message);
-        }
+        await logStatusCode(statusCode, {
+            debugLog: this.debugLog.bind(this),
+            errorLog: this.errorLog.bind(this),
+        });
     }
     async retryRequest(device, deviceMaxRetries, deviceDelayBetweenRetries) {
         let retryCount = 0;