@xyo-network/node 2.51.9 → 2.51.10

package/dist/cjs/AbstractNode.js

@@ -6,16 +6,11 @@ const assert_1 = require("@xylabs/assert");
 const account_1 = require("@xyo-network/account");
 const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
 const module_1 = require("@xyo-network/module");
+const node_model_1 = require("@xyo-network/node-model");
 const payload_builder_1 = require("@xyo-network/payload-builder");
-const Config_1 = require("./Config");
-const Events_1 = require("./Events");
-const Queries_1 = require("./Queries");
 class AbstractNode extends module_1.AbstractModule {
-    constructor(params) {
-        super(params);
-        this.moduleAttachedEventListeners = [];
-        this.moduleDetachedEventListeners = [];
-        this.moduleRegisteredEventListeners = [];
+    constructor() {
+        super(...arguments);
         this.privateResolver = new module_1.CompositeModuleResolver();
         this.isNode = true;
     }
@@ -23,15 +18,7 @@ class AbstractNode extends module_1.AbstractModule {
         return true;
     }
     get queries() {
-        return [Queries_1.XyoNodeAttachQuerySchema, Queries_1.XyoNodeDetachQuerySchema, Queries_1.XyoNodeAttachedQuerySchema, Queries_1.XyoNodeRegisteredQuerySchema, ...super.queries];
-    }
-    static create(params) {
-        const _super = Object.create(null, {
-            create: { get: () => super.create }
-        });
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (yield _super.create.call(this, params));
-        });
+        return [node_model_1.XyoNodeAttachQuerySchema, node_model_1.XyoNodeDetachQuerySchema, node_model_1.XyoNodeAttachedQuerySchema, node_model_1.XyoNodeRegisteredQuerySchema, ...super.queries];
     }
     static isNode(module) {
         return module.isNode;
@@ -57,40 +44,6 @@ class AbstractNode extends module_1.AbstractModule {
             return [...(yield _super.discover.call(this)), ...childModAddresses];
         });
     }
-    on(event, listener, remove) {
-        var _a, _b, _c, _d, _e, _f;
-        if (remove) {
-            switch (event) {
-                case Events_1.ModuleAttachedEvent:
-                    this.moduleAttachedEventListeners = (_a = this.moduleAttachedEventListeners) === null || _a === void 0 ? void 0 : _a.filter((item) => item != listener);
-                    break;
-                case Events_1.ModuleDetachedEvent:
-                    this.moduleDetachedEventListeners = (_b = this.moduleDetachedEventListeners) === null || _b === void 0 ? void 0 : _b.filter((item) => item != listener);
-                    break;
-                case Events_1.ModuleRegisteredEvent:
-                    this.moduleRegisteredEventListeners = (_c = this.moduleRegisteredEventListeners) === null || _c === void 0 ? void 0 : _c.filter((item) => item != listener);
-                    break;
-                default:
-                    return super.on(event, listener);
-            }
-        }
-        else {
-            switch (event) {
-                case Events_1.ModuleAttachedEvent:
-                    (_d = this.moduleAttachedEventListeners) === null || _d === void 0 ? void 0 : _d.push(listener);
-                    break;
-                case Events_1.ModuleDetachedEvent:
-                    (_e = this.moduleDetachedEventListeners) === null || _e === void 0 ? void 0 : _e.push(listener);
-                    break;
-                case Events_1.ModuleRegisteredEvent:
-                    (_f = this.moduleRegisteredEventListeners) === null || _f === void 0 ? void 0 : _f.push(listener);
-                    break;
-                default:
-                    return super.on(event, listener);
-            }
-        }
-        return this;
-    }
     query(query, payloads, queryConfig) {
         const _super = Object.create(null, {
             query: { get: () => super.query }
@@ -103,15 +56,15 @@ class AbstractNode extends module_1.AbstractModule {
             const resultPayloads = [];
             try {
                 switch (typedQuery.schema) {
-                    case Queries_1.XyoNodeAttachQuerySchema: {
+                    case node_model_1.XyoNodeAttachQuerySchema: {
                         yield this.attach(typedQuery.address, typedQuery.external);
                         break;
                     }
-                    case Queries_1.XyoNodeDetachQuerySchema: {
+                    case node_model_1.XyoNodeDetachQuerySchema: {
                         yield this.detach(typedQuery.address);
                         break;
                     }
-                    case Queries_1.XyoNodeAttachedQuerySchema: {
+                    case node_model_1.XyoNodeAttachedQuerySchema: {
                         const addresses = yield this.attached();
                         for (const address of addresses) {
                             const payload = new payload_builder_1.XyoPayloadBuilder({ schema: address_payload_plugin_1.AddressSchema }).fields({ address }).build();
@@ -119,7 +72,7 @@ class AbstractNode extends module_1.AbstractModule {
                         }
                         break;
                     }
-                    case Queries_1.XyoNodeRegisteredQuerySchema: {
+                    case node_model_1.XyoNodeRegisteredQuerySchema: {
                         const addresses = yield this.registered();
                         for (const address of addresses) {
                             const payload = new payload_builder_1.XyoPayloadBuilder({ schema: address_payload_plugin_1.AddressSchema }).fields({ address }).build();
@@ -147,15 +100,6 @@ class AbstractNode extends module_1.AbstractModule {
     registeredModules() {
         throw new Error('Method not implemented.');
     }
-    start() {
-        const _super = Object.create(null, {
-            start: { get: () => super.start }
-        });
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield _super.start.call(this);
-            return this;
-        });
-    }
     unregister(_module) {
         throw new Error('Method not implemented.');
     }
@@ -169,5 +113,5 @@ class AbstractNode extends module_1.AbstractModule {
     }
 }
 exports.AbstractNode = AbstractNode;
-AbstractNode.configSchema = Config_1.NodeConfigSchema;
+AbstractNode.configSchema = node_model_1.NodeConfigSchema;
 //# sourceMappingURL=AbstractNode.js.map

package/dist/cjs/AbstractNode.js.map

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

package/dist/cjs/MemoryNode.js

@@ -6,25 +6,17 @@ const assert_1 = require("@xylabs/assert");
 const exists_1 = require("@xylabs/exists");
 const promise_1 = require("@xylabs/promise");
 const module_1 = require("@xyo-network/module");
+const node_model_1 = require("@xyo-network/node-model");
 const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
 const AbstractNode_1 = require("./AbstractNode");
-const Config_1 = require("./Config");
 const NodeWrapper_1 = require("./NodeWrapper");
 class MemoryNode extends AbstractNode_1.AbstractNode {
     constructor() {
         super(...arguments);
         this.registeredModuleMap = {};
     }
-    static create(params) {
-        const _super = Object.create(null, {
-            create: { get: () => super.create }
-        });
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return (yield _super.create.call(this, params));
-        });
-    }
     attach(address, external) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const existingModule = (yield this.resolve({ address: [address] })).pop();
             (0, assert_1.assertEx)(!existingModule, `Module [${(_a = existingModule === null || existingModule === void 0 ? void 0 : existingModule.config.name) !== null && _a !== void 0 ? _a : existingModule === null || existingModule === void 0 ? void 0 : existingModule.address}] already attached at address [${address}]`);
@@ -58,28 +50,27 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
                 this.downResolver.addResolver(module.downResolver);
             }
             const args = { module, name: module.config.name };
-            (_f = this.moduleAttachedEventListeners) === null || _f === void 0 ? void 0 : _f.map((listener) => listener(args));
+            yield this.emit('moduleAttached', args);
             if (NodeWrapper_1.NodeWrapper.isNodeModule(module)) {
                 if (external) {
                     const wrappedAsNode = NodeWrapper_1.NodeWrapper.wrap(module);
-                    const attachEmitter = wrappedAsNode.module;
-                    const detachEmitter = wrappedAsNode.module;
-                    attachEmitter.on('moduleAttached', (args) => { var _a; return (_a = this.moduleAttachedEventListeners) === null || _a === void 0 ? void 0 : _a.map((listener) => listener(args)); });
-                    detachEmitter.on('moduleDetached', (args) => { var _a; return (_a = this.moduleDetachedEventListeners) === null || _a === void 0 ? void 0 : _a.map((listener) => listener(args)); });
+                    const attachedListener = (args) => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.emit('moduleAttached', args); });
+                    const detachedListener = (args) => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.emit('moduleDetached', args); });
+                    wrappedAsNode.on('moduleAttached', attachedListener);
+                    wrappedAsNode.on('moduleDetached', detachedListener);
                 }
             }
-            const notifyOfExistingModules = (childModules) => {
-                childModules.map((child) => {
-                    var _a;
+            const notifyOfExistingModules = (childModules) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                yield Promise.all(childModules.map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     const args = { module: child, name: child.config.name };
-                    (_a = this.moduleAttachedEventListeners) === null || _a === void 0 ? void 0 : _a.map((listener) => listener(args));
-                });
-            };
-            notifyOfExistingModules(notificationList);
+                    yield this.emit('moduleAttached', args);
+                })));
+            });
+            yield notifyOfExistingModules(notificationList);
         });
     }
     detach(address) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const module = (0, assert_1.assertEx)(this.registeredModuleMap[address], 'No module found at that address');
             this.privateResolver.removeResolver(module.downResolver);
@@ -90,7 +81,7 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
             //remove external exposure
             this.downResolver.removeResolver(module.downResolver);
             const args = { module, name: module.config.name };
-            (_e = this.moduleDetachedEventListeners) === null || _e === void 0 ? void 0 : _e.map((listener) => listener(args));
+            yield this.emit('moduleDetached', args);
             //notify of all sub node children detach
             const wrapper = module_1.ModuleWrapper.tryWrap(module);
             const notifiedAddresses = [];
@@ -98,8 +89,7 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
                 const notifyOfExistingModules = (node) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                     //send attach events for all existing attached modules
                     const childModules = yield node.resolve();
-                    childModules.map((child) => {
-                        var _a;
+                    yield Promise.all(childModules.map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () {
                         //don't report self
                         if (node.address === child.address) {
                             return;
@@ -109,8 +99,8 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
                             return;
                         }
                         notifiedAddresses.push(child.address);
-                        (_a = this.moduleDetachedEventListeners) === null || _a === void 0 ? void 0 : _a.map((listener) => listener({ module: child }));
-                    });
+                        yield this.emit('moduleDetached', { module: child });
+                    })));
                 });
                 yield notifyOfExistingModules(wrapper);
             }
@@ -159,5 +149,5 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
     }
 }
 exports.MemoryNode = MemoryNode;
-MemoryNode.configSchema = Config_1.NodeConfigSchema;
+MemoryNode.configSchema = node_model_1.NodeConfigSchema;
 //# sourceMappingURL=MemoryNode.js.map

package/dist/cjs/MemoryNode.js.map

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

package/dist/cjs/NodeWrapper.js

@@ -6,13 +6,13 @@ const assert_1 = require("@xylabs/assert");
 const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
 const archivist_wrapper_1 = require("@xyo-network/archivist-wrapper");
 const module_1 = require("@xyo-network/module");
+const node_model_1 = require("@xyo-network/node-model");
 const payload_model_1 = require("@xyo-network/payload-model");
 const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
-const Queries_1 = require("./Queries");
 class NodeWrapper extends module_1.ModuleWrapper {
     get archivist() {
         var _a;
-        this._archivist = (_a = this._archivist) !== null && _a !== void 0 ? _a : new archivist_wrapper_1.ArchivistWrapper(this.module);
+        this._archivist = (_a = this._archivist) !== null && _a !== void 0 ? _a : new archivist_wrapper_1.ArchivistWrapper({ account: this.account, module: this.module });
         return this._archivist;
     }
     static isNodeModule(module) {
@@ -20,13 +20,14 @@ class NodeWrapper extends module_1.ModuleWrapper {
         return missingRequiredQueries.length === 0;
     }
     static tryWrap(module, account) {
+        var _a;
         if (module) {
             const missingRequiredQueries = this.missingRequiredQueries(module);
             if (missingRequiredQueries.length > 0) {
-                //console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
+                (_a = this.defaultLogger) === null || _a === void 0 ? void 0 : _a.debug(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`);
             }
             else {
-                return new NodeWrapper(module, account);
+                return new NodeWrapper({ account, module });
             }
         }
     }
@@ -35,31 +36,31 @@ class NodeWrapper extends module_1.ModuleWrapper {
     }
     attach(address, external) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ address, external, schema: Queries_1.XyoNodeAttachQuerySchema });
+            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ address, external, schema: node_model_1.XyoNodeAttachQuerySchema });
             yield this.sendQuery(queryPayload);
         });
     }
     attached() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ schema: Queries_1.XyoNodeAttachedQuerySchema });
+            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ schema: node_model_1.XyoNodeAttachedQuerySchema });
             const payloads = (yield this.sendQuery(queryPayload)).filter((0, payload_model_1.isXyoPayloadOfSchemaType)(address_payload_plugin_1.AddressSchema));
             return payloads.map((p) => p.address);
         });
     }
     detach(address) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ address, schema: Queries_1.XyoNodeDetachQuerySchema });
+            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ address, schema: node_model_1.XyoNodeDetachQuerySchema });
             yield this.sendQuery(queryPayload);
         });
     }
     registered() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ schema: Queries_1.XyoNodeRegisteredQuerySchema });
+            const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ schema: node_model_1.XyoNodeRegisteredQuerySchema });
             const payloads = (yield this.sendQuery(queryPayload)).filter((0, payload_model_1.isXyoPayloadOfSchemaType)(address_payload_plugin_1.AddressSchema));
             return payloads.map((p) => p.address);
         });
     }
 }
 exports.NodeWrapper = NodeWrapper;
-NodeWrapper.requiredQueries = [Queries_1.XyoNodeAttachQuerySchema, ...module_1.ModuleWrapper.requiredQueries];
+NodeWrapper.requiredQueries = [node_model_1.XyoNodeAttachQuerySchema, ...module_1.ModuleWrapper.requiredQueries];
 //# sourceMappingURL=NodeWrapper.js.map

package/dist/cjs/NodeWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AAEzC,gFAAmF;AACnF,sEAAiE;AACjE,gDAA2D;AAC3D,8DAAqE;AACrE,kEAA6D;AAG7D,uCASkB;AAElB,MAAa,WAAY,SAAQ,sBAAyB;IAKxD,IAAI,SAAS;;QACX,IAAI,CAAC,UAAU,GAAG,MAAA,IAAI,CAAC,UAAU,mCAAI,IAAI,oCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACtE,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,MAAc;QAChC,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAClE,OAAO,sBAAsB,CAAC,MAAM,KAAK,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,CAAU,OAAO,CAA0C,MAAgB,EAAE,OAAyB;QAC1G,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,WAAW,CAAC,MAAiB,EAAE,OAAO,CAAC,CAAA;aACnD;SACF;IACH,CAAC;IAED,MAAM,CAAU,IAAI,CAA0C,MAAgB,EAAE,OAAyB;QACvG,OAAO,IAAA,iBAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,sCAAsC,CAAC,CAAA;IACxF,CAAC;IAEK,MAAM,CAAC,OAAe,EAAE,QAAkB;;YAC9C,MAAM,YAAY,GAAG,gCAAc,CAAC,KAAK,CAAqB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,kCAAwB,EAAE,CAAC,CAAA;YACtH,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QACpC,CAAC;KAAA;IAEK,QAAQ;;YACZ,MAAM,YAAY,GAAG,gCAAc,CAAC,KAAK,CAAuB,EAAE,MAAM,EAAE,oCAA0B,EAAE,CAAC,CAAA;YACvG,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,wCAAwB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACvI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC;KAAA;IAEK,MAAM,CAAC,OAAe;;YAC1B,MAAM,YAAY,GAAG,gCAAc,CAAC,KAAK,CAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,kCAAwB,EAAE,CAAC,CAAA;YAC5G,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QACpC,CAAC;KAAA;IAEK,UAAU;;YACd,MAAM,YAAY,GAAG,gCAAc,CAAC,KAAK,CAAyB,EAAE,MAAM,EAAE,sCAA4B,EAAE,CAAC,CAAA;YAC3G,MAAM,QAAQ,GAAqB,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAA,wCAAwB,EAAiB,sCAAa,CAAC,CAAC,CAAA;YACvI,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC;KAAA;;AAlDH,kCAmDC;AAlDiB,2BAAe,GAAG,CAAC,kCAAwB,EAAE,GAAG,sBAAa,CAAC,eAAe,CAAC,CAAA"}
+{"version":3,"file":"NodeWrapper.js","sourceRoot":"","sources":["../../src/NodeWrapper.ts"],"names":[],"mappings":"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"}

package/dist/cjs/index.js

@@ -2,11 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./AbstractNode"), exports);
-tslib_1.__exportStar(require("./Config"), exports);
-tslib_1.__exportStar(require("./Events"), exports);
 tslib_1.__exportStar(require("./MemoryNode"), exports);
-tslib_1.__exportStar(require("./Node"), exports);
 tslib_1.__exportStar(require("./NodeWrapper"), exports);
-tslib_1.__exportStar(require("./PartialConfig"), exports);
-tslib_1.__exportStar(require("./Queries"), exports);
+tslib_1.__exportStar(require("@xyo-network/node-model"), 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,yDAA8B;AAC9B,mDAAwB;AACxB,mDAAwB;AACxB,uDAA4B;AAC5B,iDAAsB;AACtB,wDAA6B;AAC7B,0DAA+B;AAC/B,oDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,yDAA8B;AAC9B,uDAA4B;AAC5B,wDAA6B;AAC7B,kEAAuC"}