Add Lock Ultra Support

Author: donavanbecker

src/device.ts

@@ -163,6 +163,7 @@ export enum SwitchBotModel {
   PlugMiniJP = 'W2001400/W2001401',
   Lock = 'W1601700',
   LockPro = 'W3500000',
+  LockUltra = 'W3600000',
   Keypad = 'W2500010',
   KeypadTouch = 'W2500020',
   K10 = 'K10+',
@@ -212,6 +213,7 @@ export enum SwitchBotBLEModel {
   PlugMiniJP = 'j', // Only available in Japan.
   Lock = 'o',
   LockPro = '$',
+  LockUltra = 'U',
   CeilingLight = 'q', // Currently only available in Japan.
   CeilingLightPro = 'n', // Currently only available in Japan.
   BlindTilt = 'x',
@@ -240,6 +242,7 @@ export enum SwitchBotBLEModelName {
   MeterProCO2 = 'WoSensorTHPc',
   Lock = 'WoSmartLock',
   LockPro = 'WoSmartLockPro',
+  LockUltra = 'WoSmartLockUltra',
   PresenceSensor = 'WoPresence',
   PlugMini = 'WoPlugMini',
   StripLight = 'WoStrip',
@@ -271,6 +274,7 @@ export enum SwitchBotBLEModelFriendlyName {
   Meter = 'Meter',
   Lock = 'Lock',
   LockPro = 'Lock Pro',
+  LockUltra = 'Lock Ultra',
   PlugMini = 'Plug Mini',
   StripLight = 'Strip Light',
   MeterPlus = 'Meter Plus',
@@ -1093,6 +1097,8 @@ export class Advertising {
         return WoSmartLock.parseServiceData(serviceData, manufacturerData, emitLog)
       case SwitchBotBLEModel.LockPro:
         return WoSmartLockPro.parseServiceData(serviceData, manufacturerData, emitLog)
+      case SwitchBotBLEModel.LockUltra:
+        return WoSmartLockUltra.parseServiceData(serviceData, manufacturerData, emitLog)
       case SwitchBotBLEModel.BlindTilt:
         return WoBlindTilt.parseServiceData(serviceData, manufacturerData, emitLog)
       case SwitchBotBLEModel.Leak:
@@ -3648,6 +3654,30 @@ export class WoSmartLockPro extends SwitchbotDevice {
   }
 }
 
+/**
+ * Class representing a WoSmartLockUltra device.
+ * Reuses the LockPro parsing and encrypted command behavior but reports a distinct model.
+ */
+export class WoSmartLockUltra extends WoSmartLockPro {
+  constructor(peripheral: NobleTypes['peripheral'], noble: NobleTypes['noble']) {
+    super(peripheral, noble)
+  }
+
+  static async parseServiceData(
+    serviceData: Buffer,
+    manufacturerData: Buffer,
+    emitLog: (level: string, message: string) => void,
+  ) {
+    const data = await WoSmartLockPro.parseServiceData(serviceData, manufacturerData, emitLog)
+    if (!data) return null
+    const out = data as any
+    out.model = SwitchBotBLEModel.LockUltra
+    out.modelName = SwitchBotBLEModelName.LockUltra
+    out.modelFriendlyName = SwitchBotBLEModelFriendlyName.LockUltra
+    return out
+  }
+}
+
 /**
  * Class representing a WoStrip device.
  * @see https://github.com/OpenWonderLabs/SwitchBotAPI-BLE/blob/latest/devicetypes/ledstriplight.md

src/settings.ts

@@ -73,3 +73,14 @@ export enum WoSmartLockCommands {
   ENABLE_NOTIFICATIONS = '570e01001e00008101',
   DISABLE_NOTIFICATIONS = '570e00',
 }
+
+// Lock Ultra uses the same command structure as Lock Pro (AES/IV based).
+export enum WoSmartLockUltraCommands {
+  GET_CKIV = '570f2103',
+  LOCK_INFO = '570f4f8102',
+  UNLOCK = '570f4e0101000080',
+  UNLOCK_NO_UNLATCH = '570f4e01010000a0',
+  LOCK = '570f4e0101000000',
+  ENABLE_NOTIFICATIONS = '570e01001e00008101',
+  DISABLE_NOTIFICATIONS = '570e00',
+}

src/switchbot-ble.ts

@@ -6,7 +6,7 @@ import type { ad, NobleTypes, onadvertisement, ondiscover, Params, Rule } from '
 
 import { EventEmitter } from 'node:events'
 
-import { Advertising, LogLevel, SwitchBotBLEModel, SwitchbotDevice, WoBlindTilt, WoBulb, WoCeilingLight, WoContact, WoCurtain, WoHand, WoHub2, WoHumi, WoHumi2, WoIOSensorTH, WoKeypad, WoLeak, WoPlugMiniJP, WoPlugMiniUS, WoPresence, WoRelaySwitch1, WoRelaySwitch1PM, WoRemote, WoSensorTH, WoSensorTHPlus, WoSensorTHPro, WoSensorTHProCO2, WoSmartLock, WoSmartLockPro, WoStrip } from './device.js'
+import { Advertising, LogLevel, SwitchBotBLEModel, SwitchbotDevice, WoBlindTilt, WoBulb, WoCeilingLight, WoContact, WoCurtain, WoHand, WoHub2, WoHumi, WoHumi2, WoIOSensorTH, WoKeypad, WoLeak, WoPlugMiniJP, WoPlugMiniUS, WoPresence, WoRelaySwitch1, WoRelaySwitch1PM, WoRemote, WoSensorTH, WoSensorTHPlus, WoSensorTHPro, WoSensorTHProCO2, WoSmartLock, WoSmartLockPro, WoSmartLockUltra, WoStrip } from './device.js'
 import { parameterChecker } from './parameter-checker.js'
 import { DEFAULT_DISCOVERY_DURATION, PRIMARY_SERVICE_UUID_LIST } from './settings.js'
 
@@ -232,6 +232,7 @@ export class SwitchBotBLE extends EventEmitter {
         case SwitchBotBLEModel.PlugMiniJP: return new WoPlugMiniJP(peripheral, this.noble)
         case SwitchBotBLEModel.Lock: return new WoSmartLock(peripheral, this.noble)
         case SwitchBotBLEModel.LockPro: return new WoSmartLockPro(peripheral, this.noble)
+        case (SwitchBotBLEModel.LockUltra as any): return new WoSmartLockUltra(peripheral, this.noble)
         case SwitchBotBLEModel.BlindTilt: return new WoBlindTilt(peripheral, this.noble)
         case SwitchBotBLEModel.Keypad: return new WoKeypad(peripheral, this.noble)
         case SwitchBotBLEModel.RelaySwitch1: return new WoRelaySwitch1(peripheral, this.noble)