react-native-flic2 2.0.0-beta.2 → 2.0.0-beta.21

package/lib/typescript/src/index.d.ts

@@ -2,12 +2,10 @@ import { TypedEmitter } from './lib/typedEventEmitter';
 import { type ButtonEvent, type FlicButton, type LatencyModeType, type ManagerStateChangeEvent, type ScanStatusChangeEvent, type TriggerModeType } from './NativeFlic2';
 declare class Flic2 {
     private isFlic2ManagerInitialized;
-    private sessionId;
     eventEmitter: TypedEmitter<{
         buttonEvent: (event: ButtonEvent) => void;
         managerStateChange: (event: ManagerStateChangeEvent) => void;
         scanStatusChange: (event: ScanStatusChangeEvent) => void;
-        managerInitialized: () => void;
     }>;
     /**
      * Constructor.
@@ -21,25 +19,19 @@ declare class Flic2 {
      *
      * @returns A promise that resolves when the Flic2 manager is initialized.
      */
-    initialize(): Promise<boolean>;
+    initialize(): Promise<void>;
     /**
      * Scan for buttons.
      *
      * @returns A promise that resolves when the scan is started. Events will be emitted for the scan process.
      */
-    startScan(): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    startScan(): Promise<void>;
     /**
      * Stop the scan.
      *
      * @returns A promise that resolves when the scan is stopped.
      */
-    stopScan(): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    stopScan(): Promise<void>;
     /**
      * Called when the Flic2 manager is initialized.
      */
@@ -55,28 +47,19 @@ declare class Flic2 {
      *
      * @returns A promise that resolves when the all known buttons are connected.
      */
-    connectAllKnownButtons(): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    connectAllKnownButtons(): Promise<void>;
     /**
      * Disconnect all known buttons.
      *
      * @returns A promise that resolves when the all known buttons are disconnected.
      */
-    disconnectAllKnownButtons(): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    disconnectAllKnownButtons(): Promise<void>;
     /**
      * Forget all buttons.
      *
      * @returns A promise that resolves when the all buttons are forgotten.
      */
-    forgetAllButtons(): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    forgetAllButtons(): Promise<void>;
     /**
      * Check if a scan is currently running.
      *
@@ -89,63 +72,45 @@ declare class Flic2 {
      * @param uuid - The UUID of the button to forget.
      * @returns A promise that resolves when the button is forgotten.
      */
-    forgetButton(uuid: string): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    forgetButton(uuid: string): Promise<void>;
     /**
      * Connect a button.
      *
      * @param uuid - The UUID of the button to connect.
-     * @returns A promise that resolves when the button is connected.
+     * @returns A promise that resolves with the button when the connection is initiated.
      */
-    buttonConnect(uuid: string): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    buttonConnect(uuid: string): Promise<FlicButton>;
     /**
      * Disconnect a button.
      *
      * @param uuid - The UUID of the button to disconnect.
-     * @returns A promise that resolves when the button is disconnected.
+     * @returns A promise that resolves with the button when the disconnection is initiated.
      */
-    buttonDisconnect(uuid: string): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    buttonDisconnect(uuid: string): Promise<FlicButton>;
     /**
      * Set the trigger mode of a button.
      *
      * @param uuid - The UUID of the button to set the trigger mode of.
      * @param mode - The trigger mode to set.
-     * @returns A promise that resolves when the trigger mode is set.
+     * @returns A promise that resolves with the button when the trigger mode is set.
      */
-    buttonSetTriggerMode(uuid: string, mode: TriggerModeType): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    buttonSetTriggerMode(uuid: string, mode: TriggerModeType): Promise<FlicButton>;
     /**
      * Set the latency mode of a button.
      *
      * @param uuid - The UUID of the button to set the latency mode of.
      * @param mode - The latency mode to set.
-     * @returns A promise that resolves when the latency mode is set.
+     * @returns A promise that resolves with the button when the latency mode is set.
      */
-    buttonSetLatencyMode(uuid: string, mode: LatencyModeType): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    buttonSetLatencyMode(uuid: string, mode: LatencyModeType): Promise<FlicButton>;
     /**
      * Set the nickname of a button.
      *
      * @param uuid - The UUID of the button to set the nickname of.
      * @param nickname - The nickname to set.
-     * @returns A promise that resolves when the nickname is set.
+     * @returns A promise that resolves with the button when the nickname is set.
      */
-    buttonSetNickname(uuid: string, nickname: string): Promise<{
-        success: boolean;
-        message: string;
-    }>;
+    buttonSetNickname(uuid: string, nickname: string): Promise<FlicButton>;
     /**
      * Get all buttons.
      *

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAoB,EAClB,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,eAAe,EACpB,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACrB,MAAM,eAAe,CAAC;AAEvB,cAAM,KAAK;IAET,OAAO,CAAC,yBAAyB,CAAkB;IAE5C,YAAY,EAAE,YAAY,CAAC;QAChC,WAAW,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;QAC1C,kBAAkB,EAAE,CAAC,KAAK,EAAE,uBAAuB,KAAK,IAAI,CAAC;QAC7D,gBAAgB,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;KAC1D,CAAC,CAAC;IAEH;;;;;OAKG;;IAqBH;;;;OAIG;IACU,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxC;;;;OAIG;IACI,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC;;;;OAIG;IACI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAMhC;;OAEG;IACI,aAAa,IAAI,IAAI;IAM5B;;;;OAIG;IACI,aAAa,IAAI,OAAO;IAM/B;;;;OAIG;IACI,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9C;;;;OAIG;IACI,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjD;;;;OAIG;IACI,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxC;;;;OAIG;IACI,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAMrC;;;;;OAKG;IACI,YAAY,CACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC;IAOhB;;;;;OAKG;IACI,aAAa,CAClB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,UAAU,CAAC;IAMtB;;;;;OAKG;IACI,gBAAgB,CACrB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,UAAU,CAAC;IAMtB;;;;;;OAMG;IACI,oBAAoB,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAMtB;;;;;;OAMG;IACI,oBAAoB,CACzB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,UAAU,CAAC;IAMtB;;;;;;OAMG;IACI,iBAAiB,CACtB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,UAAU,CAAC;IAMtB;;;;OAIG;IACI,UAAU,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAM1C;;;;;OAKG;IACU,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAShE;;;;;;OAMG;IACU,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAe7D;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAM1B;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAsB3B;;;;OAIG;IACH,OAAO,CAAC,0BAA0B;IAalC;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;CAMjC;;AAGD,wBAA2B;AAG3B,mBAAmB,eAAe,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-flic2",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.21",
   "description": "React Native Flic plugin made with the Flic2 SDK (unofficial)",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",
@@ -57,31 +57,31 @@
     "registry": "https://registry.npmjs.org/"
   },
   "devDependencies": {
-    "@eslint/compat": "^1.3.2",
-    "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.35.0",
-    "@evilmartians/lefthook": "^1.12.3",
+    "@eslint/compat": "1.3.2",
+    "@eslint/eslintrc": "3.3.1",
+    "@eslint/js": "9.35.0",
+    "@evilmartians/lefthook": "1.12.3",
     "@react-native-community/cli": "20.0.1",
     "@react-native/babel-preset": "0.81.1",
-    "@react-native/eslint-config": "^0.81.1",
-    "@release-it/conventional-changelog": "^10.0.1",
-    "@types/react": "^19.1.0",
-    "@typescript-eslint/eslint-plugin": "^8.46.2",
-    "@typescript-eslint/parser": "^8.46.2",
-    "del-cli": "^6.0.0",
-    "eslint": "^8.57.1",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-ft-flow": "^3.0.11",
-    "eslint-plugin-jest": "^29.0.1",
-    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-react-native": "^5.0.0",
-    "prettier": "^3.6.2",
+    "@react-native/eslint-config": "0.81.1",
+    "@release-it/conventional-changelog": "10.0.1",
+    "@types/react": "19.1.0",
+    "@typescript-eslint/eslint-plugin": "8.46.2",
+    "@typescript-eslint/parser": "8.46.2",
+    "del-cli": "6.0.0",
+    "eslint": "8.57.1",
+    "eslint-config-prettier": "10.1.8",
+    "eslint-plugin-ft-flow": "3.0.11",
+    "eslint-plugin-jest": "29.0.1",
+    "eslint-plugin-prettier": "5.5.4",
+    "eslint-plugin-react-native": "5.0.0",
+    "prettier": "3.6.2",
     "react": "19.1.0",
     "react-native": "0.81.1",
-    "react-native-builder-bob": "^0.40.13",
-    "release-it": "^19.0.4",
-    "turbo": "^2.5.6",
-    "typescript": "^5.9.2"
+    "react-native-builder-bob": "0.40.13",
+    "release-it": "19.0.4",
+    "turbo": "2.5.6",
+    "typescript": "5.9.2"
   },
   "peerDependencies": {
     "react": "*",
@@ -136,7 +136,7 @@
     "type": "modules",
     "jsSrcsDir": "src",
     "android": {
-      "javaPackageName": "com.flic2"
+      "javaPackageName": "nl.xguard.flic2"
     }
   },
   "create-react-native-library": {

package/src/NativeFlic2.ts

@@ -46,22 +46,24 @@ export type ScanStatusChangeEvent = {
   result?: ScanResult;
 };
 
+export type ButtonEventName =
+  | 'discovered'
+  | 'connected'
+  | 'ready'
+  | 'disconnected'
+  | 'connectionFailed'
+  | 'buttonDown'
+  | 'buttonUp'
+  | 'click'
+  | 'doubleClick'
+  | 'hold'
+  | 'unpaired'
+  | 'batteryUpdate'
+  | 'nicknameUpdate';
+
 export type ButtonEvent = {
   uuid: string;
-  event:
-    | 'discovered'
-    | 'connected'
-    | 'ready'
-    | 'disconnected'
-    | 'connectionFailed'
-    | 'buttonDown'
-    | 'buttonUp'
-    | 'click'
-    | 'doubleClick'
-    | 'hold'
-    | 'unpaired'
-    | 'batteryUpdate'
-    | 'nicknameUpdate';
+  event: ButtonEventName;
   queued?: boolean;
   age?: number;
   nickname?: string;
@@ -133,33 +135,33 @@ export interface Spec extends TurboModule {
   // Manager methods
   initialize(
     background: boolean
-  ): Promise<{ success: boolean; message: string }>;
+  ): Promise<void>;
   getButtons(): Promise<FlicButton[]>;
-  scanForButtons(): Promise<{ success: boolean; message: string }>;
-  stopScan(): Promise<{ success: boolean; message: string }>;
-  forgetButton(uuid: string): Promise<{ success: boolean; message: string }>;
-  connectAllKnownButtons(): Promise<{ success: boolean; message: string }>;
-  disconnectAllKnownButtons(): Promise<{ success: boolean; message: string }>;
-  forgetAllButtons(): Promise<{ success: boolean; message: string }>;
+  scanForButtons(): Promise<void>;
+  stopScan(): Promise<void>;
+  forgetButton(uuid: string): Promise<void>;
+  connectAllKnownButtons(): Promise<void>;
+  disconnectAllKnownButtons(): Promise<void>;
+  forgetAllButtons(): Promise<void>;
   isScanning(): Promise<boolean>;
 
   // Button methods
-  connectButton(uuid: string): Promise<{ success: boolean; message: string }>;
+  connectButton(uuid: string): Promise<FlicButton>;
   disconnectButton(
     uuid: string
-  ): Promise<{ success: boolean; message: string }>;
+  ): Promise<FlicButton>;
   setTriggerMode(
     uuid: string,
-    mode: TriggerModeType
-  ): Promise<{ success: boolean; message: string }>;
+    mode: number
+  ): Promise<FlicButton>;
   setLatencyMode(
     uuid: string,
-    mode: LatencyModeType
-  ): Promise<{ success: boolean; message: string }>;
+    mode: number
+  ): Promise<FlicButton>;
   setNickname(
     uuid: string,
     nickname: string
-  ): Promise<{ success: boolean; message: string }>;
+  ): Promise<FlicButton>;
 
   // Event emitters
   readonly onManagerStateChange: CodegenTypes.EventEmitter<ManagerStateChangeEvent>;
@@ -167,4 +169,49 @@ export interface Spec extends TurboModule {
   readonly onButtonEvent: CodegenTypes.EventEmitter<ButtonEvent>;
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>('Flic2');
+const createFallbackButton = (uuid: string): FlicButton => ({
+  uuid,
+  identifier: uuid,
+  name: '',
+  nickname: '',
+  bluetoothAddress: '',
+  serialNumber: '',
+  state: 0,
+  stateName: 'disconnected',
+  triggerMode: 0,
+  triggerModeName: 'clickAndHold',
+  latencyMode: 0,
+  latencyModeName: 'normal',
+  pressCount: 0,
+  firmwareRevision: 0,
+  isReady: false,
+  batteryVoltage: 0,
+  isUnpaired: false,
+});
+
+const fallbackEventEmitter = (() => ({ remove: () => undefined })) as unknown as Spec['onManagerStateChange'];
+
+const fallbackModule = {
+  initialize: async (_background: boolean) => undefined,
+  getButtons: async () => [],
+  scanForButtons: async () => undefined,
+  stopScan: async () => undefined,
+  forgetButton: async (_uuid: string) => undefined,
+  connectAllKnownButtons: async () => undefined,
+  disconnectAllKnownButtons: async () => undefined,
+  forgetAllButtons: async () => undefined,
+  isScanning: async () => false,
+  connectButton: async (uuid: string) => createFallbackButton(uuid),
+  disconnectButton: async (uuid: string) => createFallbackButton(uuid),
+  setTriggerMode: async (uuid: string, _mode: number) => createFallbackButton(uuid),
+  setLatencyMode: async (uuid: string, _mode: number) => createFallbackButton(uuid),
+  setNickname: async (uuid: string, nickname: string) => ({
+    ...createFallbackButton(uuid),
+    nickname,
+  }),
+  onManagerStateChange: fallbackEventEmitter,
+  onScanStatusChange: fallbackEventEmitter as unknown as Spec['onScanStatusChange'],
+  onButtonEvent: fallbackEventEmitter as unknown as Spec['onButtonEvent'],
+} as Spec;
+
+export default TurboModuleRegistry.get<Spec>('Flic2') ?? fallbackModule;

package/src/index.ts

@@ -12,13 +12,10 @@ class Flic2 {
 
   private isFlic2ManagerInitialized: boolean = false;
 
-  private sessionId: string;
-
   public eventEmitter: TypedEmitter<{
     buttonEvent: (event: ButtonEvent) => void;
     managerStateChange: (event: ManagerStateChangeEvent) => void;
     scanStatusChange: (event: ScanStatusChangeEvent) => void;
-    managerInitialized: () => void;
   }>;
 
   /**
@@ -29,11 +26,6 @@ class Flic2 {
    */
   constructor() {
 
-    // generate a random session ID for the instance
-    this.sessionId = Math.random().toString(36).substring(2, 15);
-
-    console.log('Created new Flic2 instance with sessionId', this.sessionId);
-
     // create event emitter
     this.eventEmitter = new TypedEmitter<{
       buttonEvent: (event: ButtonEvent) => void;
@@ -57,7 +49,7 @@ class Flic2 {
    *
    * @returns A promise that resolves when the Flic2 manager is initialized.
    */
-  public async initialize(): Promise<boolean> {
+  public async initialize(): Promise<void> {
 
     // check if the Flic2 manager is already initialized
     if (this.isInitialized()) {
@@ -67,18 +59,10 @@ class Flic2 {
     }
 
     // initialize the Flic2 manager in background
-    const result = await NativeFlic2.initialize(true);
-
-    if (!result.success) {
-
-      throw new Error(result.message);
-
-    }
+    await NativeFlic2.initialize(true);
 
     this.onInitialized();
 
-    return true;
-
   }
 
   /**
@@ -86,7 +70,7 @@ class Flic2 {
    *
    * @returns A promise that resolves when the scan is started. Events will be emitted for the scan process.
    */
-  public startScan(): Promise<{ success: boolean; message: string }> {
+  public startScan(): Promise<void> {
 
     return NativeFlic2.scanForButtons();
 
@@ -97,7 +81,7 @@ class Flic2 {
    *
    * @returns A promise that resolves when the scan is stopped.
    */
-  public stopScan(): Promise<{ success: boolean; message: string }> {
+  public stopScan(): Promise<void> {
 
     return NativeFlic2.stopScan();
 
@@ -128,10 +112,7 @@ class Flic2 {
    *
    * @returns A promise that resolves when the all known buttons are connected.
    */
-  public connectAllKnownButtons(): Promise<{
-    success: boolean;
-    message: string;
-  }> {
+  public connectAllKnownButtons(): Promise<void> {
 
     return NativeFlic2.connectAllKnownButtons();
 
@@ -142,10 +123,7 @@ class Flic2 {
    *
    * @returns A promise that resolves when the all known buttons are disconnected.
    */
-  public disconnectAllKnownButtons(): Promise<{
-    success: boolean;
-    message: string;
-  }> {
+  public disconnectAllKnownButtons(): Promise<void> {
 
     return NativeFlic2.disconnectAllKnownButtons();
 
@@ -156,7 +134,7 @@ class Flic2 {
    *
    * @returns A promise that resolves when the all buttons are forgotten.
    */
-  public forgetAllButtons(): Promise<{ success: boolean; message: string }> {
+  public forgetAllButtons(): Promise<void> {
 
     return NativeFlic2.forgetAllButtons();
 
@@ -181,7 +159,7 @@ class Flic2 {
    */
   public forgetButton(
     uuid: string
-  ): Promise<{ success: boolean; message: string }> {
+  ): Promise<void> {
 
     return NativeFlic2.forgetButton(uuid);
 
@@ -192,11 +170,11 @@ class Flic2 {
    * Connect a button.
    *
    * @param uuid - The UUID of the button to connect.
-   * @returns A promise that resolves when the button is connected.
+   * @returns A promise that resolves with the button when the connection is initiated.
    */
   public buttonConnect(
     uuid: string
-  ): Promise<{ success: boolean; message: string }> {
+  ): Promise<FlicButton> {
 
     return NativeFlic2.connectButton(uuid);
 
@@ -206,11 +184,11 @@ class Flic2 {
    * Disconnect a button.
    *
    * @param uuid - The UUID of the button to disconnect.
-   * @returns A promise that resolves when the button is disconnected.
+   * @returns A promise that resolves with the button when the disconnection is initiated.
    */
   public buttonDisconnect(
     uuid: string
-  ): Promise<{ success: boolean; message: string }> {
+  ): Promise<FlicButton> {
 
     return NativeFlic2.disconnectButton(uuid);
 
@@ -221,12 +199,12 @@ class Flic2 {
    *
    * @param uuid - The UUID of the button to set the trigger mode of.
    * @param mode - The trigger mode to set.
-   * @returns A promise that resolves when the trigger mode is set.
+   * @returns A promise that resolves with the button when the trigger mode is set.
    */
   public buttonSetTriggerMode(
     uuid: string,
     mode: TriggerModeType
-  ): Promise<{ success: boolean; message: string }> {
+  ): Promise<FlicButton> {
 
     return NativeFlic2.setTriggerMode(uuid, mode);
 
@@ -237,12 +215,12 @@ class Flic2 {
    *
    * @param uuid - The UUID of the button to set the latency mode of.
    * @param mode - The latency mode to set.
-   * @returns A promise that resolves when the latency mode is set.
+   * @returns A promise that resolves with the button when the latency mode is set.
    */
   public buttonSetLatencyMode(
     uuid: string,
     mode: LatencyModeType
-  ): Promise<{ success: boolean; message: string }> {
+  ): Promise<FlicButton> {
 
     return NativeFlic2.setLatencyMode(uuid, mode);
 
@@ -253,12 +231,12 @@ class Flic2 {
    *
    * @param uuid - The UUID of the button to set the nickname of.
    * @param nickname - The nickname to set.
-   * @returns A promise that resolves when the nickname is set.
+   * @returns A promise that resolves with the button when the nickname is set.
    */
   public buttonSetNickname(
     uuid: string,
     nickname: string
-  ): Promise<{ success: boolean; message: string }> {
+  ): Promise<FlicButton> {
 
     return NativeFlic2.setNickname(uuid, nickname);
 
@@ -358,6 +336,13 @@ class Flic2 {
    */
   private onNativeManagerStateChange(event: ManagerStateChangeEvent): void {
 
+    // When manager is restored, mark it as initialized
+    if (event.event === 'restored' && !this.isFlic2ManagerInitialized) {
+
+      this.onInitialized();
+
+    }
+
     this.eventEmitter.emit('managerStateChange', event);
 
   }