expo-flic2 0.2.3 → 0.3.0

package/android/build.gradle

@@ -4,14 +4,14 @@ plugins {
 }
 
 group = 'expo.modules.flic2'
-version = '0.2.3'
+version = '0.3.0'
 
 android {
   namespace "expo.modules.flic2"
 
   defaultConfig {
     versionCode 1
-    versionName "0.2.3"
+    versionName "0.3.0"
     minSdkVersion 24
   }
 

package/android/src/main/java/expo/modules/flic2/ExpoFlic2Module.kt

@@ -9,11 +9,13 @@ import io.flic.flic2libandroid.Flic2ButtonListener
 import io.flic.flic2libandroid.Flic2Manager
 import io.flic.flic2libandroid.Flic2ScanCallback
 import io.flic.flic2libandroid.BatteryLevel
+import java.util.concurrent.ConcurrentHashMap
 
 class ExpoFlic2Module : Module() {
 
   private var manager: Flic2Manager? = null
-  private val triggerModes = mutableMapOf<String, String>()
+  private val triggerModes = ConcurrentHashMap<String, String>()
+  private val buttonListeners = mutableMapOf<String, Flic2ButtonListener>()
 
   override fun definition() = ModuleDefinition {
     Name("ExpoFlic2")
@@ -29,11 +31,19 @@ class ExpoFlic2Module : Module() {
       "onFlic2ManagerState"
     )
 
+    OnDestroy {
+      manager?.getButtons()?.forEach { button ->
+        buttonListeners[button.uuid]?.let { button.removeListener(it) }
+      }
+      buttonListeners.clear()
+      triggerModes.clear()
+    }
+
     Function("initialize") {
       val context = appContext.reactContext ?: return@Function null
       manager = Flic2Manager.initAndGetInstance(context, Handler(Looper.getMainLooper()))
       manager?.getButtons()?.forEach { button ->
-        button.addListener(createButtonListener())
+        attachListener(button)
       }
       null
     }
@@ -59,7 +69,7 @@ class ExpoFlic2Module : Module() {
 
         override fun onComplete(result: Int, subCode: Int, button: Flic2Button?) {
           if (button != null) {
-            button.addListener(createButtonListener())
+            attachListener(button)
             sendEvent("onFlic2Scan", mapOf(
               "isScanning" to false,
               "button" to button.toRecord(triggerModes[button.uuid] ?: "clickAndDoubleClickAndHold")
@@ -93,6 +103,8 @@ class ExpoFlic2Module : Module() {
     Function("forgetButton") { uuid: String ->
       val button = findButton(uuid)
       if (button != null) {
+        buttonListeners.remove(uuid)?.let { button.removeListener(it) }
+        triggerModes.remove(uuid)
         manager?.forgetButton(button)
       }
     }
@@ -106,8 +118,34 @@ class ExpoFlic2Module : Module() {
     return manager?.getButtons()?.find { it.uuid == uuid }
   }
 
+  private fun attachListener(button: Flic2Button) {
+    buttonListeners[button.uuid]?.let { button.removeListener(it) }
+    val listener = createButtonListener()
+    buttonListeners[button.uuid] = listener
+    button.addListener(listener)
+  }
+
   private fun createButtonListener(): Flic2ButtonListener {
     return object : Flic2ButtonListener() {
+      override fun onButtonClickOrHold(
+        button: Flic2Button,
+        wasQueued: Boolean,
+        lastQueued: Boolean,
+        timestamp: Long,
+        isClick: Boolean,
+        isHold: Boolean
+      ) {
+        val mode = triggerModes[button.uuid] ?: "clickAndDoubleClickAndHold"
+        if (mode != "click" && mode != "clickAndHold") return
+        val ageSeconds = (System.currentTimeMillis() - timestamp) / 1000
+        if (isClick) {
+          sendEvent("onFlic2Click", mapOf("uuid" to button.uuid, "queued" to wasQueued, "age" to ageSeconds))
+        }
+        if (isHold && mode == "clickAndHold") {
+          sendEvent("onFlic2Hold", mapOf("uuid" to button.uuid, "queued" to wasQueued, "age" to ageSeconds))
+        }
+      }
+
       override fun onButtonSingleOrDoubleClickOrHold(
         button: Flic2Button,
         wasQueued: Boolean,
@@ -117,11 +155,12 @@ class ExpoFlic2Module : Module() {
         isDoubleClick: Boolean,
         isHold: Boolean
       ) {
-        val ageSeconds = (System.currentTimeMillis() - timestamp) / 1000
         val mode = triggerModes[button.uuid] ?: "clickAndDoubleClickAndHold"
+        if (mode == "click" || mode == "clickAndHold") return
+        val ageSeconds = (System.currentTimeMillis() - timestamp) / 1000
         val emitClick = isSingleClick && mode != "clickAndDoubleClick"
-        val emitDoubleClick = isDoubleClick && mode != "click" && mode != "clickAndHold"
-        val emitHold = isHold && mode != "click" && mode != "clickAndDoubleClick"
+        val emitDoubleClick = isDoubleClick
+        val emitHold = isHold && mode != "clickAndDoubleClick"
         if (emitClick) {
           sendEvent("onFlic2Click", mapOf(
             "uuid" to button.uuid,

package/build/ExpoFlic2.types.d.ts

@@ -2,7 +2,8 @@ export declare enum Flic2ConnectionState {
     Disconnected = "disconnected",
     Connecting = "connecting",
     Connected = "connected",
-    Ready = "ready"
+    Ready = "ready",
+    Unpaired = "unpaired"
 }
 export declare enum Flic2TriggerMode {
     Click = "click",

package/build/ExpoFlic2.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoFlic2.types.d.ts","sourceRoot":"","sources":["../src/ExpoFlic2.types.ts"],"names":[],"mappings":"AAAA,oBAAY,oBAAoB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,SAAS,cAAc;IACvB,KAAK,UAAU;CAChB;AAED,oBAAY,gBAAgB;IAC1B,KAAK,UAAU;IACf,YAAY,iBAAiB;IAC7B,mBAAmB,wBAAwB;IAC3C,0BAA0B,+BAA+B;CAC1D;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,oBAAoB,CAAC;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,oBAAoB,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iGAAiG;IACjG,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,WAAW,GAAG,YAAY,GAAG,WAAW,GAAG,aAAa,GAAG,cAAc,GAAG,SAAS,CAAC;CAC9F,CAAC"}
+{"version":3,"file":"ExpoFlic2.types.d.ts","sourceRoot":"","sources":["../src/ExpoFlic2.types.ts"],"names":[],"mappings":"AAAA,oBAAY,oBAAoB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AAED,oBAAY,gBAAgB;IAC1B,KAAK,UAAU;IACf,YAAY,iBAAiB;IAC7B,mBAAmB,wBAAwB;IAC3C,0BAA0B,+BAA+B;CAC1D;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,oBAAoB,CAAC;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,oBAAoB,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iGAAiG;IACjG,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,WAAW,GAAG,YAAY,GAAG,WAAW,GAAG,aAAa,GAAG,cAAc,GAAG,SAAS,CAAC;CAC9F,CAAC"}

package/build/ExpoFlic2.types.js

@@ -4,6 +4,7 @@ export var Flic2ConnectionState;
     Flic2ConnectionState["Connecting"] = "connecting";
     Flic2ConnectionState["Connected"] = "connected";
     Flic2ConnectionState["Ready"] = "ready";
+    Flic2ConnectionState["Unpaired"] = "unpaired";
 })(Flic2ConnectionState || (Flic2ConnectionState = {}));
 export var Flic2TriggerMode;
 (function (Flic2TriggerMode) {

package/build/ExpoFlic2.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoFlic2.types.js","sourceRoot":"","sources":["../src/ExpoFlic2.types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,oBAKX;AALD,WAAY,oBAAoB;IAC9B,qDAA6B,CAAA;IAC7B,iDAAyB,CAAA;IACzB,+CAAuB,CAAA;IACvB,uCAAe,CAAA;AACjB,CAAC,EALW,oBAAoB,KAApB,oBAAoB,QAK/B;AAED,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,mCAAe,CAAA;IACf,iDAA6B,CAAA;IAC7B,+DAA2C,CAAA;IAC3C,6EAAyD,CAAA;AAC3D,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B","sourcesContent":["export enum Flic2ConnectionState {\n  Disconnected = \"disconnected\",\n  Connecting = \"connecting\",\n  Connected = \"connected\",\n  Ready = \"ready\",\n}\n\nexport enum Flic2TriggerMode {\n  Click = \"click\",\n  ClickAndHold = \"clickAndHold\",\n  ClickAndDoubleClick = \"clickAndDoubleClick\",\n  ClickAndDoubleClickAndHold = \"clickAndDoubleClickAndHold\",\n}\n\nexport type Flic2Button = {\n  uuid: string;\n  bluetoothAddress: string;\n  serialNumber: string;\n  name: string;\n  connectionState: Flic2ConnectionState;\n  firmwareVersion: number;\n  batteryLevel: number;\n  pressCount: number;\n  triggerMode: Flic2TriggerMode;\n  isReady: boolean;\n};\n\nexport type Flic2ClickEvent = {\n  uuid: string;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2DoubleClickEvent = {\n  uuid: string;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2HoldEvent = {\n  uuid: string;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2UpOrDownEvent = {\n  uuid: string;\n  isDown: boolean;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2ConnectionEvent = {\n  uuid: string;\n  state: Flic2ConnectionState;\n  error?: string;\n};\n\nexport type Flic2ScanEvent = {\n  isScanning: boolean;\n  button?: Flic2Button;\n  error?: string;\n  /** iOS only: scanner status during scan (discovered, connected, verified, verificationFailed) */\n  scanEvent?: string;\n};\n\nexport type Flic2BatteryEvent = {\n  uuid: string;\n  level: number;\n};\n\nexport type Flic2ManagerStateEvent = {\n  state: \"poweredOn\" | \"poweredOff\" | \"resetting\" | \"unsupported\" | \"unauthorized\" | \"unknown\";\n};\n"]}
+{"version":3,"file":"ExpoFlic2.types.js","sourceRoot":"","sources":["../src/ExpoFlic2.types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAC9B,qDAA6B,CAAA;IAC7B,iDAAyB,CAAA;IACzB,+CAAuB,CAAA;IACvB,uCAAe,CAAA;IACf,6CAAqB,CAAA;AACvB,CAAC,EANW,oBAAoB,KAApB,oBAAoB,QAM/B;AAED,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,mCAAe,CAAA;IACf,iDAA6B,CAAA;IAC7B,+DAA2C,CAAA;IAC3C,6EAAyD,CAAA;AAC3D,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B","sourcesContent":["export enum Flic2ConnectionState {\n  Disconnected = \"disconnected\",\n  Connecting = \"connecting\",\n  Connected = \"connected\",\n  Ready = \"ready\",\n  Unpaired = \"unpaired\",\n}\n\nexport enum Flic2TriggerMode {\n  Click = \"click\",\n  ClickAndHold = \"clickAndHold\",\n  ClickAndDoubleClick = \"clickAndDoubleClick\",\n  ClickAndDoubleClickAndHold = \"clickAndDoubleClickAndHold\",\n}\n\nexport type Flic2Button = {\n  uuid: string;\n  bluetoothAddress: string;\n  serialNumber: string;\n  name: string;\n  connectionState: Flic2ConnectionState;\n  firmwareVersion: number;\n  batteryLevel: number;\n  pressCount: number;\n  triggerMode: Flic2TriggerMode;\n  isReady: boolean;\n};\n\nexport type Flic2ClickEvent = {\n  uuid: string;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2DoubleClickEvent = {\n  uuid: string;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2HoldEvent = {\n  uuid: string;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2UpOrDownEvent = {\n  uuid: string;\n  isDown: boolean;\n  queued: boolean;\n  age: number;\n};\n\nexport type Flic2ConnectionEvent = {\n  uuid: string;\n  state: Flic2ConnectionState;\n  error?: string;\n};\n\nexport type Flic2ScanEvent = {\n  isScanning: boolean;\n  button?: Flic2Button;\n  error?: string;\n  /** iOS only: scanner status during scan (discovered, connected, verified, verificationFailed) */\n  scanEvent?: string;\n};\n\nexport type Flic2BatteryEvent = {\n  uuid: string;\n  level: number;\n};\n\nexport type Flic2ManagerStateEvent = {\n  state: \"poweredOn\" | \"poweredOff\" | \"resetting\" | \"unsupported\" | \"unauthorized\" | \"unknown\";\n};\n"]}

package/build/index.d.ts

@@ -16,5 +16,9 @@ export declare function addOnUpOrDownListener(listener: (event: Flic2UpOrDownEve
 export declare function addOnConnectionListener(listener: (event: Flic2ConnectionEvent) => void): EventSubscription;
 export declare function addOnScanListener(listener: (event: Flic2ScanEvent) => void): EventSubscription;
 export declare function addOnBatteryListener(listener: (event: Flic2BatteryEvent) => void): EventSubscription;
+/**
+ * iOS only. The Android Flic2 SDK does not provide a Bluetooth manager state
+ * callback, so this listener will never fire on Android.
+ */
 export declare function addOnManagerStateListener(listener: (event: Flic2ManagerStateEvent) => void): EventSubscription;
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EACL,gBAAgB,EAChB,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC5B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,mBAAmB,CAAC;AAE3B,wBAAgB,UAAU,IAAI,IAAI,CAEjC;AAED,wBAAgB,SAAS,IAAI,IAAI,CAEhC;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAE/B;AAED,wBAAgB,UAAU,IAAI,WAAW,EAAE,CAE1C;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEhD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAE/C;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB,GACrB,IAAI,CAEN;AAID,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GACzC,iBAAiB,CAEnB;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,GAC/C,iBAAiB,CAEnB;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACxC,iBAAiB,CAEnB;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,iBAAiB,CAEnB;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAC9C,iBAAiB,CAEnB;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACxC,iBAAiB,CAEnB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,GAC3C,iBAAiB,CAEnB;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,GAChD,iBAAiB,CAEnB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EACL,gBAAgB,EAChB,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,EAC5B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,sBAAsB,GAC5B,MAAM,mBAAmB,CAAC;AAE3B,wBAAgB,UAAU,IAAI,IAAI,CAEjC;AAED,wBAAgB,SAAS,IAAI,IAAI,CAEhC;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAE/B;AAED,wBAAgB,UAAU,IAAI,WAAW,EAAE,CAE1C;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEhD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEnD;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAE/C;AAED,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,gBAAgB,GACrB,IAAI,CAEN;AAID,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GACzC,iBAAiB,CAEnB;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,GAC/C,iBAAiB,CAEnB;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACxC,iBAAiB,CAEnB;AAED,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,iBAAiB,CAEnB;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAC9C,iBAAiB,CAEnB;AAED,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,GACxC,iBAAiB,CAEnB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,GAC3C,iBAAiB,CAEnB;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,CAAC,KAAK,EAAE,sBAAsB,KAAK,IAAI,GAChD,iBAAiB,CAEnB"}

package/build/index.js

@@ -46,6 +46,10 @@ export function addOnScanListener(listener) {
 export function addOnBatteryListener(listener) {
     return ExpoFlic2.addListener("onFlic2Battery", listener);
 }
+/**
+ * iOS only. The Android Flic2 SDK does not provide a Bluetooth manager state
+ * callback, so this listener will never fire on Android.
+ */
 export function addOnManagerStateListener(listener) {
     return ExpoFlic2.addListener("onFlic2ManagerState", listener);
 }

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAc1C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,GAUjB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,UAAU,UAAU;IACxB,SAAS,CAAC,UAAU,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,SAAS,CAAC,SAAS,EAAE,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,SAAS,CAAC,QAAQ,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAAY,EACZ,IAAsB;IAEtB,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC;AAED,wBAAwB;AAExB,MAAM,UAAU,kBAAkB,CAChC,QAA0C;IAE1C,OAAO,SAAS,CAAC,WAAW,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAgD;IAEhD,OAAO,SAAS,CAAC,WAAW,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,QAAyC;IAEzC,OAAO,SAAS,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,QAA6C;IAE7C,OAAO,SAAS,CAAC,WAAW,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,QAA+C;IAE/C,OAAO,SAAS,CAAC,WAAW,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,QAAyC;IAEzC,OAAO,SAAS,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,QAA4C;IAE5C,OAAO,SAAS,CAAC,WAAW,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,QAAiD;IAEjD,OAAO,SAAS,CAAC,WAAW,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;AAChE,CAAC","sourcesContent":["import { EventSubscription } from \"expo-modules-core\";\nimport ExpoFlic2 from \"./ExpoFlic2Module\";\nimport {\n  Flic2TriggerMode,\n  type Flic2Button,\n  type Flic2ClickEvent,\n  type Flic2DoubleClickEvent,\n  type Flic2HoldEvent,\n  type Flic2UpOrDownEvent,\n  type Flic2ConnectionEvent,\n  type Flic2ScanEvent,\n  type Flic2BatteryEvent,\n  type Flic2ManagerStateEvent,\n} from \"./ExpoFlic2.types\";\n\nexport {\n  Flic2ConnectionState,\n  Flic2TriggerMode,\n  type Flic2Button,\n  type Flic2ClickEvent,\n  type Flic2DoubleClickEvent,\n  type Flic2HoldEvent,\n  type Flic2UpOrDownEvent,\n  type Flic2ConnectionEvent,\n  type Flic2ScanEvent,\n  type Flic2BatteryEvent,\n  type Flic2ManagerStateEvent,\n} from \"./ExpoFlic2.types\";\n\nexport function initialize(): void {\n  ExpoFlic2.initialize();\n}\n\nexport function startScan(): void {\n  ExpoFlic2.startScan();\n}\n\nexport function stopScan(): void {\n  ExpoFlic2.stopScan();\n}\n\nexport function getButtons(): Flic2Button[] {\n  return ExpoFlic2.getButtons();\n}\n\nexport function connectButton(uuid: string): void {\n  ExpoFlic2.connectButton(uuid);\n}\n\nexport function disconnectButton(uuid: string): void {\n  ExpoFlic2.disconnectButton(uuid);\n}\n\nexport function forgetButton(uuid: string): void {\n  ExpoFlic2.forgetButton(uuid);\n}\n\nexport function setButtonTriggerMode(\n  uuid: string,\n  mode: Flic2TriggerMode\n): void {\n  ExpoFlic2.setButtonTriggerMode(uuid, mode);\n}\n\n// Typed event listeners\n\nexport function addOnClickListener(\n  listener: (event: Flic2ClickEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Click\", listener);\n}\n\nexport function addOnDoubleClickListener(\n  listener: (event: Flic2DoubleClickEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2DoubleClick\", listener);\n}\n\nexport function addOnHoldListener(\n  listener: (event: Flic2HoldEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Hold\", listener);\n}\n\nexport function addOnUpOrDownListener(\n  listener: (event: Flic2UpOrDownEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2UpOrDown\", listener);\n}\n\nexport function addOnConnectionListener(\n  listener: (event: Flic2ConnectionEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Connection\", listener);\n}\n\nexport function addOnScanListener(\n  listener: (event: Flic2ScanEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Scan\", listener);\n}\n\nexport function addOnBatteryListener(\n  listener: (event: Flic2BatteryEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Battery\", listener);\n}\n\nexport function addOnManagerStateListener(\n  listener: (event: Flic2ManagerStateEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2ManagerState\", listener);\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,SAAS,MAAM,mBAAmB,CAAC;AAc1C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,GAUjB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,UAAU,UAAU;IACxB,SAAS,CAAC,UAAU,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,SAAS,CAAC,SAAS,EAAE,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,SAAS,CAAC,QAAQ,EAAE,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,OAAO,SAAS,CAAC,UAAU,EAAE,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAAY,EACZ,IAAsB;IAEtB,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC;AAED,wBAAwB;AAExB,MAAM,UAAU,kBAAkB,CAChC,QAA0C;IAE1C,OAAO,SAAS,CAAC,WAAW,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAgD;IAEhD,OAAO,SAAS,CAAC,WAAW,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,QAAyC;IAEzC,OAAO,SAAS,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,QAA6C;IAE7C,OAAO,SAAS,CAAC,WAAW,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,QAA+C;IAE/C,OAAO,SAAS,CAAC,WAAW,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAC/B,QAAyC;IAEzC,OAAO,SAAS,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,QAA4C;IAE5C,OAAO,SAAS,CAAC,WAAW,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AAC3D,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CACvC,QAAiD;IAEjD,OAAO,SAAS,CAAC,WAAW,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;AAChE,CAAC","sourcesContent":["import { EventSubscription } from \"expo-modules-core\";\nimport ExpoFlic2 from \"./ExpoFlic2Module\";\nimport {\n  Flic2TriggerMode,\n  type Flic2Button,\n  type Flic2ClickEvent,\n  type Flic2DoubleClickEvent,\n  type Flic2HoldEvent,\n  type Flic2UpOrDownEvent,\n  type Flic2ConnectionEvent,\n  type Flic2ScanEvent,\n  type Flic2BatteryEvent,\n  type Flic2ManagerStateEvent,\n} from \"./ExpoFlic2.types\";\n\nexport {\n  Flic2ConnectionState,\n  Flic2TriggerMode,\n  type Flic2Button,\n  type Flic2ClickEvent,\n  type Flic2DoubleClickEvent,\n  type Flic2HoldEvent,\n  type Flic2UpOrDownEvent,\n  type Flic2ConnectionEvent,\n  type Flic2ScanEvent,\n  type Flic2BatteryEvent,\n  type Flic2ManagerStateEvent,\n} from \"./ExpoFlic2.types\";\n\nexport function initialize(): void {\n  ExpoFlic2.initialize();\n}\n\nexport function startScan(): void {\n  ExpoFlic2.startScan();\n}\n\nexport function stopScan(): void {\n  ExpoFlic2.stopScan();\n}\n\nexport function getButtons(): Flic2Button[] {\n  return ExpoFlic2.getButtons();\n}\n\nexport function connectButton(uuid: string): void {\n  ExpoFlic2.connectButton(uuid);\n}\n\nexport function disconnectButton(uuid: string): void {\n  ExpoFlic2.disconnectButton(uuid);\n}\n\nexport function forgetButton(uuid: string): void {\n  ExpoFlic2.forgetButton(uuid);\n}\n\nexport function setButtonTriggerMode(\n  uuid: string,\n  mode: Flic2TriggerMode\n): void {\n  ExpoFlic2.setButtonTriggerMode(uuid, mode);\n}\n\n// Typed event listeners\n\nexport function addOnClickListener(\n  listener: (event: Flic2ClickEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Click\", listener);\n}\n\nexport function addOnDoubleClickListener(\n  listener: (event: Flic2DoubleClickEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2DoubleClick\", listener);\n}\n\nexport function addOnHoldListener(\n  listener: (event: Flic2HoldEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Hold\", listener);\n}\n\nexport function addOnUpOrDownListener(\n  listener: (event: Flic2UpOrDownEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2UpOrDown\", listener);\n}\n\nexport function addOnConnectionListener(\n  listener: (event: Flic2ConnectionEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Connection\", listener);\n}\n\nexport function addOnScanListener(\n  listener: (event: Flic2ScanEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Scan\", listener);\n}\n\nexport function addOnBatteryListener(\n  listener: (event: Flic2BatteryEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2Battery\", listener);\n}\n\n/**\n * iOS only. The Android Flic2 SDK does not provide a Bluetooth manager state\n * callback, so this listener will never fire on Android.\n */\nexport function addOnManagerStateListener(\n  listener: (event: Flic2ManagerStateEvent) => void\n): EventSubscription {\n  return ExpoFlic2.addListener(\"onFlic2ManagerState\", listener);\n}\n"]}

package/ios/ExpoFlic2Module.swift

@@ -80,7 +80,15 @@ public class ExpoFlic2Module: Module {
         Function("forgetButton") { (uuid: String) in
             guard let manager = FLICManager.shared(),
                   let button = findButton(uuid) else { return }
-            manager.forgetButton(button) { _, _ in }
+            manager.forgetButton(button) { [weak self] _, error in
+                if let error = error {
+                    self?.sendEvent("onFlic2Connection", [
+                        "uuid": uuid,
+                        "state": "disconnected",
+                        "error": error.localizedDescription
+                    ])
+                }
+            }
         }
 
         Function("setButtonTriggerMode") { (uuid: String, mode: String) in

package/ios/Flic2ManagerBridge.swift

@@ -64,6 +64,17 @@ class Flic2ManagerBridge: NSObject, FLICManagerDelegate, FLICButtonDelegate {
         module?.sendEvent("onFlic2Connection", payload)
     }
 
+    func button(_ button: FLICButton, didUnpairWithError error: Error?) {
+        var payload: [String: Any] = [
+            "uuid": button.identifier.uuidString,
+            "state": "unpaired"
+        ]
+        if let error = error {
+            payload["error"] = error.localizedDescription
+        }
+        module?.sendEvent("onFlic2Connection", payload)
+    }
+
     // MARK: - FLICButtonDelegate (click events via legacy delegate methods)
 
     func button(_ button: FLICButton, didReceiveButtonDown queued: Bool, age: Int) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-flic2",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "Expo module for Flic2 Bluetooth buttons",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ExpoFlic2.types.ts

@@ -3,6 +3,7 @@ export enum Flic2ConnectionState {
   Connecting = "connecting",
   Connected = "connected",
   Ready = "ready",
+  Unpaired = "unpaired",
 }
 
 export enum Flic2TriggerMode {

package/src/__tests__/exports.test.ts

@@ -9,11 +9,12 @@ describe("Flic2ConnectionState enum", () => {
     expect(Flic2ConnectionState.Connecting).toBe("connecting");
     expect(Flic2ConnectionState.Connected).toBe("connected");
     expect(Flic2ConnectionState.Ready).toBe("ready");
+    expect(Flic2ConnectionState.Unpaired).toBe("unpaired");
   });
 
-  it("has exactly 4 values", () => {
+  it("has exactly 5 values", () => {
     const values = Object.values(Flic2ConnectionState);
-    expect(values).toHaveLength(4);
+    expect(values).toHaveLength(5);
   });
 });
 
@@ -42,6 +43,7 @@ describe("public API exports", () => {
       "connecting",
       "connected",
       "ready",
+      "unpaired", // iOS only: emitted when a button is factory-reset or loses pairing
     ];
     const enumValues = Object.values(Flic2ConnectionState);
     expect(enumValues).toEqual(nativeStrings);

package/src/index.ts

@@ -106,6 +106,10 @@ export function addOnBatteryListener(
   return ExpoFlic2.addListener("onFlic2Battery", listener);
 }
 
+/**
+ * iOS only. The Android Flic2 SDK does not provide a Bluetooth manager state
+ * callback, so this listener will never fire on Android.
+ */
 export function addOnManagerStateListener(
   listener: (event: Flic2ManagerStateEvent) => void
 ): EventSubscription {