Merge pull request #10 from ora-io/dev

Dev

Author: murongg

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ora-stack",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": true,
   "packageManager": "[email protected]",
   "description": "",

packages/orap/examples/customDemo/app.ts

@@ -47,6 +47,7 @@ async function handleSignal(from: any, to: any, amount: any, event: EventLog) {
   logger.log('handleSignal', event.transactionHash)
   const task = new TransferTask(event.transactionHash, from, to, amount)
   await task.save(sm)
+  return true
 }
 
 // TODO: make the following DBApp?

packages/orap/examples/ooSample/app.ts

@@ -14,7 +14,10 @@ const eventSignalParam: EventSignalRegisterParams = {
 }
 
 // define handle function
-const handle = (...args: any) => { console.log('handle', args) }
+const handle = (...args: any) => {
+  console.log('handle', args)
+  return true
+}
 
 // define event signal with crosscheck and link with handle function
 // note: no cache functionality

packages/orap/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ora-io/orap",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "packageManager": "[email protected]",
   "description": "",
   "author": "Norman (nom4dv3), MuRong",

packages/orap/src/flow/orap.test.ts

@@ -15,7 +15,7 @@ describe('OrapFlow', () => {
   })
 
   it('should create an event flow', () => {
-    const eventFlow = orapFlow.event()
+    const eventFlow = orapFlow.event({ address: '0x1234567890abcdef', abi: [], eventName: 'Transfer' })
     expect(eventFlow).toBeDefined()
     expect(orapFlow.eventFlows).toContain(eventFlow)
   })
@@ -27,7 +27,7 @@ describe('OrapFlow', () => {
   })
 
   it('should assemble the OrapVerse', () => {
-    const eventFlow = orapFlow.event()
+    const eventFlow = orapFlow.event({ address: '0x1234567890abcdef', abi: [], eventName: 'Transfer' })
     const orapVerse = orapFlow.assemble()
     expect(orapVerse).toBeDefined()
     expect(eventFlow).toBeDefined()

packages/orap/src/flow/orap.ts

@@ -1,8 +1,10 @@
 import type { Providers } from '@ora-io/reku'
+import type { Fn } from '@ora-io/utils'
+import type { Interface, InterfaceAbi } from 'ethers'
 import { OrapVerse } from '../verse/orap'
 import type { EventSignalRegisterParams } from '../signal'
 import { EventFlow } from './event'
-import type { Flow } from './interface'
+import type { Flow, HandleFn } from './interface'
 
 export interface ListenOptions {
   wsProvider: Providers
@@ -23,8 +25,15 @@ export class OrapFlow implements Flow {
     return this.subflows.event
   }
 
-  event(options?: EventSignalRegisterParams, handler?: any): EventFlow {
-    const eventFlow = new EventFlow(this, options, handler)
+  event(params: EventSignalRegisterParams, handler?: HandleFn): EventFlow
+  event(params: string, abi: Interface | InterfaceAbi | HandleFn, eventName: string, handler?: HandleFn): EventFlow
+  event(params: EventSignalRegisterParams | string, abi?: Interface | InterfaceAbi | HandleFn, eventName?: string, handler?: HandleFn): EventFlow {
+    if (typeof params === 'string')
+      params = { address: params, abi: abi as Interface | InterfaceAbi, eventName: eventName as string }
+    else
+      handler = abi as HandleFn
+
+    const eventFlow = new EventFlow(this, params, handler)
     this.subflows.event.push(eventFlow)
     return eventFlow
   }
@@ -34,7 +43,7 @@ export class OrapFlow implements Flow {
    * @param options
    * @param onListenFn
    */
-  listen(options: ListenOptions, onListenFn: any = () => { }) {
+  listen(options: ListenOptions, onListenFn: Fn) {
     for (const eventFlow of this.subflows.event) {
       eventFlow.setSubscribeProvider(options.wsProvider)
       if (options.httpProvider)
@@ -45,6 +54,7 @@ export class OrapFlow implements Flow {
 
     const orapVerse = this.assemble()
     orapVerse.play()
+    this.onListenFn()
   }
 
   assemble(): OrapVerse {

packages/reku/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ora-io/reku",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "packageManager": "[email protected]",
   "description": "",
   "author": "Norman (nom4dv3), MuRong",

packages/reku/src/provider/provider.ts

@@ -9,6 +9,10 @@ export interface RekuProviderManagerOptions {
    * The interval of heartbeat, default is 10s
    */
   heartbeatInterval?: number
+  /**
+   * Disable heartbeat
+   */
+  disabledHeartbeat?: boolean
 }
 
 export type RekuProviderManagerEvent = 'error' | 'close'
@@ -23,10 +27,10 @@ export class RekuProviderManager {
 
   private _event?: EventEmitter
 
-  constructor(public providerUrl: string, options?: RekuProviderManagerOptions) {
+  constructor(public providerUrl: string, private _options?: RekuProviderManagerOptions) {
     this.connect()
-    if (options?.heartbeatInterval)
-      this._heartbeatInterval = options.heartbeatInterval
+    if (_options?.heartbeatInterval)
+      this._heartbeatInterval = _options.heartbeatInterval
 
     this._handleError()
     this._sendHeartbeat()
@@ -164,6 +168,8 @@ export class RekuProviderManager {
   }
 
   private _sendHeartbeat() {
+    if (this._options?.disabledHeartbeat)
+      return
     this._heartbeatTimer = setInterval(() => {
       this._provider?.send('net_version', [])
         .then()
@@ -175,7 +181,8 @@ export class RekuProviderManager {
   }
 
   private _clearHeartbeat() {
-    clearInterval(this._heartbeatTimer)
+    if (this._heartbeatTimer)
+      clearInterval(this._heartbeatTimer)
   }
 
   private _handleError() {

packages/utils/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ora-io/utils",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "packageManager": "[email protected]",
   "description": "",
   "author": "Norman (nom4dv3), MuRong",