@xyo-network/node 2.64.6 → 2.64.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/AbstractNode.js +19 -9
- package/dist/cjs/AbstractNode.js.map +1 -1
- package/dist/cjs/MemoryNode.js +8 -34
- package/dist/cjs/MemoryNode.js.map +1 -1
- package/dist/docs.json +9081 -3738
- package/dist/esm/AbstractNode.js +19 -4
- package/dist/esm/AbstractNode.js.map +1 -1
- package/dist/esm/MemoryNode.js +9 -32
- package/dist/esm/MemoryNode.js.map +1 -1
- package/dist/types/AbstractNode.d.ts +4 -3
- package/dist/types/AbstractNode.d.ts.map +1 -1
- package/dist/types/MemoryNode.d.ts +1 -2
- package/dist/types/MemoryNode.d.ts.map +1 -1
- package/package.json +11 -13
- package/src/AbstractNode.ts +25 -7
- package/src/MemoryNode.ts +12 -39
package/dist/cjs/AbstractNode.js
CHANGED
|
@@ -6,6 +6,7 @@ const assert_1 = require("@xylabs/assert");
|
|
|
6
6
|
const account_1 = require("@xyo-network/account");
|
|
7
7
|
const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
|
|
8
8
|
const error_1 = require("@xyo-network/error");
|
|
9
|
+
const manifest_model_1 = require("@xyo-network/manifest-model");
|
|
9
10
|
const module_1 = require("@xyo-network/module");
|
|
10
11
|
const node_model_1 = require("@xyo-network/node-model");
|
|
11
12
|
const payload_builder_1 = require("@xyo-network/payload-builder");
|
|
@@ -59,7 +60,7 @@ class AbstractNode extends module_1.AbstractModule {
|
|
|
59
60
|
});
|
|
60
61
|
var _a, _b;
|
|
61
62
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
62
|
-
const manifest = Object.assign({}, (yield _super.manifest.call(this)));
|
|
63
|
+
const manifest = Object.assign(Object.assign({}, (yield _super.manifest.call(this))), { schema: manifest_model_1.NodeManifestPayloadSchema });
|
|
63
64
|
const notThisModule = (module) => module.address !== this.address;
|
|
64
65
|
const toManifest = (module) => module.manifest();
|
|
65
66
|
const privateModules = yield Promise.all((yield this.privateResolver.resolve()).filter(notThisModule).map(toManifest));
|
|
@@ -84,6 +85,23 @@ class AbstractNode extends module_1.AbstractModule {
|
|
|
84
85
|
registeredModules() {
|
|
85
86
|
throw new Error('Method not implemented.');
|
|
86
87
|
}
|
|
88
|
+
resolvePrivate(nameOrAddressOrFilter) {
|
|
89
|
+
var _a, _b;
|
|
90
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
91
|
+
switch (typeof nameOrAddressOrFilter) {
|
|
92
|
+
case 'string': {
|
|
93
|
+
const byAddress = account_1.Account.isAddress(nameOrAddressOrFilter)
|
|
94
|
+
? (_a = (yield this.privateResolver.resolve({ address: [nameOrAddressOrFilter] })).pop()) !== null && _a !== void 0 ? _a : (yield this.resolve({ address: [nameOrAddressOrFilter] })).pop()
|
|
95
|
+
: undefined;
|
|
96
|
+
return ((_b = byAddress !== null && byAddress !== void 0 ? byAddress : (yield this.privateResolver.resolve({ name: [nameOrAddressOrFilter] })).pop()) !== null && _b !== void 0 ? _b : (yield this.resolve({ name: [nameOrAddressOrFilter] })).pop());
|
|
97
|
+
}
|
|
98
|
+
default: {
|
|
99
|
+
const filter = nameOrAddressOrFilter;
|
|
100
|
+
return [...(yield this.privateResolver.resolve(filter)), ...(yield this.resolve(filter))].filter(module_1.duplicateModules);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
}
|
|
87
105
|
unregister(_module) {
|
|
88
106
|
throw new Error('Method not implemented.');
|
|
89
107
|
}
|
|
@@ -150,14 +168,6 @@ class AbstractNode extends module_1.AbstractModule {
|
|
|
150
168
|
return (yield this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0];
|
|
151
169
|
});
|
|
152
170
|
}
|
|
153
|
-
resolve(filter) {
|
|
154
|
-
const _super = Object.create(null, {
|
|
155
|
-
resolve: { get: () => super.resolve }
|
|
156
|
-
});
|
|
157
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
158
|
-
return [...(yield this.privateResolver.resolve(filter)), ...(yield _super.resolve.call(this, filter))].filter(module_1.duplicateModules);
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
171
|
}
|
|
162
172
|
exports.AbstractNode = AbstractNode;
|
|
163
173
|
AbstractNode.configSchemas = [node_model_1.NodeConfigSchema];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,kDAA8C;AAC9C,gFAAmF;AACnF,8CAAqD;
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/MemoryNode.js
CHANGED
|
@@ -3,11 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MemoryNode = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const assert_1 = require("@xylabs/assert");
|
|
6
|
-
const exists_1 = require("@xylabs/exists");
|
|
7
|
-
const promise_1 = require("@xylabs/promise");
|
|
8
|
-
const module_1 = require("@xyo-network/module");
|
|
9
6
|
const node_model_1 = require("@xyo-network/node-model");
|
|
10
|
-
const node_wrapper_1 = require("@xyo-network/node-wrapper");
|
|
11
7
|
const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
|
|
12
8
|
const AbstractNode_1 = require("./AbstractNode");
|
|
13
9
|
class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
@@ -55,25 +51,6 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
|
55
51
|
return this;
|
|
56
52
|
});
|
|
57
53
|
}
|
|
58
|
-
resolve(filter) {
|
|
59
|
-
var _a, _b, _c;
|
|
60
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
61
|
-
const internal = this.privateResolver.resolve(filter);
|
|
62
|
-
const up = ((_a = this.upResolver) === null || _a === void 0 ? void 0 : _a.resolve(filter)) || [];
|
|
63
|
-
const down = ((_b = this.downResolver) === null || _b === void 0 ? void 0 : _b.resolve(filter)) || [];
|
|
64
|
-
const resolved = yield Promise.allSettled([internal, up, down]);
|
|
65
|
-
const errors = resolved.filter(promise_1.rejected).map((r) => Error(r.reason));
|
|
66
|
-
if (errors.length) {
|
|
67
|
-
(_c = this.logger) === null || _c === void 0 ? void 0 : _c.error(`Resolve Errors: ${JSON.stringify(errors, null, 2)}`);
|
|
68
|
-
}
|
|
69
|
-
return resolved
|
|
70
|
-
.filter(promise_1.fulfilled)
|
|
71
|
-
.map((r) => r.value)
|
|
72
|
-
.flat()
|
|
73
|
-
.filter(exists_1.exists)
|
|
74
|
-
.filter(module_1.duplicateModules);
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
54
|
attachUsingAddress(address, external) {
|
|
78
55
|
var _a, _b, _c, _d, _e;
|
|
79
56
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -83,11 +60,10 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
|
83
60
|
if (!module) {
|
|
84
61
|
return;
|
|
85
62
|
}
|
|
86
|
-
const wrapper = module_1.ModuleWrapper.wrap(module);
|
|
87
63
|
const notifiedAddresses = [];
|
|
88
64
|
const getModulesToNotifyAbout = (node) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
89
65
|
//send attach events for all existing attached modules
|
|
90
|
-
const childModules = yield node.resolve();
|
|
66
|
+
const childModules = yield node.downResolver.resolve();
|
|
91
67
|
return (0, compact_1.default)(childModules.map((child) => {
|
|
92
68
|
//don't report self
|
|
93
69
|
if (node.address === child.address) {
|
|
@@ -101,7 +77,7 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
|
101
77
|
return child;
|
|
102
78
|
}));
|
|
103
79
|
});
|
|
104
|
-
const notificationList = yield getModulesToNotifyAbout(
|
|
80
|
+
const notificationList = yield getModulesToNotifyAbout(module);
|
|
105
81
|
this.privateResolver.addResolver(module.downResolver);
|
|
106
82
|
//give it inside access
|
|
107
83
|
(_c = (_b = module.upResolver).addResolver) === null || _c === void 0 ? void 0 : _c.call(_b, this.privateResolver);
|
|
@@ -113,13 +89,12 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
|
113
89
|
}
|
|
114
90
|
const args = { module, name: module.config.name };
|
|
115
91
|
yield this.emit('moduleAttached', args);
|
|
116
|
-
if (
|
|
92
|
+
if ((0, node_model_1.isNodeModule)(module)) {
|
|
117
93
|
if (external) {
|
|
118
|
-
const wrappedAsNode = node_wrapper_1.NodeWrapper.wrap(module);
|
|
119
94
|
const attachedListener = (args) => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.emit('moduleAttached', args); });
|
|
120
95
|
const detachedListener = (args) => tslib_1.__awaiter(this, void 0, void 0, function* () { return yield this.emit('moduleDetached', args); });
|
|
121
|
-
|
|
122
|
-
|
|
96
|
+
module.on('moduleAttached', attachedListener);
|
|
97
|
+
module.on('moduleDetached', detachedListener);
|
|
123
98
|
}
|
|
124
99
|
}
|
|
125
100
|
const notifyOfExistingModules = (childModules) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -157,12 +132,11 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
|
157
132
|
const args = { module, name: module.config.name };
|
|
158
133
|
yield this.emit('moduleDetached', args);
|
|
159
134
|
//notify of all sub node children detach
|
|
160
|
-
const wrapper = module_1.ModuleWrapper.tryWrap(module);
|
|
161
135
|
const notifiedAddresses = [];
|
|
162
|
-
if (
|
|
136
|
+
if ((0, node_model_1.isNodeModule)(module)) {
|
|
163
137
|
const notifyOfExistingModules = (node) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
164
138
|
//send attach events for all existing attached modules
|
|
165
|
-
const childModules = yield node.resolve();
|
|
139
|
+
const childModules = yield node.downResolver.resolve();
|
|
166
140
|
yield Promise.all(childModules.map((child) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
167
141
|
//don't report self
|
|
168
142
|
if (node.address === child.address) {
|
|
@@ -176,7 +150,7 @@ class MemoryNode extends AbstractNode_1.AbstractNode {
|
|
|
176
150
|
yield this.emit('moduleDetached', { module: child });
|
|
177
151
|
})));
|
|
178
152
|
});
|
|
179
|
-
yield notifyOfExistingModules(
|
|
153
|
+
yield notifyOfExistingModules(module);
|
|
180
154
|
}
|
|
181
155
|
return address;
|
|
182
156
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;
|
|
1
|
+
{"version":3,"file":"MemoryNode.js","sourceRoot":"","sources":["../../src/MemoryNode.ts"],"names":[],"mappings":"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"}
|