@xyo-network/module-abstract 2.64.9 → 2.65.0

package/dist/cjs/AbstractIndirectModule.js

@@ -6,6 +6,7 @@ const assert_1 = require("@xylabs/assert");
 const exists_1 = require("@xylabs/exists");
 const account_1 = require("@xyo-network/account");
 const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
+const archivist_wrapper_1 = require("@xyo-network/archivist-wrapper");
 const boundwitness_builder_1 = require("@xyo-network/boundwitness-builder");
 const config_payload_plugin_1 = require("@xyo-network/config-payload-plugin");
 const error_1 = require("@xyo-network/error");
@@ -18,9 +19,6 @@ const shared_1 = require("@xyo-network/shared");
 const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
 const BaseEmitter_1 = require("./BaseEmitter");
 const Error_1 = require("./Error");
-const lib_1 = require("./lib");
-const ModuleFactory_1 = require("./ModuleFactory");
-const Query_1 = require("./Query");
 const QueryValidator_1 = require("./QueryValidator");
 const Resolver_1 = require("./Resolver");
 /** @description Abstract class for modules that allow access only through querying and not through direct calls  */
@@ -46,6 +44,7 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
             [module_model_1.ModuleSubscribeQuerySchema]: undefined,
         };
         this._started = false;
+        this._busyCount = 0;
         this.commitArchivist = () => this.getArchivist('commit');
         this.readArchivist = () => this.getArchivist('read');
         this.writeArchivist = () => this.getArchivist('write');
@@ -99,12 +98,33 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
         });
     }
     static factory(params) {
-        return ModuleFactory_1.ModuleFactory.withParams(this, params);
+        return module_model_1.ModuleFactory.withParams(this, params);
     }
     addressPreviousHash() {
         var _a;
         return { address: this.address, previousHash: (_a = this._account) === null || _a === void 0 ? void 0 : _a.previousHash, schema: module_model_1.AddressPreviousHashSchema };
     }
+    busy(closure) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this._busyCount <= 0) {
+                this._busyCount = 0;
+                const args = { busy: true, module: this };
+                yield this.emit('moduleBusy', args);
+            }
+            this._busyCount++;
+            try {
+                return yield closure();
+            }
+            finally {
+                this._busyCount--;
+                if (this._busyCount <= 0) {
+                    this._busyCount = 0;
+                    const args = { busy: false, module: this };
+                    yield this.emit('moduleBusy', args);
+                }
+            }
+        });
+    }
     loadAccount() {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -157,10 +177,12 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
     query(query, payloads, queryConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             this.started('throw');
-            const result = yield this.queryHandler((0, assert_1.assertEx)(Query_1.QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig);
-            const args = { module: this, payloads, query, result };
-            yield this.emit('moduleQueried', args);
-            return result;
+            return yield this.busy(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                const result = yield this.queryHandler((0, assert_1.assertEx)(boundwitness_builder_1.QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig);
+                const args = { module: this, payloads, query, result };
+                yield this.emit('moduleQueried', args);
+                return result;
+            }));
         });
     }
     queryable(query, payloads, queryConfig) {
@@ -173,17 +195,15 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
         return validators.every((validator) => validator(query, payloads));
     }
     resolve(nameOrAddressOrFilter) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             switch (typeof nameOrAddressOrFilter) {
                 case 'string': {
-                    const byAddress = account_1.Account.isAddress(nameOrAddressOrFilter)
-                        ? (yield this.resolve({ address: [nameOrAddressOrFilter] })).pop()
-                        : undefined;
-                    return byAddress !== null && byAddress !== void 0 ? byAddress : (yield this.resolve({ name: [nameOrAddressOrFilter] })).pop();
+                    return (_a = (yield this.downResolver.resolve(nameOrAddressOrFilter))) !== null && _a !== void 0 ? _a : (yield this.upResolver.resolve(nameOrAddressOrFilter));
                 }
                 default: {
                     const filter = nameOrAddressOrFilter;
-                    return [...(yield this.downResolver.resolve(filter)), ...(yield this.upResolver.resolve(filter))].filter(lib_1.duplicateModules);
+                    return [...(yield this.downResolver.resolve(filter)), ...(yield this.upResolver.resolve(filter))].filter(module_model_1.duplicateModules);
                 }
             }
         });
@@ -246,7 +266,7 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
     }
     bindQueryInternal(query, payloads, account) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const builder = new Query_1.QueryBoundWitnessBuilder().payloads(payloads).witness(this.account).query(query);
+            const builder = new boundwitness_builder_1.QueryBoundWitnessBuilder().payloads(payloads).witness(this.account).query(query);
             const result = yield (account ? builder.witness(account) : builder).build();
             return result;
         });
@@ -317,7 +337,7 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
     queryHandler(query, payloads, queryConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             this.started('throw');
-            const wrapper = Query_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
+            const wrapper = boundwitness_builder_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
             if (!this.allowAnonymous) {
                 if (query.addresses.length === 0) {
                     console.warn(`Anonymous Queries not allowed, but running anyway [${this.config.name}], [${this.address}]`);
@@ -382,7 +402,7 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
                             return this.validateConfig(value, [...parents, key]) && valid;
                         }, true) && valid);
                     }
-                    if (!(0, lib_1.serializableField)(value)) {
+                    if (!(0, module_model_1.serializableField)(value)) {
                         (_b = this.logger) === null || _b === void 0 ? void 0 : _b.warn(`Fields that are not serializable to JSON are not allowed in config [${parents === null || parents === void 0 ? void 0 : parents.join('.')}.${key}]`);
                         return false;
                     }
@@ -401,8 +421,8 @@ class AbstractIndirectModule extends BaseEmitter_1.BaseEmitter {
             const filter = typeof this.config.archivist === 'string' || this.config.archivist instanceof String
                 ? this.config.archivist
                 : (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.archivist) === null || _b === void 0 ? void 0 : _b[kind];
-            const resolved = yield this.upResolver.resolveOne(filter);
-            return resolved ? resolved : undefined;
+            const resolved = yield this.upResolver.resolve(filter);
+            return resolved ? archivist_wrapper_1.IndirectArchivistWrapper.wrap(resolved, this.account) : undefined;
         });
     }
 }

package/dist/cjs/AbstractIndirectModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractIndirectModule.js","sourceRoot":"","sources":["../../src/AbstractIndirectModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractIndirectModule.js","sourceRoot":"","sources":["../../src/AbstractIndirectModule.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,2CAAuC;AACvC,kDAA+C;AAE/C,gFAAmF;AAEnF,sEAAyE;AACzE,4EAA8I;AAE9I,8EAAgF;AAChF,8CAAqD;AACrD,gEAAgG;AAChG,4DA6BkC;AAClC,kEAA6D;AAG7D,kDAA4D;AAC5D,4EAA6E;AAC7E,gDAA8C;AAC9C,qEAAoC;AAEpC,+CAA2C;AAC3C,mCAA4C;AAC5C,qDAAiG;AACjG,yCAAoD;AAEpD,oHAAoH;AAEpH,MAAsB,sBACpB,SAAQ,yBAAgC;IA6BxC,YAAY,qBAA6B,EAAE,MAAe;QACxD,IAAA,iBAAQ,EAAC,sBAAsB,CAAC,qBAAqB,KAAK,qBAAqB,EAAE,4CAA4C,CAAC,CAAA;QAC9H,0DAA0D;QAC1D,MAAM,aAAa,GAAG,kBAAK,MAAM,CAAa,CAAA;QAC9C,KAAK,CAAC,aAAa,CAAC,CAAA;QA1Bb,iBAAY,GAAG,IAAI,kCAAuB,EAAE,CAAA;QAC5C,eAAU,GAAG,IAAI,kCAAuB,EAAE,CAAA;QAEzC,aAAQ,GAAgC,SAAS,CAAA;QACxC,iCAA4B,GAA8C;YAC3F,CAAC,uCAAwB,CAAC,EAAE,GAAG;YAC/B,CAAC,wCAAyB,CAAC,EAAE,GAAG;YAChC,CAAC,wCAAyB,CAAC,EAAE,GAAG;YAChC,CAAC,yCAA0B,CAAC,EAAE,GAAG;SAClC,CAAA;QACkB,mBAAc,GAAmE;YAClG,CAAC,uCAAwB,CAAC,EAAE,SAAS;YACrC,CAAC,wCAAyB,CAAC,EAAE,SAAS;YACtC,CAAC,wCAAyB,CAAC,EAAE,SAAS;YACtC,CAAC,yCAA0B,CAAC,EAAE,SAAS;SACxC,CAAA;QACS,aAAQ,GAAG,KAAK,CAAA;QAIlB,eAAU,GAAG,CAAC,CAAA;QAoRZ,oBAAe,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QA8GnD,kBAAa,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QAkC/C,mBAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QA5ZzD,IAAI,CAAC,uBAAuB,GAAG,IAAI,wCAAuB,CAAC,IAAsB,CAAC,CAAC,SAAS,CAAA;QAC5F,IAAI,CAAC,0BAA0B,GAAG,IAAI,2CAA0B,CAAC,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAC,CAAC,SAAS,CAAA;IACnG,CAAC;IAED,MAAM,KAAK,YAAY;QACrB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAA;IAC9B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAA,iBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;IACnD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;IAC7B,CAAC;IAED,IAAI,cAAc;;QAChB,OAAO,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,QAAQ,0CAAE,cAAc,CAAA,CAAA;IAC/C,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAA;IAC3B,CAAC;IAED,IAAI,4BAA4B;QAC9B,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAA;IACnD,CAAC;IAED,IAAI,OAAO;QACT,OAAO,CAAC,wCAAyB,EAAE,uCAAwB,EAAE,yCAA0B,CAAC,CAAA;IAC1F,CAAC;IAED,IAAI,iBAAiB;QACnB,uCAAY,IAAI,CAAC,4BAA4B,GAAK,IAAI,CAAC,kBAAkB,EAAE;IAC7E,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,cAAc,CAAA;IAC5B,CAAC;IAID,MAAM,CAAO,MAAM,CAAiE,MAA0B;;;YAC5G,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1D,MAAM,KAAK,CAAC,yBAAyB,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,MAAM,KAAK,IAAI,CAAC,IAAI,GAAG,CAAC,CAAA;aAC9E;YACD,MAAM,MAAM,GAAW,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,MAAM,mCAAI,IAAI,CAAC,YAAY,CAAA;YAClE,MAAM,cAAc,GAAa,IAAI,CAAC,aAAa,CAAA;YAEnD,IAAA,iBAAQ,EACN,cAAc,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,KAAK,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,EAC7E,+BAA+B,MAAM,eAAe,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CACtF,CAAA;YACD,MAAM,aAAa,mCAAqC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAE,MAAM,GAAE,CAAA;YAChF,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAC1E,MAAM,aAAa,GAAG,gCAAK,MAAM,KAAE,MAAM,EAAE,aAAa,GAAuB,CAAA;YAC/E,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAA;YACvF,MAAM,CAAA,MAAA,SAAS,CAAC,WAAW,yDAAI,CAAA,CAAA;YAC/B,MAAM,CAAA,MAAA,SAAS,CAAC,KAAK,yDAAI,CAAA,CAAA;YACzB,OAAO,SAAS,CAAA;;KACjB;IAED,MAAM,CAAC,OAAO,CAAiE,MAA0B;QACvG,OAAO,4BAAa,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC/C,CAAC;IAED,mBAAmB;;QACjB,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,MAAA,IAAI,CAAC,QAAQ,0CAAE,YAAY,EAAE,MAAM,EAAE,wCAAyB,EAAE,CAAA;IAChH,CAAC;IAEK,IAAI,CAAI,OAAyB;;YACrC,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE;gBACxB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAA;gBACnB,MAAM,IAAI,GAAwB,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;gBAC9D,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;aACpC;YACD,IAAI,CAAC,UAAU,EAAE,CAAA;YACjB,IAAI;gBACF,OAAO,MAAM,OAAO,EAAE,CAAA;aACvB;oBAAS;gBACR,IAAI,CAAC,UAAU,EAAE,CAAA;gBACjB,IAAI,IAAI,CAAC,UAAU,IAAI,CAAC,EAAE;oBACxB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAA;oBACnB,MAAM,IAAI,GAAwB,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;oBAC/D,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAA;iBACpC;aACF;QACH,CAAC;KAAA;IAEK,WAAW;;;YACf,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,MAAM,YAAY,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,mCAAI,sBAAsB,CAAC,aAAa,CAAA;gBAC/E,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,MAAgD,CAAA;gBACvE,MAAM,EAAE,MAAM,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC,MAA+C,CAAA;gBAC9F,IAAI,MAAM,EAAE;oBACV,OAAO,GAAG,IAAA,iBAAQ,EAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAA;iBAC1I;gBACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,iBAAQ,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBACxG,IAAI,CAAC,OAAO;oBAAE,OAAO,CAAC,IAAI,CAAC,8EAA8E,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAA;gBAC/H,IAAI,CAAC,QAAQ,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,CAAC,MAAM,kBAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;aACrD;YACD,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAsB,CAAC,CAAA;YAC7C,OAAO,IAAI,CAAC,QAAQ,CAAA;;KACrB;IAED,QAAQ;QACN,MAAM,IAAI,GAAG,IAAA,iBAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,sDAAsD,CAAC,CAAA;QAC/F,OAAO,EAAE,MAAM,kBAAI,IAAI,IAAK,IAAI,CAAC,MAAM,CAAE,EAAE,MAAM,EAAE,4CAA2B,EAAE,CAAA;IAClF,CAAC;IAED,kBAAkB;QAChB,wDAAwD;QACxD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC;aACrD,MAAM,CAAC,CAAC,KAAK,EAAsC,EAAE;YACpD,OAAO,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QACzB,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;YACvB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;YAC/B,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;YACzC,OAAO;gBACL,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,sCAAa,EAAE;gBACxC,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,wCAAyB,EAAE;aAC7D,CAAA;QACH,CAAC,CAAC,CAAA;QACJ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAA;QACjC,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,sCAAa,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,sCAAa,EAAE,CAAA;QAC1G,MAAM,yBAAyB,GAAG,YAAY;YAC5C,CAAC,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,wCAAyB,EAAE;YAC9D,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,wCAAyB,EAAE,CAAA;QAClD,OAAO,CAAC,aAAa,EAAE,yBAAyB,EAAE,GAAG,aAAa,CAAC,CAAC,IAAI,EAAE,CAAA;IAC5E,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAA;IAClC,CAAC;IAEK,KAAK,CACT,KAAQ,EACR,QAAoB,EACpB,WAAqB;;YAErB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACrB,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAS,EAAE;gBAChC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,IAAA,iBAAQ,EAAC,+CAAwB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;gBAE/G,MAAM,IAAI,GAA2B,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;gBAC9E,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;gBAEtC,OAAO,MAAM,CAAA;YACf,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAED,SAAS,CACP,KAAQ,EACR,QAAoB,EACpB,WAAqB;QAErB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAA;QACvC,MAAM,eAAe,GAAG,WAAW;YACjC,CAAC,CAAC,IAAI,2CAA0B,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,SAAS;YACvF,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAA;QACnC,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,eAAe,CAAC,CAAA;QAElE,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;IACpE,CAAC;IAIK,OAAO,CACX,qBAA6C;;;YAE7C,QAAQ,OAAO,qBAAqB,EAAE;gBACpC,KAAK,QAAQ,CAAC,CAAC;oBACb,OAAO,MAAA,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAU,qBAAqB,CAAC,CAAC,mCAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAU,qBAAqB,CAAC,CAAC,CAAA;iBAC5I;gBACD,OAAO,CAAC,CAAC;oBACP,MAAM,MAAM,GAA6B,qBAAqB,CAAA;oBAC9D,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAU,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAU,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,+BAAgB,CAAC,CAAA;iBAC7I;aACF;;KACF;IAEK,KAAK,CAAC,QAAiB;;YAC3B,IAAI,CAAC,cAAc,EAAE,CAAA;YACrB,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAA;YACpC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACtB,CAAC;KAAA;IAED,OAAO,CAAC,gBAA8D;;QACpE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,QAAQ,gBAAgB,EAAE;gBACxB,KAAK,OAAO;oBACV,MAAM,KAAK,CAAC,uBAAuB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;gBACrD,KAAK,MAAM;oBACT,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,oBAAoB,CAAC,CAAA;oBACvC,MAAK;gBACP,KAAK,OAAO;oBACV,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,oBAAoB,CAAC,CAAA;oBACxC,MAAK;gBACP,KAAK,MAAM;oBACT,MAAK;gBACP,KAAK,KAAK,CAAC;gBACX;oBACE,MAAA,IAAI,CAAC,MAAM,0CAAE,GAAG,CAAC,oBAAoB,CAAC,CAAA;aACzC;SACF;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,SAAS,CAAC,aAA+B;QACvC,OAAM;IACR,CAAC;IAES,UAAU,CAAC,MAAgB,EAAE,MAAsB,EAAE,OAAyB;QACtF,MAAM,OAAO,GAAG,IAAI,mBAAS,CAAC,CAAC,OAAO,EAAE,EAAE;YACxC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;YAC/D,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,MAAM,CAAC,CAAA;YACjB,OAAO,MAAM,CAAA;QACf,CAAC,EAAE,OAAO,CAAC,CAAA;QACX,OAAO,OAAO,CAAA;IAChB,CAAC;IAEe,kBAAkB,CAAC,MAAgB,EAAE,MAAsB,EAAE,OAAyB;;;YACpG,MAAM,OAAO,GAAG,IAAI,0CAAmB,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YACtF,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;YAChF,MAAA,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAChE,OAAO,MAAM,CAAA;;KACd;IAES,SAAS,CACjB,KAAQ,EACR,QAAoB,EACpB,OAAyB;QAEzB,MAAM,OAAO,GAAG,IAAI,mBAAS,CAA6D,CAAO,OAAO,EAAE,EAAE;YAC1G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;YACrE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,MAAM,CAAC,CAAA;YACjB,OAAO,MAAM,CAAA;QACf,CAAC,CAAA,EAAE,OAAO,CAAC,CAAA;QACX,OAAO,OAAO,CAAA;IAChB,CAAC;IAEe,iBAAiB,CAC/B,KAAQ,EACR,QAAoB,EACpB,OAAyB;;YAEzB,MAAM,OAAO,GAAG,IAAI,+CAAwB,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACpG,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAA;YAC3E,OAAO,MAAM,CAAA;QACf,CAAC;KAAA;IAEe,eAAe,CAC7B,KAAQ,EACR,QAAmB,EACnB,sBAAyC,EAAE,EAC3C,MAAsB;;YAEtB,MAAM,OAAO,GAAG,IAAI,0CAAmB,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC3E,MAAM,mBAAmB,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,MAAmC,CAAC,CAAA;YACzF,MAAM,SAAS,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,mBAAmB,CAAC,CAAC,MAAM,CAAC,eAAM,CAAC,CAAA;YAC5F,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;YAC5B,MAAM,MAAM,GAAsB,CAAC,CAAC,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,CAAA;YACtF,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAC5B,CAAC;KAAA;IAIe,QAAQ;;;YACtB,MAAM,WAAW,GAA6B;gBAC5C,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,MAAM,EAAE,sCAAuB;aAChC,CAAA;YACD,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBACpB,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;aACpC;YAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;YAEtC,WAAW,CAAC,QAAQ,GAAG,IAAA,iBAAO,EAC5B,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;gBACxB,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,KAAK,sCAAa,CAAC,CAAC,CAAE,OAA0B,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;gBAClG,OAAO,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAA;YACtD,CAAC,CAAC,mCAAI,EAAE,CACT,CAAA;YAED,OAAO,WAAW,CAAA;;KACnB;IAES,QAAQ;QAChB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;QAC1B,MAAM,OAAO,GAAG,IAAI,gCAAc,CAAiB,EAAE,MAAM,EAAE,sCAAa,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;QAC/I,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACzC,OAAO,IAAI,gCAAc,CAAe,EAAE,MAAM,EAAE,kCAAW,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;QAC5F,CAAC,CAAC,CAAA;QACF,MAAM,YAAY,GAAkB;YAClC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,oCAAY;SACrB,CAAA;QACD,OAAO,IAAA,iBAAO,EAAC,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,CAAA;IAC7D,CAAC;IAEe,uBAAuB;;;YACrC,sCAAsC;YACtC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,eAAM,CAAC,CAAA;YAClE,MAAM,aAAa,GAAG,IAAI,GAAG,CAAS,KAAK,CAAC,CAAA;YAC5C,IAAA,iBAAQ,EAAC,aAAa,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,EAAE,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,EAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,+BAA+B,CAAC,CAAA;YACjI,mDAAmD;YACnD,MAAM,MAAM,GAAG,IAAI,CAAC,OAA8B,CAAA;YAClD,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,EAAE;gBACtB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,iBAAiB,EAAE;oBACxC,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE;wBACrE,MAAM,KAAK,GAAG,GAAgC,CAAA;wBAC9C,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAA;wBACtD,IAAI,gBAAgB,EAAE;4BACpB,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,MAAM,CAAA,MAAA,MAAM,CAAC,UAAU,uDAAG,gBAAgB,CAAC,CAAA,CAAA;yBACzE;qBACF;iBACF;aACF;;KACF;IAEe,YAAY,CAC1B,KAAQ,EACR,QAAoB,EACpB,WAAqB;;YAErB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YACrB,MAAM,OAAO,GAAG,+CAAwB,CAAC,UAAU,CAAc,KAAK,EAAE,QAAQ,CAAC,CAAA;YACjF,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;gBACxB,IAAI,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;oBAChC,OAAO,CAAC,IAAI,CAAC,sDAAsD,IAAI,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA;iBAC3G;aACF;YACD,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,MAAM,cAAc,GAAc,EAAE,CAAA;YACpC,MAAM,aAAa,GAAkB,EAAE,CAAA;YACvC,MAAM,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC,MAAM,kBAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;YAC5F,IAAI;gBACF,QAAQ,YAAY,CAAC,MAAM,EAAE;oBAC3B,KAAK,wCAAyB,CAAC,CAAC;wBAC9B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;wBAC/C,MAAK;qBACN;oBACD,KAAK,wCAAyB,CAAC,CAAC;wBAC9B,cAAc,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;wBAC1C,MAAK;qBACN;oBACD,KAAK,uCAAwB,CAAC,CAAC;wBAC7B,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAA;wBACzD,MAAK;qBACN;oBACD,KAAK,yCAA0B,CAAC,CAAC;wBAC/B,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;wBAC5B,MAAK;qBACN;oBACD;wBACE,OAAO,CAAC,KAAK,CAAC,sBAAuB,YAAwB,CAAC,MAAM,GAAG,CAAC,CAAA;iBAC3E;aACF;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,IAAA,wBAAgB,EAAC,EAAE,EAAE,CAAO,KAAK,EAAE,EAAE;;oBACzC,aAAa,CAAC,IAAI,CAChB,IAAI,0BAAkB,EAAE;yBACrB,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;yBACpC,IAAI,CAAC,MAAA,IAAI,CAAC,MAAM,CAAC,IAAI,mCAAI,WAAW,CAAC;yBACrC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;yBACnB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;yBACtB,KAAK,EAAE,CACX,CAAA;gBACH,CAAC,CAAA,CAAC,CAAA;aACH;YACD,OAAO,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACzH,CAAC;KAAA;IAIS,IAAI,CAAC,QAAiB;QAC9B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAA;QACrB,OAAO,IAAI,CAAA;IACb,CAAC;IAES,cAAc,CAAC,MAAgB,EAAE,UAAoB,EAAE;;QAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,MAAA,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,CAAC,MAAM,mCAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;;YAChF,QAAQ,OAAO,KAAK,EAAE;gBACpB,KAAK,UAAU;oBACb,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,kDAAkD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA;oBACjG,OAAO,KAAK,CAAA;gBACd,KAAK,QAAQ,CAAC,CAAC;oBACb,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;wBACxB,OAAO,CACL,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;4BAC5B,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,KAAK,CAAA;wBAC/D,CAAC,EAAE,IAAI,CAAC,IAAI,KAAK,CAClB,CAAA;qBACF;oBAED,IAAI,CAAC,IAAA,gCAAiB,EAAC,KAAK,CAAC,EAAE;wBAC7B,MAAA,IAAI,CAAC,MAAM,0CAAE,IAAI,CAAC,uEAAuE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA;wBACtH,OAAO,KAAK,CAAA;qBACb;oBACD,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC,GAAG,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;iBAC7E;gBACD;oBACE,OAAO,KAAK,CAAA;aACf;QACH,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC;IAIa,YAAY,CAAC,IAAqC;;;YAC9D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;gBAAE,OAAO,SAAS,CAAA;YAC5C,MAAM,MAAM,GACV,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,YAAY,MAAM;gBAClF,CAAC,CAAE,IAAI,CAAC,MAAM,CAAC,SAAoB;gBACnC,CAAC,CAAE,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,SAAS,0CAAG,IAAI,CAAY,CAAA;YAChD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;YACtD,OAAO,QAAQ,CAAC,CAAC,CAAC,4CAAwB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;;KACpF;;AA1cH,wDA2cC;AArckB,4CAAqB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,AAAxB,CAAwB"}

package/dist/cjs/AbstractModule.js

@@ -17,7 +17,9 @@ class AbstractModule extends AbstractIndirectModule_1.AbstractIndirectModule {
             addressPreviousHash: { get: () => super.addressPreviousHash }
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield _super.addressPreviousHash.call(this);
+            return yield this.busy(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                return yield _super.addressPreviousHash.call(this);
+            }));
         });
     }
     /* make it public */
@@ -26,7 +28,9 @@ class AbstractModule extends AbstractIndirectModule_1.AbstractIndirectModule {
             describe: { get: () => super.describe }
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield _super.describe.call(this);
+            return yield this.busy(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                return yield _super.describe.call(this);
+            }));
         });
     }
     /* make it public */
@@ -35,7 +39,9 @@ class AbstractModule extends AbstractIndirectModule_1.AbstractIndirectModule {
             discover: { get: () => super.discover }
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield _super.discover.call(this);
+            return yield this.busy(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                return yield _super.discover.call(this);
+            }));
         });
     }
     /* make it public */
@@ -44,7 +50,9 @@ class AbstractModule extends AbstractIndirectModule_1.AbstractIndirectModule {
             manifest: { get: () => super.manifest }
         });
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield _super.manifest.call(this);
+            return yield this.busy(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                return yield _super.manifest.call(this);
+            }));
         });
     }
     /* make it public */

package/dist/cjs/AbstractModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAMzC,qEAAiE;AAEjE,MAAsB,cACpB,SAAQ,+CAA2C;IAGnD,YAAY,qBAA6B,EAAE,MAAe;QACxD,IAAA,iBAAQ,EAAC,cAAc,CAAC,qBAAqB,KAAK,qBAAqB,EAAE,4CAA4C,CAAC,CAAA;QACtH,0DAA0D;QAC1D,MAAM,aAAa,GAAG,kBAAK,MAAM,CAAa,CAAA;QAC9C,KAAK,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAA;IAC7C,CAAC;IAED,oBAAoB;IACL,mBAAmB;;;;;YAChC,OAAO,MAAM,OAAM,mBAAmB,WAAE,CAAA;QAC1C,CAAC;KAAA;IAED,oBAAoB;IACL,QAAQ;;;;;YACrB,OAAO,MAAM,OAAM,QAAQ,WAAE,CAAA;QAC/B,CAAC;KAAA;IAED,oBAAoB;IACL,QAAQ;;;;;YACrB,OAAO,MAAM,OAAM,QAAQ,WAAE,CAAA;QAC/B,CAAC;KAAA;IAED,oBAAoB;IACL,QAAQ;;;;;YACrB,OAAO,MAAM,OAAM,QAAQ,WAAE,CAAA;QAC/B,CAAC;KAAA;IAED,oBAAoB;IACX,SAAS,CAAC,aAA+B;QAChD,OAAO,KAAK,CAAC,SAAS,EAAE,CAAA;IAC1B,CAAC;CACF;AAnCD,wCAmCC"}
+{"version":3,"file":"AbstractModule.js","sourceRoot":"","sources":["../../src/AbstractModule.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAMzC,qEAAiE;AAEjE,MAAsB,cACpB,SAAQ,+CAA2C;IAGnD,YAAY,qBAA6B,EAAE,MAAe;QACxD,IAAA,iBAAQ,EAAC,cAAc,CAAC,qBAAqB,KAAK,qBAAqB,EAAE,4CAA4C,CAAC,CAAA;QACtH,0DAA0D;QAC1D,MAAM,aAAa,GAAG,kBAAK,MAAM,CAAa,CAAA;QAC9C,KAAK,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAA;IAC7C,CAAC;IAED,oBAAoB;IACL,mBAAmB;;;;;YAChC,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAS,EAAE;gBAChC,OAAO,MAAM,OAAM,mBAAmB,WAAE,CAAA;YAC1C,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAED,oBAAoB;IACL,QAAQ;;;;;YACrB,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAS,EAAE;gBAChC,OAAO,MAAM,OAAM,QAAQ,WAAE,CAAA;YAC/B,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAED,oBAAoB;IACL,QAAQ;;;;;YACrB,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAS,EAAE;gBAChC,OAAO,MAAM,OAAM,QAAQ,WAAE,CAAA;YAC/B,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAED,oBAAoB;IACL,QAAQ;;;;;YACrB,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,GAAS,EAAE;gBAChC,OAAO,MAAM,OAAM,QAAQ,WAAE,CAAA;YAC/B,CAAC,CAAA,CAAC,CAAA;QACJ,CAAC;KAAA;IAED,oBAAoB;IACX,SAAS,CAAC,aAA+B;QAChD,OAAO,KAAK,CAAC,SAAS,EAAE,CAAA;IAC1B,CAAC;CACF;AA3CD,wCA2CC"}

package/dist/cjs/Error.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleErrorBuilder = void 0;
-const module_model_1 = require("@xyo-network/module-model");
 const payload_builder_1 = require("@xyo-network/payload-builder");
+const payload_model_1 = require("@xyo-network/payload-model");
 class ModuleErrorBuilder extends payload_builder_1.PayloadBuilder {
     constructor() {
-        super({ schema: module_model_1.ModuleErrorSchema });
+        super({ schema: payload_model_1.ModuleErrorSchema });
     }
     build() {
         return {
             message: this._message,
             name: this._name,
             query: this._query,
-            schema: module_model_1.ModuleErrorSchema,
+            schema: payload_model_1.ModuleErrorSchema,
             sources: this._sources,
         };
     }

package/dist/cjs/Error.js.map

@@ -1 +1 @@
-{"version":3,"file":"Error.js","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":";;;AAAA,4DAA0E;AAC1E,kEAA6D;AAE7D,MAAa,kBAAmB,SAAQ,gCAAc;IAKpD;QACE,KAAK,CAAC,EAAE,MAAM,EAAE,gCAAiB,EAAE,CAAC,CAAA;IACtC,CAAC;IAEQ,KAAK;QACZ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,MAAM,EAAE,gCAAiB;YACzB,OAAO,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAe;QACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC,IAAY;QACf,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CAAC,OAAiB;QACvB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAtCD,gDAsCC"}
+{"version":3,"file":"Error.js","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":";;;AAAA,kEAA6D;AAC7D,8DAA2E;AAE3E,MAAa,kBAAmB,SAAQ,gCAAc;IAKpD;QACE,KAAK,CAAC,EAAE,MAAM,EAAE,iCAAiB,EAAE,CAAC,CAAA;IACtC,CAAC;IAEQ,KAAK;QACZ,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,QAAQ;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,MAAM,EAAE,iCAAiB;YACzB,OAAO,EAAE,IAAI,CAAC,QAAQ;SACvB,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAe;QACrB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,CAAC,IAAY;QACf,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,KAAa;QACjB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,CAAC,OAAiB;QACvB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,OAAO,IAAI,CAAA;IACb,CAAC;CACF;AAtCD,gDAsCC"}

package/dist/cjs/QueryValidator/ModuleConfigQueryValidator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleConfigQueryValidator = void 0;
 const tslib_1 = require("tslib");
-const Query_1 = require("../Query");
+const boundwitness_builder_1 = require("@xyo-network/boundwitness-builder");
 const delimiter = '';
 class ModuleConfigQueryValidator {
     constructor(config) {
@@ -15,7 +15,7 @@ class ModuleConfigQueryValidator {
             const addresses = query.addresses;
             if (!addresses.length)
                 return false;
-            const wrapper = Query_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
+            const wrapper = boundwitness_builder_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
             const schema = (yield wrapper.getQuery()).schema;
             return this.queryAllowed(schema, addresses) && !this.queryDisallowed(schema, addresses);
         });

package/dist/cjs/QueryValidator/ModuleConfigQueryValidator.js.map

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

package/dist/cjs/QueryValidator/SupportedQueryValidator.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SupportedQueryValidator = exports.isQuerySupportedByModule = void 0;
 const tslib_1 = require("tslib");
-const Query_1 = require("../Query");
+const boundwitness_builder_1 = require("@xyo-network/boundwitness-builder");
 const isQuerySupportedByModule = (mod, query, payloads) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    const wrapper = Query_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
+    const wrapper = boundwitness_builder_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
     const schema = (yield wrapper.getQuery()).schema;
     return mod.queries.includes(schema);
 });

package/dist/cjs/QueryValidator/SupportedQueryValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SupportedQueryValidator.js","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":";;;;AAGA,oCAAmD;AAG5C,MAAM,wBAAwB,GAAG,CACtC,GAAmB,EACnB,KAAQ,EACR,QAAoB,EACF,EAAE;IACpB,MAAM,OAAO,GAAG,gCAAwB,CAAC,UAAU,CAAc,KAAK,EAAE,QAAQ,CAAC,CAAA;IACjF,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAA;IAChD,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACrC,CAAC,CAAA,CAAA;AARY,QAAA,wBAAwB,4BAQpC;AAED,MAAa,uBAAuB;IAClC,YAA+B,GAAmB;QAAnB,QAAG,GAAH,GAAG,CAAgB;QAClD,cAAS,GAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACzC,OAAO,IAAA,gCAAwB,EAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC5D,CAAC,CAAA;IAHoD,CAAC;CAIvD;AALD,0DAKC"}
+{"version":3,"file":"SupportedQueryValidator.js","sourceRoot":"","sources":["../../../src/QueryValidator/SupportedQueryValidator.ts"],"names":[],"mappings":";;;;AAAA,4EAA+F;AAMxF,MAAM,wBAAwB,GAAG,CACtC,GAAmB,EACnB,KAAQ,EACR,QAAoB,EACF,EAAE;IACpB,MAAM,OAAO,GAAG,+CAAwB,CAAC,UAAU,CAAc,KAAK,EAAE,QAAQ,CAAC,CAAA;IACjF,MAAM,MAAM,GAAG,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAA;IAChD,OAAO,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AACrC,CAAC,CAAA,CAAA;AARY,QAAA,wBAAwB,4BAQpC;AAED,MAAa,uBAAuB;IAClC,YAA+B,GAAmB;QAAnB,QAAG,GAAH,GAAG,CAAgB;QAClD,cAAS,GAAc,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACzC,OAAO,IAAA,gCAAwB,EAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC5D,CAAC,CAAA;IAHoD,CAAC;CAIvD;AALD,0DAKC"}

package/dist/cjs/Resolver/CompositeModuleResolver.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompositeModuleResolver = void 0;
 const tslib_1 = require("tslib");
-const promise_1 = require("@xylabs/promise");
+const exists_1 = require("@xylabs/exists");
 const core_1 = require("@xyo-network/core");
-const lib_1 = require("../lib");
+const module_model_1 = require("@xyo-network/module-model");
 const SimpleModuleResolver_1 = require("./SimpleModuleResolver");
 class CompositeModuleResolver extends core_1.Base {
     constructor(params = {}) {
@@ -43,26 +43,21 @@ class CompositeModuleResolver extends core_1.Base {
         this.resolvers = this.resolvers.filter((item) => item !== resolver);
         return this;
     }
-    resolve(filter) {
+    resolve(nameOrAddressOrFilter) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const modules = yield Promise.allSettled(this.resolvers.map((resolver) => resolver.resolve(filter)));
-            const result = modules
-                .filter(promise_1.fulfilled)
-                .map((r) => r.value)
-                .flat()
-                .filter(lib_1.duplicateModules);
-            return result;
-        });
-    }
-    resolveOne(addressOrName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            for (let i = 0; i < this.resolvers.length; i++) {
-                const resolver = this.resolvers[i];
-                const result = yield resolver.resolveOne(addressOrName);
-                if (result)
-                    return result;
+            if (typeof nameOrAddressOrFilter === 'string') {
+                const result = yield Promise.all(this.resolvers.map((resolver) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    return yield resolver.resolve(nameOrAddressOrFilter);
+                })));
+                return result.filter(exists_1.exists).filter(module_model_1.duplicateModules).pop();
+            }
+            else {
+                const result = yield Promise.all(this.resolvers.map((resolver) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    return yield resolver.resolve(nameOrAddressOrFilter);
+                })));
+                const flatResult = result.flat();
+                return flatResult.filter(module_model_1.duplicateModules);
             }
-            return undefined;
         });
     }
     addSingleModule(module) {

package/dist/cjs/Resolver/CompositeModuleResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"CompositeModuleResolver.js","sourceRoot":"","sources":["../../../src/Resolver/CompositeModuleResolver.ts"],"names":[],"mappings":";;;;AAAA,6CAA2C;AAC3C,4CAAoD;AAGpD,gCAAyC;AACzC,iEAA6D;AAE7D,MAAa,uBAAwB,SAAQ,WAAI;IAI/C,YAAY,SAAqB,EAAE;QACjC,KAAK,CAAC,MAAM,CAAC,CAAA;QAJL,cAAS,GAAqB,EAAE,CAAA;QAKxC,MAAM,aAAa,GAAG,IAAI,2CAAoB,EAAE,CAAA;QAChD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAID,GAAG,CAAC,MAAyC;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;SACzD;aAAM;YACL,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SAC7B;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,WAAW,CAAC,QAAwB;QAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,aAAgC;QACrC,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAChC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAA;SACrE;aAAM;YACL,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;SACvC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,cAAc,CAAC,QAAwB;QACrC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QACnE,OAAO,IAAI,CAAA;IACb,CAAC;IAEK,OAAO,CAA4C,MAAqB;;YAC5E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YACpG,MAAM,MAAM,GAAG,OAAO;iBACnB,MAAM,CAAC,mBAAS,CAAC;iBACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;iBACnB,IAAI,EAAE;iBACN,MAAM,CAAC,sBAAgB,CAAC,CAAA;YAC3B,OAAO,MAAa,CAAA;QACtB,CAAC;KAAA;IAEK,UAAU,CAA4C,aAAqB;;YAC/E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;gBAClC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAI,aAAa,CAAC,CAAA;gBAC1D,IAAI,MAAM;oBAAE,OAAO,MAAM,CAAA;aAC1B;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;KAAA;IAEO,eAAe,CAAC,MAAuB;QAC7C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;SAC/B;IACH,CAAC;IACO,kBAAkB,CAAC,aAAqB;QAC9C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAC1C,CAAC;CACF;AAxED,0DAwEC"}
+{"version":3,"file":"CompositeModuleResolver.js","sourceRoot":"","sources":["../../../src/Resolver/CompositeModuleResolver.ts"],"names":[],"mappings":";;;;AAAA,2CAAuC;AACvC,4CAAoD;AACpD,4DAA4H;AAE5H,iEAA6D;AAE7D,MAAa,uBAAwB,SAAQ,WAAI;IAI/C,YAAY,SAAqB,EAAE;QACjC,KAAK,CAAC,MAAM,CAAC,CAAA;QAJL,cAAS,GAAqB,EAAE,CAAA;QAKxC,MAAM,aAAa,GAAG,IAAI,2CAAoB,EAAE,CAAA;QAChD,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAA;QAC/B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAID,GAAG,CAAC,MAAyC;QAC3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;SACzD;aAAM;YACL,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SAC7B;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,WAAW,CAAC,QAAwB;QAClC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC7B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,CAAC,aAAgC;QACrC,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAChC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAA;SACrE;aAAM;YACL,IAAI,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;SACvC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,cAAc,CAAC,QAAwB;QACrC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QACnE,OAAO,IAAI,CAAA;IACb,CAAC;IAIK,OAAO,CACX,qBAA6C;;YAE7C,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;gBAC7C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;oBACpC,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAU,qBAAqB,CAAC,CAAA;gBAC/D,CAAC,CAAA,CAAC,CACH,CAAA;gBACD,OAAO,MAAM,CAAC,MAAM,CAAC,eAAM,CAAC,CAAC,MAAM,CAAC,+BAAgB,CAAC,CAAC,GAAG,EAAE,CAAA;aAC5D;iBAAM;gBACL,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAO,QAAQ,EAAE,EAAE;oBACpC,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAU,qBAAqB,CAAC,CAAA;gBAC/D,CAAC,CAAA,CAAC,CACH,CAAA;gBACD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;gBAChC,OAAO,UAAU,CAAC,MAAM,CAAC,+BAAgB,CAAC,CAAA;aAC3C;QACH,CAAC;KAAA;IAEO,eAAe,CAAC,MAAuB;QAC7C,IAAI,MAAM,EAAE;YACV,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;SAC/B;IACH,CAAC;IACO,kBAAkB,CAAC,aAAqB;QAC9C,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;IAC1C,CAAC;CACF;AA5ED,0DA4EC"}

package/dist/cjs/Resolver/SimpleModuleResolver.js

@@ -37,24 +37,25 @@ class SimpleModuleResolver {
     removeResolver(_resolver) {
         throw 'Removing resolvers not supported';
     }
-    resolve(filter) {
-        const filteredByName = this.resolveByName(Object.values(this.modules), filter === null || filter === void 0 ? void 0 : filter.name);
-        const filteredByAddress = (filter === null || filter === void 0 ? void 0 : filter.address)
-            ? this.resolveByAddress(filteredByName, filter === null || filter === void 0 ? void 0 : filter.address)
-            : filteredByName;
-        const filteredByQuery = (filter === null || filter === void 0 ? void 0 : filter.query)
-            ? this.resolveByQuery(filteredByAddress, filter === null || filter === void 0 ? void 0 : filter.query)
-            : filteredByAddress;
-        return filteredByQuery;
-    }
-    resolveOne(filter) {
-        const allModules = Object.values(this.modules);
-        for (const resolutionMethod of [this.resolveByAddress, this.resolveByName]) {
-            const filtered = resolutionMethod(allModules, [filter]);
-            if (filtered.length === 1)
-                return filtered[0];
+    resolve(nameOrAddressOrFilter) {
+        var _a;
+        if (nameOrAddressOrFilter) {
+            if (typeof nameOrAddressOrFilter === 'string') {
+                return ((_a = this.resolveByName(Object.values(this.modules), [nameOrAddressOrFilter]).pop()) !== null && _a !== void 0 ? _a : this.resolveByAddress(Object.values(this.modules), [nameOrAddressOrFilter]).pop());
+            }
+            else if (nameOrAddressOrFilter.address) {
+                return this.resolveByAddress(Object.values(this.modules), nameOrAddressOrFilter.address);
+            }
+            else if (nameOrAddressOrFilter.name) {
+                return this.resolveByName(Object.values(this.modules), nameOrAddressOrFilter.name);
+            }
+            else if (nameOrAddressOrFilter.query) {
+                return this.resolveByQuery(Object.values(this.modules), nameOrAddressOrFilter.query);
+            }
+        }
+        else {
+            return Object.values(this.modules);
         }
-        return undefined;
     }
     addSingleModule(module) {
         if (module) {
@@ -75,7 +76,7 @@ class SimpleModuleResolver {
     resolveByAddress(modules, address) {
         return address
             ? (0, compact_1.default)((0, flatten_1.default)(address === null || address === void 0 ? void 0 : address.map((address) => {
-                return modules.filter((modules) => modules.address === address);
+                return modules.filter((module) => module.address === address);
             })))
             : modules;
     }

package/dist/cjs/Resolver/SimpleModuleResolver.js.map

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

package/dist/cjs/index.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./AbstractIndirectModule"), exports);
 tslib_1.__exportStar(require("./AbstractModule"), exports);
 tslib_1.__exportStar(require("./BaseEmitter"), exports);
 tslib_1.__exportStar(require("./Error"), exports);
-tslib_1.__exportStar(require("./lib"), exports);
-tslib_1.__exportStar(require("./ModuleFactory"), exports);
-tslib_1.__exportStar(require("./Query"), exports);
 tslib_1.__exportStar(require("./QueryValidator"), exports);
 tslib_1.__exportStar(require("./Resolver"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,2DAAgC;AAChC,wDAA6B;AAC7B,kDAAuB;AACvB,gDAAqB;AACrB,0DAA+B;AAC/B,kDAAuB;AACvB,2DAAgC;AAChC,qDAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mEAAwC;AACxC,2DAAgC;AAChC,wDAA6B;AAC7B,kDAAuB;AACvB,2DAAgC;AAChC,qDAA0B"}

package/dist/esm/AbstractIndirectModule.js

@@ -1,12 +1,13 @@
 import { assertEx } from '@xylabs/assert';
 import { exists } from '@xylabs/exists';
-import { Account, HDWallet } from '@xyo-network/account';
+import { HDWallet } from '@xyo-network/account';
 import { AddressSchema } from '@xyo-network/address-payload-plugin';
-import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder';
+import { IndirectArchivistWrapper } from '@xyo-network/archivist-wrapper';
+import { BoundWitnessBuilder, QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder';
 import { ConfigSchema } from '@xyo-network/config-payload-plugin';
 import { handleErrorAsync } from '@xyo-network/error';
 import { ModuleManifestPayloadSchema } from '@xyo-network/manifest-model';
-import { AddressPreviousHashSchema, ModuleAddressQuerySchema, ModuleDescribeQuerySchema, ModuleDescriptionSchema, ModuleDiscoverQuerySchema, ModuleSubscribeQuerySchema, } from '@xyo-network/module-model';
+import { AddressPreviousHashSchema, duplicateModules, ModuleAddressQuerySchema, ModuleDescribeQuerySchema, ModuleDescriptionSchema, ModuleDiscoverQuerySchema, ModuleFactory, ModuleSubscribeQuerySchema, serializableField, } from '@xyo-network/module-model';
 import { PayloadBuilder } from '@xyo-network/payload-builder';
 import { PromiseEx } from '@xyo-network/promise';
 import { QuerySchema } from '@xyo-network/query-payload-plugin';
@@ -14,9 +15,6 @@ import { IdLogger } from '@xyo-network/shared';
 import compact from 'lodash/compact';
 import { BaseEmitter } from './BaseEmitter';
 import { ModuleErrorBuilder } from './Error';
-import { duplicateModules, serializableField } from './lib';
-import { ModuleFactory } from './ModuleFactory';
-import { QueryBoundWitnessBuilder, QueryBoundWitnessWrapper } from './Query';
 import { ModuleConfigQueryValidator, SupportedQueryValidator } from './QueryValidator';
 import { CompositeModuleResolver } from './Resolver';
 /** @description Abstract class for modules that allow access only through querying and not through direct calls  */
@@ -41,6 +39,7 @@ export class AbstractIndirectModule extends BaseEmitter {
     _started = false;
     moduleConfigQueryValidator;
     supportedQueryValidator;
+    _busyCount = 0;
     constructor(privateConstructorKey, params) {
         assertEx(AbstractIndirectModule.privateConstructorKey === privateConstructorKey, 'Use create function instead of constructor');
         // Clone params to prevent mutation of the incoming object
@@ -97,6 +96,25 @@ export class AbstractIndirectModule extends BaseEmitter {
     addressPreviousHash() {
         return { address: this.address, previousHash: this._account?.previousHash, schema: AddressPreviousHashSchema };
     }
+    async busy(closure) {
+        if (this._busyCount <= 0) {
+            this._busyCount = 0;
+            const args = { busy: true, module: this };
+            await this.emit('moduleBusy', args);
+        }
+        this._busyCount++;
+        try {
+            return await closure();
+        }
+        finally {
+            this._busyCount--;
+            if (this._busyCount <= 0) {
+                this._busyCount = 0;
+                const args = { busy: false, module: this };
+                await this.emit('moduleBusy', args);
+            }
+        }
+    }
     async loadAccount() {
         if (!this._account) {
             const activeLogger = this.params.logger ?? AbstractIndirectModule.defaultLogger;
@@ -145,10 +163,12 @@ export class AbstractIndirectModule extends BaseEmitter {
     }
     async query(query, payloads, queryConfig) {
         this.started('throw');
-        const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig);
-        const args = { module: this, payloads, query, result };
-        await this.emit('moduleQueried', args);
-        return result;
+        return await this.busy(async () => {
+            const result = await this.queryHandler(assertEx(QueryBoundWitnessWrapper.unwrap(query)), payloads, queryConfig);
+            const args = { module: this, payloads, query, result };
+            await this.emit('moduleQueried', args);
+            return result;
+        });
     }
     queryable(query, payloads, queryConfig) {
         if (!this.started('warn'))
@@ -162,10 +182,7 @@ export class AbstractIndirectModule extends BaseEmitter {
     async resolve(nameOrAddressOrFilter) {
         switch (typeof nameOrAddressOrFilter) {
             case 'string': {
-                const byAddress = Account.isAddress(nameOrAddressOrFilter)
-                    ? (await this.resolve({ address: [nameOrAddressOrFilter] })).pop()
-                    : undefined;
-                return byAddress ?? (await this.resolve({ name: [nameOrAddressOrFilter] })).pop();
+                return (await this.downResolver.resolve(nameOrAddressOrFilter)) ?? (await this.upResolver.resolve(nameOrAddressOrFilter));
             }
             default: {
                 const filter = nameOrAddressOrFilter;
@@ -366,8 +383,8 @@ export class AbstractIndirectModule extends BaseEmitter {
         const filter = typeof this.config.archivist === 'string' || this.config.archivist instanceof String
             ? this.config.archivist
             : this.config?.archivist?.[kind];
-        const resolved = await this.upResolver.resolveOne(filter);
-        return resolved ? resolved : undefined;
+        const resolved = await this.upResolver.resolve(filter);
+        return resolved ? IndirectArchivistWrapper.wrap(resolved, this.account) : undefined;
     }
 }
 //# sourceMappingURL=AbstractIndirectModule.js.map