@xyo-network/sentinel 2.59.0 → 2.60.0-rc.2

package/docs/variables/SentinelConfigSchema-1.html

@@ -17,8 +17,8 @@
 <h1>Variable SentinelConfigSchema</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">Sentinel<wbr/>Config<wbr/>Schema</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;network.xyo.node.sentinel&quot;</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/sentinel/src/Config.ts#L5">modules/packages/sentinel/src/Config.ts:5</a></li>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/sentinel/src/Config.ts#L6">modules/packages/sentinel/src/Config.ts:6</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/sentinel/src/Config.ts#L5">modules/packages/sentinel/src/Config.ts:5</a></li>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/sentinel/src/Config.ts#L6">modules/packages/sentinel/src/Config.ts:6</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/docs/variables/SentinelReportQuerySchema-1.html

@@ -17,8 +17,8 @@
 <h1>Variable SentinelReportQuerySchema</h1></div>
 <div class="tsd-signature"><span class="tsd-kind-variable">Sentinel<wbr/>Report<wbr/>Query<wbr/>Schema</span><span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">&quot;network.xyo.query.sentinel.report&quot;</span></div><aside class="tsd-sources">
 <ul>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/sentinel/src/Queries/Report.ts#L3">modules/packages/sentinel/src/Queries/Report.ts:3</a></li>
-<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/218908d8b/packages/modules/packages/sentinel/src/Queries/Report.ts#L4">modules/packages/sentinel/src/Queries/Report.ts:4</a></li></ul></aside></div>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/sentinel/src/Queries/Report.ts#L3">modules/packages/sentinel/src/Queries/Report.ts:3</a></li>
+<li>Defined in <a href="https://github.com/XYOracleNetwork/sdk-xyo-client-js/blob/07894923abf1/packages/modules/packages/sentinel/src/Queries/Report.ts#L4">modules/packages/sentinel/src/Queries/Report.ts:4</a></li></ul></aside></div>
 <div class="col-sidebar">
 <div class="page-menu">
 <div class="tsd-navigation settings">

package/package.json

@@ -12,18 +12,18 @@
   "dependencies": {
     "@xylabs/assert": "^2.8.1",
     "@xylabs/promise": "^2.8.1",
-    "@xyo-network/account": "^2.59.0",
-    "@xyo-network/account-model": "^2.59.0",
-    "@xyo-network/archivist": "^2.59.0",
-    "@xyo-network/archivist-wrapper": "^2.59.0",
-    "@xyo-network/boundwitness-model": "^2.59.0",
-    "@xyo-network/core": "^2.59.0",
-    "@xyo-network/module": "^2.59.0",
-    "@xyo-network/module-model": "^2.59.0",
-    "@xyo-network/payload-model": "^2.59.0",
-    "@xyo-network/payload-wrapper": "^2.59.0",
-    "@xyo-network/promise": "^2.59.0",
-    "@xyo-network/witness": "^2.59.0",
+    "@xyo-network/account": "^2.60.0-rc.2",
+    "@xyo-network/account-model": "^2.60.0-rc.2",
+    "@xyo-network/archivist": "^2.60.0-rc.2",
+    "@xyo-network/archivist-wrapper": "^2.60.0-rc.2",
+    "@xyo-network/boundwitness-model": "^2.60.0-rc.2",
+    "@xyo-network/core": "^2.60.0-rc.2",
+    "@xyo-network/module": "^2.60.0-rc.2",
+    "@xyo-network/module-model": "^2.60.0-rc.2",
+    "@xyo-network/payload-model": "^2.60.0-rc.2",
+    "@xyo-network/payload-wrapper": "^2.60.0-rc.2",
+    "@xyo-network/promise": "^2.60.0-rc.2",
+    "@xyo-network/witness": "^2.60.0-rc.2",
     "lodash": "^4.17.21"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -65,5 +65,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.59.0"
+  "version": "2.60.0-rc.2",
+  "stableVersion": "2.59.0"
 }

package/src/AbstractSentinel.ts

@@ -93,12 +93,12 @@ export abstract class AbstractSentinel<
     queryConfig?: TConfig,
   ): Promise<ModuleQueryResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<SentinelQueryBase>(query, payloads)
-    const typedQuery = wrapper.query.payload
+    const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
     const queryAccount = new Account()
     const resultPayloads: Payload[] = []
     try {
-      switch (typedQuery.schema) {
+      switch (queryPayload.schema) {
         case SentinelReportQuerySchema: {
           await this.emit('reportStart', { inPayloads: payloads, module: this })
           resultPayloads.push(...(await this.report(payloads)))
@@ -111,9 +111,18 @@ export abstract class AbstractSentinel<
       }
     } catch (ex) {
       const error = ex as Error
-      return this.bindQueryResult(typedQuery, [new ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build()], [queryAccount])
+      return this.bindQueryResult(
+        queryPayload,
+        [
+          new ModuleErrorBuilder()
+            .sources([await wrapper.hashAsync()])
+            .message(error.message)
+            .build(),
+        ],
+        [queryAccount],
+      )
     }
-    return await this.bindQueryResult(typedQuery, resultPayloads, [queryAccount])
+    return await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount])
   }
 
   abstract report(payloads?: Payload[]): Promise<Payload[]>

package/src/MemorySentinel.ts

@@ -57,12 +57,12 @@ export class MemorySentinel<
     queryConfig?: TConfig,
   ): Promise<ModuleQueryResult> {
     const wrapper = QueryBoundWitnessWrapper.parseQuery<SentinelQuery>(query, payloads)
-    const typedQuery = wrapper.query.payload
+    const queryPayload = await wrapper.getQuery()
     assertEx(this.queryable(query, payloads, queryConfig))
     const queryAccount = new Account()
     const resultPayloads: Payload[] = []
     try {
-      switch (typedQuery.schema) {
+      switch (queryPayload.schema) {
         case SentinelReportQuerySchema: {
           resultPayloads.push(...(await this.report(payloads)))
           break
@@ -72,9 +72,14 @@ export class MemorySentinel<
       }
     } catch (ex) {
       const error = ex as Error
-      resultPayloads.push(new ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build())
+      resultPayloads.push(
+        new ModuleErrorBuilder()
+          .sources([await wrapper.hashAsync()])
+          .message(error.message)
+          .build(),
+      )
     }
-    return await this.bindQueryResult(typedQuery, resultPayloads, [queryAccount])
+    return await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount])
   }
 
   private async generatePayloads(witnesses: WitnessWrapper[]): Promise<Payload[]> {

package/src/SentinelIntervalAutomationWrapper.ts

@@ -6,40 +6,42 @@ export class SentinelIntervalAutomationWrapper<
   T extends SentinelIntervalAutomationPayload = SentinelIntervalAutomationPayload,
 > extends PayloadWrapper<T> {
   protected get frequencyMillis() {
-    if (this.payload.frequency === undefined) return Infinity
-    switch (this.payload.frequencyUnits ?? 'hour') {
+    const frequency = this.payload().frequency
+    if (frequency === undefined) return Infinity
+    switch (this.payload().frequencyUnits ?? 'hour') {
       case 'minute':
-        return this.payload.frequency * 60 * 1000
+        return frequency * 60 * 1000
       case 'hour':
-        return this.payload.frequency * 60 * 60 * 1000
+        return frequency * 60 * 60 * 1000
       case 'day':
-        return this.payload.frequency * 24 * 60 * 60 * 1000
+        return frequency * 24 * 60 * 60 * 1000
     }
   }
 
   protected get remaining() {
     //if remaining is not defined, we assume Infinity
-    return this.payload.remaining ?? Infinity
+    return this.payload().remaining ?? Infinity
   }
 
   next() {
-    this.payload.start = this.payload.start + this.frequencyMillis
+    this.payload().start = this.payload().start + this.frequencyMillis
     this.consumeRemaining()
     this.checkEnd()
     return this
   }
 
   protected checkEnd() {
-    if (this.payload.start > (this.payload.end ?? Infinity)) {
-      this.payload.start = Infinity
+    if (this.payload().start > (this.payload().end ?? Infinity)) {
+      this.payload().start = Infinity
     }
   }
 
   protected consumeRemaining(count = 1) {
-    this.payload.remaining = this.remaining - count
+    const remaining = this.remaining - count
+    this.payload().remaining = remaining
 
-    if (this.payload.remaining <= 0) {
-      this.payload.start = Infinity
+    if (remaining <= 0) {
+      this.payload().start = Infinity
     }
   }
 }

package/src/SentinelRunner.ts

@@ -33,7 +33,7 @@ export class SentinelRunner {
   }
 
   async add(automation: SentinelAutomationPayload, restart = true) {
-    const hash = new PayloadWrapper(automation).hash
+    const hash = await PayloadWrapper.hashAsync(automation)
     this._automations[hash] = automation
     if (restart) await this.restart()
     return hash
@@ -93,9 +93,9 @@ export class SentinelRunner {
 
   private async trigger(automation: SentinelIntervalAutomationPayload) {
     const wrapper = new SentinelIntervalAutomationWrapper(automation)
-    await this.remove(wrapper.hash, false)
+    await this.remove(await wrapper.hashAsync(), false)
     wrapper.next()
-    await this.add(wrapper.payload, false)
+    await this.add(wrapper.payload(), false)
     const triggerResult = await this.sentinel.report()
     this.onTriggerResult?.(triggerResult)
     await this.start()