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

package/dist/cjs/AbstractWitness.js

@@ -4,8 +4,8 @@ exports.AbstractWitness = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = require("@xylabs/assert");
 const account_1 = require("@xyo-network/account");
+const core_1 = require("@xyo-network/core");
 const module_1 = require("@xyo-network/module");
-const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
 const Config_1 = require("./Config");
 const Queries_1 = require("./Queries");
 class AbstractWitness extends module_1.AbstractModule {
@@ -34,18 +34,18 @@ class AbstractWitness extends module_1.AbstractModule {
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const wrapper = module_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
-            const typedQuery = wrapper.query.payload;
+            const queryPayload = yield wrapper.getQuery();
             (0, assert_1.assertEx)(this.queryable(query, payloads, queryConfig));
             // Remove the query payload from the arguments passed to us so we don't observe it
-            const filteredObservation = (payloads === null || payloads === void 0 ? void 0 : payloads.filter((p) => new payload_wrapper_1.PayloadWrapper(p).hash !== query.query)) || [];
+            const filteredObservation = yield core_1.PayloadHasher.filterExclude(payloads, query.query);
             const queryAccount = new account_1.Account();
             try {
-                switch (typedQuery.schema) {
+                switch (queryPayload.schema) {
                     case Queries_1.WitnessObserveQuerySchema: {
                         yield this.emit('reportStart', { inPayloads: payloads, module: this });
                         const resultPayloads = yield this.observe(filteredObservation);
                         yield this.emit('reportEnd', { inPayloads: payloads, module: this, outPayloads: resultPayloads });
-                        return this.bindQueryResult(typedQuery, resultPayloads, [queryAccount]);
+                        return this.bindQueryResult(queryPayload, resultPayloads, [queryAccount]);
                     }
                     default: {
                         return _super.queryHandler.call(this, query, payloads);
@@ -54,7 +54,12 @@ class AbstractWitness extends module_1.AbstractModule {
             }
             catch (ex) {
                 const error = ex;
-                return this.bindQueryResult(typedQuery, [new module_1.ModuleErrorBuilder().sources([wrapper.hash]).message(error.message).build()], [queryAccount]);
+                return this.bindQueryResult(queryPayload, [
+                    new module_1.ModuleErrorBuilder()
+                        .sources([yield wrapper.hashAsync()])
+                        .message(error.message)
+                        .build(),
+                ], [queryAccount]);
             }
         });
     }

package/dist/cjs/AbstractWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAA8C;AAC9C,gDAAsJ;AAEtJ,kEAA6D;AAG7D,qCAA8C;AAC9C,uCAAqF;AAGrF,MAAa,eACX,SAAQ,uBAAmC;IAK3C,IAAa,OAAO;QAClB,OAAO,CAAC,mCAAyB,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAA;IAC/B,CAAC;IAED,IAAuB,kBAAkB;QACvC,OAAO;YACL,mCAAmC,EAAE,KAAK;SAC3C,CAAA;IACH,CAAC;IAED,OAAO,CAAC,QAAoB;QAC1B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAA;QACnE,IAAA,iBAAQ,EAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,8BAA8B,CAAC,CAAA;QAChE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAA;QACtF,OAAO,WAAW,CAAA;IACpB,CAAC;IAEwB,YAAY,CACnC,KAAQ,EACR,QAAoB,EACpB,WAAqB;;;;;YAErB,MAAM,OAAO,GAAG,iCAAwB,CAAC,UAAU,CAAe,KAAK,EAAE,QAAQ,CAAC,CAAA;YAClF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;YACxC,IAAA,iBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;YACtD,kFAAkF;YAClF,MAAM,mBAAmB,GAAG,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,gCAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,KAAI,EAAE,CAAA;YACrG,MAAM,YAAY,GAAG,IAAI,iBAAO,EAAE,CAAA;YAClC,IAAI;gBACF,QAAQ,UAAU,CAAC,MAAM,EAAE;oBACzB,KAAK,mCAAyB,CAAC,CAAC;wBAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;wBACtE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;wBAC9D,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAA;wBACjG,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,cAAc,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;qBACxE;oBACD,OAAO,CAAC,CAAC;wBACP,OAAO,OAAM,YAAY,YAAC,KAAK,EAAE,QAAQ,EAAC;qBAC3C;iBACF;aACF;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,CAAC,IAAI,2BAAkB,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;aAC3I;QACH,CAAC;KAAA;;AAvDH,0CAwDC;AApDiB,4BAAY,GAAW,4BAAmB,CAAA"}
+{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAA8C;AAC9C,4CAAiD;AACjD,gDAAsJ;AAItJ,qCAA8C;AAC9C,uCAAqF;AAGrF,MAAa,eACX,SAAQ,uBAAmC;IAK3C,IAAa,OAAO;QAClB,OAAO,CAAC,mCAAyB,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;IACtD,CAAC;IAED,IAAI,SAAS;;QACX,OAAO,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,CAAA;IAC/B,CAAC;IAED,IAAuB,kBAAkB;QACvC,OAAO;YACL,mCAAmC,EAAE,KAAK;SAC3C,CAAA;IACH,CAAC;IAED,OAAO,CAAC,QAAoB;QAC1B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,WAAW,GAAG,IAAA,iBAAQ,EAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAA;QACnE,IAAA,iBAAQ,EAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,8BAA8B,CAAC,CAAA;QAChE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,iBAAQ,EAAC,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAA;QACtF,OAAO,WAAW,CAAA;IACpB,CAAC;IAEwB,YAAY,CACnC,KAAQ,EACR,QAAoB,EACpB,WAAqB;;;;;YAErB,MAAM,OAAO,GAAG,iCAAwB,CAAC,UAAU,CAAe,KAAK,EAAE,QAAQ,CAAC,CAAA;YAClF,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAA;YAC7C,IAAA,iBAAQ,EAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;YACtD,kFAAkF;YAClF,MAAM,mBAAmB,GAAG,MAAM,oBAAa,CAAC,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;YACpF,MAAM,YAAY,GAAG,IAAI,iBAAO,EAAE,CAAA;YAClC,IAAI;gBACF,QAAQ,YAAY,CAAC,MAAM,EAAE;oBAC3B,KAAK,mCAAyB,CAAC,CAAC;wBAC9B,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;wBACtE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;wBAC9D,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC,CAAA;wBACjG,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,cAAc,EAAE,CAAC,YAAY,CAAC,CAAC,CAAA;qBAC1E;oBACD,OAAO,CAAC,CAAC;wBACP,OAAO,OAAM,YAAY,YAAC,KAAK,EAAE,QAAQ,EAAC;qBAC3C;iBACF;aACF;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,KAAK,GAAG,EAAW,CAAA;gBACzB,OAAO,IAAI,CAAC,eAAe,CACzB,YAAY,EACZ;oBACE,IAAI,2BAAkB,EAAE;yBACrB,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;yBACpC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;yBACtB,KAAK,EAAE;iBACX,EACD,CAAC,YAAY,CAAC,CACf,CAAA;aACF;QACH,CAAC;KAAA;;AAhEH,0CAiEC;AA7DiB,4BAAY,GAAW,4BAAmB,CAAA"}

package/dist/cjs/WitnessWrapper.js

@@ -9,7 +9,7 @@ const Queries_1 = require("./Queries");
 class WitnessWrapper extends (_b = module_1.ModuleWrapper) {
     observe(payloads) {
         const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ schema: Queries_1.WitnessObserveQuerySchema });
-        return this.sendQuery(queryPayload, [queryPayload.payload, ...(payloads !== null && payloads !== void 0 ? payloads : [])]);
+        return this.sendQuery(queryPayload, [queryPayload.payload(), ...(payloads !== null && payloads !== void 0 ? payloads : [])]);
     }
 }
 exports.WitnessWrapper = WitnessWrapper;

package/dist/cjs/WitnessWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAA+E;AAE/E,kEAA6D;AAE7D,uCAA0E;AAG1E,IAAA,mCAA0B,GAAE,CAAA;AAC5B,MAAa,cAAe,SAAQ,MAAA,sBAAa,CAAA;IAG/C,OAAO,CAAC,QAAoB;QAC1B,MAAM,YAAY,GAAG,gCAAc,CAAC,KAAK,CAAsB,EAAE,MAAM,EAAE,mCAAyB,EAAE,CAAC,CAAA;QACrG,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;;AANH,wCAOC;;AANiB,8BAAe,GAAG,CAAC,mCAAyB,EAAE,GAAG,sCAAqB,CAAC,CAAA;AAQzF,6CAA6C;AAC7C,MAAa,iBAAkB,SAAQ,cAAc;CAAG;AAAxD,8CAAwD"}
+{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":";;;;AAAA,gDAA+E;AAE/E,kEAA6D;AAE7D,uCAA0E;AAG1E,IAAA,mCAA0B,GAAE,CAAA;AAC5B,MAAa,cAAe,SAAQ,MAAA,sBAAa,CAAA;IAG/C,OAAO,CAAC,QAAoB;QAC1B,MAAM,YAAY,GAAG,gCAAc,CAAC,KAAK,CAAsB,EAAE,MAAM,EAAE,mCAAyB,EAAE,CAAC,CAAA;QACrG,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IACpF,CAAC;;AANH,wCAOC;;AANiB,8BAAe,GAAG,CAAC,mCAAyB,EAAE,GAAG,sCAAqB,CAAC,CAAA;AAQzF,6CAA6C;AAC7C,MAAa,iBAAkB,SAAQ,cAAc;CAAG;AAAxD,8CAAwD"}