@bsv/wallet-toolbox 1.3.26 → 1.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/wallet-toolbox",
-  "version": "1.3.26",
+  "version": "1.3.28",
   "description": "BRC100 conforming wallet, wallet storage and wallet signer components",
   "main": "./out/src/index.js",
   "types": "./out/src/index.d.ts",

package/src/monitor/Monitor.ts

@@ -13,7 +13,7 @@ import { TaskFailAbandoned } from './tasks/TaskFailAbandoned'
 import { TaskCheckForProofs } from './tasks/TaskCheckForProofs'
 import { TaskClock } from './tasks/TaskClock'
 import { TaskNewHeader } from './tasks/TaskNewHeader'
-import { TaskServiceCallHistory } from './tasks/TaskServiceCallHistory'
+import { TaskMonitorCallHistory } from './tasks/TaskMonitorCallHistory'
 
 import { TaskSendWaiting } from './tasks/TaskSendWaiting'
 import { TaskCheckNoSends } from './tasks/TaskCheckNoSends'
@@ -111,7 +111,7 @@ export class Monitor {
   addAllTasksToOther(): void {
     this._otherTasks.push(new TaskClock(this))
     this._otherTasks.push(new TaskNewHeader(this))
-    this._otherTasks.push(new TaskServiceCallHistory(this))
+    this._otherTasks.push(new TaskMonitorCallHistory(this))
     this._otherTasks.push(new TaskPurge(this, this.defaultPurgeParams))
     this._otherTasks.push(new TaskReviewStatus(this))
     this._otherTasks.push(new TaskSendWaiting(this))
@@ -130,7 +130,7 @@ export class Monitor {
   addDefaultTasks(): void {
     this._tasks.push(new TaskClock(this))
     this._tasks.push(new TaskNewHeader(this))
-    this._tasks.push(new TaskServiceCallHistory(this))
+    this._tasks.push(new TaskMonitorCallHistory(this))
     this._tasks.push(new TaskSendWaiting(this, 8 * this.oneSecond, 7 * this.oneSecond)) // Check every 8 seconds but must be 7 seconds old
     this._tasks.push(new TaskCheckForProofs(this, 2 * this.oneHour)) // Every two hours if no block found
     this._tasks.push(new TaskCheckNoSends(this))
@@ -147,7 +147,7 @@ export class Monitor {
   addMultiUserTasks(): void {
     this._tasks.push(new TaskClock(this))
     this._tasks.push(new TaskNewHeader(this))
-    this._tasks.push(new TaskServiceCallHistory(this))
+    this._tasks.push(new TaskMonitorCallHistory(this))
     this._tasks.push(new TaskSendWaiting(this, 8 * this.oneSecond, 7 * this.oneSecond)) // Check every 8 seconds but must be 7 seconds old
     this._tasks.push(new TaskCheckForProofs(this, 2 * this.oneHour)) // Every two hours if no block found
     this._tasks.push(new TaskCheckNoSends(this))

package/src/monitor/tasks/{TaskServiceCallHistory.ts → TaskMonitorCallHistory.ts}

@@ -2,14 +2,14 @@ import { TableMonitorEvent } from '../../storage/index.client'
 import { Monitor } from '../Monitor'
 import { WalletMonitorTask } from './WalletMonitorTask'
 
-export class TaskServiceCallHistory extends WalletMonitorTask {
-  static taskName = 'ServiceCallHistory'
+export class TaskMonitorCallHistory extends WalletMonitorTask {
+  static taskName = 'MonitorCallHistory'
 
   constructor(
     monitor: Monitor,
     public triggerMsecs = monitor.oneMinute * 12
   ) {
-    super(monitor, TaskServiceCallHistory.taskName)
+    super(monitor, TaskMonitorCallHistory.taskName)
   }
 
   trigger(nowMsecsSinceEpoch: number): { run: boolean } {

package/src/storage/StorageKnex.ts

@@ -1156,9 +1156,16 @@ export class StorageKnex extends StorageProvider implements sdk.WalletStoragePro
   async adminStats(adminIdentityKey: string): Promise<AdminStatsResult> {
     if (this.dbtype !== 'MySQL') throw new sdk.WERR_NOT_IMPLEMENTED('adminStats, only MySQL is supported')
 
-    const monitorEvent = verifyOneOrNone(await this.findMonitorEvents({ partial: { event: 'ServiceCallHistory'}, orderDescending: true, paged: { limit: 1 } }))
+    const monitorEvent = verifyOneOrNone(await this.findMonitorEvents({ partial: { event: 'MonitorCallHistory'}, orderDescending: true, paged: { limit: 1 } }))
     const monitorStats: ServicesCallHistory | undefined = monitorEvent ? JSON.parse(monitorEvent.details!) : undefined
     const servicesStats = this.getServices().getServicesCallHistory(true)
+    await this.insertMonitorEvent({
+      event: 'ServicesCallHistory',
+      details: JSON.stringify(servicesStats),
+      created_at: new Date(),
+      updated_at: new Date(),
+      id: 0
+    })
 
     const one_day_ago = new Date(Date.now() - 24 * 60 * 60 * 1000).toISOString()
     const one_week_ago = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000).toISOString()

package/test/Wallet/local/localWallet.man.test.ts

@@ -35,7 +35,7 @@ describe('localWallet tests', () => {
     await setup.monitor.runOnce()
     await setup.services.getRawTx('0000e416dfaf14c04899ccad2bf76a67c1d5598fece25cf4dcb7a076012b7d8d')
     await setup.services.getRawTx('0000ced61e2491be55061ce6577e0c59b909922ba92d5cc1cd754b10d721ab0e')
-    logger(await setup.monitor.runTask('ServiceCallHistory'))
+    logger(await setup.monitor.runTask('MonitorCallHistory'))
     await setup.wallet.destroy()
   })