addEventListener event union (kaspanet#31)

HLXEasy · Mar 30, 2024 · daf142c · daf142c
1 parent 69e269d
commit daf142c
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wallet/core/src/wasm/notify.rs b/wallet/core/src/wasm/notify.rs
@@ -5,6 +5,28 @@ use wasm_bindgen::prelude::*;
 
 cfg_if! {
     if #[cfg(any(feature = "wasm32-core", feature = "wasm32-sdk"))] {
+
+        // #[wasm_bindgen]
+        // #[derive(Copy, Clone, Debug)]
+        // pub enum UtxoProcessorEventType{
+        //     All="all",
+        //     Connect="connect",
+        //     Disconnect="disconnect",
+        //     // UtxoIndexNotEnabled,
+        //     // SyncState,
+        //     // ServerStatus,
+        //     // UtxoProcError,
+        //     // DaaScoreChange,
+        //     // Pending,
+        //     // Reorg,
+        //     // Stasis,
+        //     // Maturity,
+        //     Discovery="discovery",
+        //     // Balance,
+        //     // Error,
+        // }
+
+
         #[wasm_bindgen(typescript_custom_section)]
         const TS_NOTIFY: &'static str = r#"
 
@@ -51,14 +73,27 @@ cfg_if! {
             | IErrorEvent
             ;
 
-        /**
-         * {@link UtxoProcessor} notification event interface.
-         * @category Wallet SDK
-         */
-        export interface IUtxoProcessorEvent {
-            event : string;
-            data? : UtxoProcessorEventData;
+        export type UtxoProcessorEventMap = {
+            "connect":IConnectEvent,
+            "disconnect": IDisconnectEvent,
+            "utxo-index-not-enabled": IUtxoIndexNotEnabledEvent,
+            "sync-state": ISyncStateEvent,
+            "server-status": IServerStatusEvent,
+            "utxo-proc-error": IUtxoProcErrorEvent,
+            "daa-score-change": IDaaScoreChangeEvent,
+            "pending": IPendingEvent,
+            "reorg": IReorgEvent,
+            "stasis": IStasisEvent,
+            "maturity": IMaturityEvent,
+            "discovery": IDiscoveryEvent,
+            "balance": IBalanceEvent,
+            "error": IErrorEvent
         }
+
+        type IUtxoProcessorEvent = {
+            [K in keyof UtxoProcessorEventMap]: { event: K, data: UtxoProcessorEventMap[K] }
+        }[keyof UtxoProcessorEventMap];
+
         
         /**
          * {@link UtxoProcessor} notification callback type.

diff --git a/wallet/core/src/wasm/utxo/processor.rs b/wallet/core/src/wasm/utxo/processor.rs
@@ -56,6 +56,27 @@ impl Inner {
     }
 }
 
+cfg_if! {
+    if #[cfg(any(feature = "wasm32-core", feature = "wasm32-sdk"))] {
+        #[wasm_bindgen(typescript_custom_section)]
+        const TS_NOTIFY: &'static str = r#"
+        interface UtxoProcessor {
+            /**
+            * @param {UtxoProcessorNotificationCallback} callback
+            */
+            addEventListener(callback:UtxoProcessorNotificationCallback): void;
+            /**
+            * @param {UtxoProcessorEventType} event
+            * @param {UtxoProcessorNotificationCallback} [callback]
+            */
+            addEventListener<M extends keyof UtxoProcessorEventMap>(
+                event: M,
+                callback: (eventData: UtxoProcessorEventMap[M]) => void
+            )
+        }"#;
+    }
+}
+
 ///
 /// UtxoProcessor class is the main coordinator that manages UTXO processing
 /// between multiple UtxoContext instances. It acts as a bridge between the
@@ -224,9 +245,10 @@ impl UtxoProcessor {
     }
 }
 
+
 #[wasm_bindgen]
 impl UtxoProcessor {
-    #[wasm_bindgen(js_name = "addEventListener")]
+    #[wasm_bindgen(js_name = "addEventListener", skip_typescript)]
     pub fn add_event_listener(
         &self,
         event: UtxoProcessorNotificationTypeOrCallback,

diff --git a/wasm/examples/nodejs/typescript/src/utxo-context-listener.ts b/wasm/examples/nodejs/typescript/src/utxo-context-listener.ts
@@ -58,21 +58,25 @@ let { encoding, networkId, destinationAddress } = parseArgs();
     let context = new UtxoContext({ processor });
 
     // 4) Register a listener with the UtxoProcessor::events
-    processor.addEventListener(({ event, data }: IUtxoProcessorEvent) => {
+    processor.addEventListener(({event, data}) => {
         // handle the event
         // since the event is a union type, you can switch on the 
         // event type and cast the data to the appropriate type
         switch (event) {
-            case UtxoProcessorEventType.Discovery: {
-                let record = (data as IDiscoveryEvent).record;
+            //string enums are not working for @Matoo
+            //case UtxoProcessorEventType.Discovery: {
+            case "discovery": {
+                let record = data.record;
                 console.log("Discovery event record:", record);
             } break;
-            case UtxoProcessorEventType.Pending: {
-                let record = (data as IPendingEvent).record;
+            //case UtxoProcessorEventType.Pending: {
+            case "pending":{
+                let record = data.record;
                 console.log("Pending event record:", record);
             } break;
-            case UtxoProcessorEventType.Maturity: {
-                let record = (data as IMaturityEvent).record;
+            //case UtxoProcessorEventType.Maturity: {
+            case "maturity": {
+                let record = data.record;
                 console.log("Maturity event record:", record);
             } break;
             default: {
@@ -81,6 +85,10 @@ let { encoding, networkId, destinationAddress } = parseArgs();
         }
     });
 
+    processor.addEventListener("discovery", (data) => {
+        console.log("Discovery event record:", data.record);
+    });
+
     console.log(processor);
 
     // 5) Once the environment is setup, connect to RPC