@xyo-network/sentinel 2.53.20 → 2.53.22

package/dist/esm/MemorySentinel.js

@@ -6,7 +6,25 @@ import { AbstractSentinel } from './AbstractSentinel';
 import { SentinelReportQuerySchema } from './Queries';
 export class MemorySentinel extends AbstractSentinel {
     static configSchema;
-    async query(query, payloads, queryConfig) {
+    async report(payloads = []) {
+        const errors = [];
+        await this.emit('reportStart', { inPayloads: payloads, module: this });
+        const allWitnesses = [...(await this.getWitnesses())];
+        const allPayloads = [];
+        try {
+            const generatedPayloads = compact(await this.generatePayloads(allWitnesses));
+            const combinedPayloads = [...generatedPayloads, ...payloads];
+            allPayloads.push(...combinedPayloads);
+        }
+        catch (e) {
+            errors.push(e);
+        }
+        const [boundWitness] = await this.bindResult(allPayloads);
+        this.history.push(assertEx(boundWitness));
+        await this.emit('reportEnd', { boundWitness, errors, inPayloads: payloads, module: this, outPayloads: allPayloads });
+        return [boundWitness, ...allPayloads];
+    }
+    async queryHandler(query, payloads, queryConfig) {
         const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
         const typedQuery = wrapper.query;
         assertEx(this.queryable(query, payloads, queryConfig));
@@ -19,7 +37,7 @@ export class MemorySentinel extends AbstractSentinel {
                     break;
                 }
                 default:
-                    return super.query(query, payloads);
+                    return super.queryHandler(query, payloads);
             }
         }
         catch (ex) {
@@ -28,24 +46,6 @@ export class MemorySentinel extends AbstractSentinel {
         }
         return await this.bindResult(resultPayloads, queryAccount);
     }
-    async report(payloads = []) {
-        const errors = [];
-        await this.emit('reportStart', { inPayloads: payloads, module: this });
-        const allWitnesses = [...(await this.getWitnesses())];
-        const allPayloads = [];
-        try {
-            const generatedPayloads = compact(await this.generatePayloads(allWitnesses));
-            const combinedPayloads = [...generatedPayloads, ...payloads];
-            allPayloads.push(...combinedPayloads);
-        }
-        catch (e) {
-            errors.push(e);
-        }
-        const [boundWitness] = await this.bindResult(allPayloads);
-        this.history.push(assertEx(boundWitness));
-        await this.emit('reportEnd', { boundWitness, errors, inPayloads: payloads, module: this, outPayloads: allPayloads });
-        return [boundWitness, ...allPayloads];
-    }
     async generatePayloads(witnesses) {
         return (await Promise.all(witnesses?.map(async (witness) => await witness.observe()))).flat();
     }

package/dist/esm/MemorySentinel.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemorySentinel.js","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MemorySentinel.js","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"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"}

package/dist/esm/Wrapper.js

@@ -1,23 +1,9 @@
-import { assertEx } from '@xylabs/assert';
-import { ModuleWrapper } from '@xyo-network/module';
+import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { SentinelReportQuerySchema } from './Queries';
+constructableModuleWrapper();
 export class SentinelWrapper extends ModuleWrapper {
     static requiredQueries = [SentinelReportQuerySchema, ...super.requiredQueries];
-    static tryWrap(module, account) {
-        if (module) {
-            const missingRequiredQueries = this.missingRequiredQueries(module);
-            if (missingRequiredQueries.length > 0) {
-                //console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
-            }
-            else {
-                return new SentinelWrapper({ account, module: module });
-            }
-        }
-    }
-    static wrap(module, account) {
-        return assertEx(this.tryWrap(module, account), 'Unable to wrap module as DivinerWrapper');
-    }
     async report(payloads) {
         const queryPayload = PayloadWrapper.parse({ schema: SentinelReportQuerySchema });
         const result = await this.sendQuery(queryPayload, payloads);

package/dist/esm/Wrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAGnD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAuB,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAG1E,MAAM,OAAO,eAAiE,SAAQ,aAAsB;IAC1G,MAAM,CAAU,eAAe,GAAG,CAAC,yBAAyB,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEvF,MAAM,CAAU,OAAO,CAAC,MAAe,EAAE,OAAyB;QAChE,IAAI,MAAM,EAAE;YACV,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;YAClE,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrC,qFAAqF;aACtF;iBAAM;gBACL,OAAO,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,MAAwB,EAAE,CAAC,CAAA;aAC1E;SACF;IACH,CAAC;IAED,MAAM,CAAU,IAAI,CAAC,MAAe,EAAE,OAAyB;QAC7D,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,yCAAyC,CAAC,CAAA;IAC3F,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAoB;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAsB,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACrG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QAC3D,OAAO,MAAM,CAAA;IACf,CAAC"}
+{"version":3,"file":"Wrapper.js","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE/E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAuB,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAG1E,0BAA0B,EAAE,CAAA;AAC5B,MAAM,OAAO,eAAiE,SAAQ,aAAsB;IAC1G,MAAM,CAAU,eAAe,GAAG,CAAC,yBAAyB,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEvF,KAAK,CAAC,MAAM,CAAC,QAAoB;QAC/B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAsB,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACrG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QAC3D,OAAO,MAAM,CAAA;IACf,CAAC"}

package/dist/types/MemorySentinel.d.ts

@@ -6,8 +6,8 @@ import { SentinelModule, SentinelModuleEventData, SentinelParams } from './Senti
 export type MemorySentinelParams<TConfig extends AnyConfigSchema<SentinelConfig> = AnyConfigSchema<SentinelConfig>> = SentinelParams<AnyConfigSchema<TConfig>>;
 export declare class MemorySentinel<TParams extends MemorySentinelParams = MemorySentinelParams, TEventData extends SentinelModuleEventData = SentinelModuleEventData> extends AbstractSentinel<TParams, TEventData> implements SentinelModule<TParams, TEventData> {
     static configSchema: SentinelConfigSchema;
-    query<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
     report(payloads?: Payload[]): Promise<Payload[]>;
+    protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
     private generatePayloads;
 }
 //# sourceMappingURL=MemorySentinel.d.ts.map

package/dist/types/MemorySentinel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemorySentinel.d.ts","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,YAAY,EAEZ,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAE/D,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEzF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,eAAe,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,IAAI,cAAc,CAClI,eAAe,CAAC,OAAO,CAAC,CACzB,CAAA;AAED,qBAAa,cAAc,CACvB,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,UAAU,SAAS,uBAAuB,GAAG,uBAAuB,CAEtE,SAAQ,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAC5C,YAAW,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC;IAE9C,OAAgB,YAAY,EAAE,oBAAoB,CAAA;IAEnC,KAAK,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAC/G,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IAsBvB,MAAM,CAAC,QAAQ,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YAoB5C,gBAAgB;CAG/B"}
+{"version":3,"file":"MemorySentinel.d.ts","sourceRoot":"","sources":["../../src/MemorySentinel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,YAAY,EAEZ,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAE/D,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEzF,MAAM,MAAM,oBAAoB,CAAC,OAAO,SAAS,eAAe,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,IAAI,cAAc,CAClI,eAAe,CAAC,OAAO,CAAC,CACzB,CAAA;AAED,qBAAa,cAAc,CACvB,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,EAC3D,UAAU,SAAS,uBAAuB,GAAG,uBAAuB,CAEtE,SAAQ,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAC5C,YAAW,cAAc,CAAC,OAAO,EAAE,UAAU,CAAC;IAE9C,OAAgB,YAAY,EAAE,oBAAoB,CAAA;IAE5C,MAAM,CAAC,QAAQ,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAoBjC,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;YAsBf,gBAAgB;CAG/B"}

package/dist/types/Wrapper.d.ts

@@ -1,12 +1,8 @@
-import { AccountInstance } from '@xyo-network/account-model';
 import { ModuleWrapper } from '@xyo-network/module';
-import { Module } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { SentinelModule } from './SentinelModel';
 export declare class SentinelWrapper<TModule extends SentinelModule = SentinelModule> extends ModuleWrapper<TModule> implements SentinelModule {
     static requiredQueries: string[];
-    static tryWrap(module?: Module, account?: AccountInstance): SentinelWrapper | undefined;
-    static wrap(module?: Module, account?: AccountInstance): SentinelWrapper;
     report(payloads?: Payload[]): Promise<Payload[]>;
 }
 //# sourceMappingURL=Wrapper.d.ts.map

package/dist/types/Wrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAEhD,qBAAa,eAAe,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAE,YAAW,cAAc;IACpI,OAAgB,eAAe,WAAwD;WAEvE,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;WAWhF,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,eAAe;IAI3E,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAKvD"}
+{"version":3,"file":"Wrapper.d.ts","sourceRoot":"","sources":["../../src/Wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAIpD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAGhD,qBAAa,eAAe,CAAC,OAAO,SAAS,cAAc,GAAG,cAAc,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAE,YAAW,cAAc;IACpI,OAAgB,eAAe,WAAwD;IAEjF,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAKvD"}

package/package.json

@@ -11,18 +11,18 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.6",
-    "@xyo-network/account": "^2.53.20",
-    "@xyo-network/account-model": "^2.53.20",
-    "@xyo-network/archivist": "^2.53.20",
-    "@xyo-network/archivist-wrapper": "^2.53.20",
-    "@xyo-network/boundwitness-model": "^2.53.20",
-    "@xyo-network/core": "^2.53.20",
-    "@xyo-network/module": "^2.53.20",
-    "@xyo-network/module-model": "^2.53.20",
-    "@xyo-network/payload-model": "^2.53.20",
-    "@xyo-network/payload-wrapper": "^2.53.20",
-    "@xyo-network/promise": "^2.53.20",
-    "@xyo-network/witness": "^2.53.20",
+    "@xyo-network/account": "^2.53.22",
+    "@xyo-network/account-model": "^2.53.22",
+    "@xyo-network/archivist": "^2.53.22",
+    "@xyo-network/archivist-wrapper": "^2.53.22",
+    "@xyo-network/boundwitness-model": "^2.53.22",
+    "@xyo-network/core": "^2.53.22",
+    "@xyo-network/module": "^2.53.22",
+    "@xyo-network/module-model": "^2.53.22",
+    "@xyo-network/payload-model": "^2.53.22",
+    "@xyo-network/payload-wrapper": "^2.53.22",
+    "@xyo-network/promise": "^2.53.22",
+    "@xyo-network/witness": "^2.53.22",
     "lodash": "^4.17.21"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -64,5 +64,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.53.20"
+  "version": "2.53.22"
 }

package/src/MemorySentinel.ts

@@ -30,7 +30,27 @@ export class MemorySentinel<
 {
   static override configSchema: SentinelConfigSchema
 
-  override async query<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
+  async report(payloads: Payload[] = []): Promise<Payload[]> {
+    const errors: Error[] = []
+    await this.emit('reportStart', { inPayloads: payloads, module: this as SentinelModule })
+    const allWitnesses = [...(await this.getWitnesses())]
+    const allPayloads: Payload[] = []
+
+    try {
+      const generatedPayloads = compact(await this.generatePayloads(allWitnesses))
+      const combinedPayloads = [...generatedPayloads, ...payloads]
+      allPayloads.push(...combinedPayloads)
+    } catch (e) {
+      errors.push(e as Error)
+    }
+
+    const [boundWitness] = await this.bindResult(allPayloads)
+    this.history.push(assertEx(boundWitness))
+    await this.emit('reportEnd', { boundWitness, errors, inPayloads: payloads, module: this as SentinelModule, outPayloads: allPayloads })
+    return [boundWitness, ...allPayloads]
+  }
+
+  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(
     query: T,
     payloads?: Payload[],
     queryConfig?: TConfig,
@@ -47,7 +67,7 @@ export class MemorySentinel<
           break
         }
         default:
-          return super.query(query, payloads)
+          return super.queryHandler(query, payloads)
       }
     } catch (ex) {
       const error = ex as Error
@@ -56,26 +76,6 @@ export class MemorySentinel<
     return await this.bindResult(resultPayloads, queryAccount)
   }
 
-  async report(payloads: Payload[] = []): Promise<Payload[]> {
-    const errors: Error[] = []
-    await this.emit('reportStart', { inPayloads: payloads, module: this as SentinelModule })
-    const allWitnesses = [...(await this.getWitnesses())]
-    const allPayloads: Payload[] = []
-
-    try {
-      const generatedPayloads = compact(await this.generatePayloads(allWitnesses))
-      const combinedPayloads = [...generatedPayloads, ...payloads]
-      allPayloads.push(...combinedPayloads)
-    } catch (e) {
-      errors.push(e as Error)
-    }
-
-    const [boundWitness] = await this.bindResult(allPayloads)
-    this.history.push(assertEx(boundWitness))
-    await this.emit('reportEnd', { boundWitness, errors, inPayloads: payloads, module: this as SentinelModule, outPayloads: allPayloads })
-    return [boundWitness, ...allPayloads]
-  }
-
   private async generatePayloads(witnesses: WitnessWrapper[]): Promise<Payload[]> {
     return (await Promise.all(witnesses?.map(async (witness) => await witness.observe()))).flat()
   }

package/src/Wrapper.ts

@@ -1,31 +1,14 @@
-import { assertEx } from '@xylabs/assert'
-import { AccountInstance } from '@xyo-network/account-model'
-import { ModuleWrapper } from '@xyo-network/module'
-import { Module } from '@xyo-network/module-model'
+import { constructableModuleWrapper, ModuleWrapper } from '@xyo-network/module'
 import { Payload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 import { SentinelReportQuery, SentinelReportQuerySchema } from './Queries'
 import { SentinelModule } from './SentinelModel'
 
+constructableModuleWrapper()
 export class SentinelWrapper<TModule extends SentinelModule = SentinelModule> extends ModuleWrapper<TModule> implements SentinelModule {
   static override requiredQueries = [SentinelReportQuerySchema, ...super.requiredQueries]
 
-  static override tryWrap(module?: Module, account?: AccountInstance): SentinelWrapper | undefined {
-    if (module) {
-      const missingRequiredQueries = this.missingRequiredQueries(module)
-      if (missingRequiredQueries.length > 0) {
-        //console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
-      } else {
-        return new SentinelWrapper({ account, module: module as SentinelModule })
-      }
-    }
-  }
-
-  static override wrap(module?: Module, account?: AccountInstance): SentinelWrapper {
-    return assertEx(this.tryWrap(module, account), 'Unable to wrap module as DivinerWrapper')
-  }
-
   async report(payloads?: Payload[]): Promise<Payload[]> {
     const queryPayload = PayloadWrapper.parse<SentinelReportQuery>({ schema: SentinelReportQuerySchema })
     const result = await this.sendQuery(queryPayload, payloads)