@xyo-network/node 2.68.0 → 2.69.0-rc.2
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 +31 -48
- package/dist/cjs/AbstractNode.js.map +1 -1
- package/dist/esm/AbstractNode.js +32 -48
- package/dist/esm/AbstractNode.js.map +1 -1
- package/dist/types/AbstractNode.d.ts +2 -2
- package/dist/types/AbstractNode.d.ts.map +1 -1
- package/package.json +13 -14
- package/src/AbstractNode.ts +35 -52
package/dist/cjs/AbstractNode.js
CHANGED
|
@@ -3,10 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AbstractNode = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const assert_1 = require("@xylabs/assert");
|
|
6
|
-
const account_1 = require("@xyo-network/account");
|
|
7
6
|
const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
|
|
8
7
|
const boundwitness_builder_1 = require("@xyo-network/boundwitness-builder");
|
|
9
|
-
const error_1 = require("@xyo-network/error");
|
|
10
8
|
const manifest_model_1 = require("@xyo-network/manifest-model");
|
|
11
9
|
const module_abstract_1 = require("@xyo-network/module-abstract");
|
|
12
10
|
const module_model_1 = require("@xyo-network/module-model");
|
|
@@ -139,59 +137,44 @@ class AbstractNode extends module_abstract_1.AbstractModuleInstance {
|
|
|
139
137
|
const wrapper = boundwitness_builder_1.QueryBoundWitnessWrapper.parseQuery(query, payloads);
|
|
140
138
|
const queryPayload = yield wrapper.getQuery();
|
|
141
139
|
(0, assert_1.assertEx)(this.queryable(query, payloads, queryConfig));
|
|
142
|
-
const queryAccount = account_1.Account.randomSync();
|
|
143
140
|
const resultPayloads = [];
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
const
|
|
149
|
-
|
|
150
|
-
const payload = new payload_builder_1.PayloadBuilder({ schema: address_payload_plugin_1.AddressSchema }).fields({ address }).build();
|
|
151
|
-
resultPayloads.push(payload);
|
|
152
|
-
}
|
|
153
|
-
break;
|
|
141
|
+
switch (queryPayload.schema) {
|
|
142
|
+
case node_model_1.NodeAttachQuerySchema: {
|
|
143
|
+
const address = yield this.attach(queryPayload.nameOrAddress, queryPayload.external);
|
|
144
|
+
if (address) {
|
|
145
|
+
const payload = new payload_builder_1.PayloadBuilder({ schema: address_payload_plugin_1.AddressSchema }).fields({ address }).build();
|
|
146
|
+
resultPayloads.push(payload);
|
|
154
147
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
}
|
|
161
|
-
|
|
148
|
+
break;
|
|
149
|
+
}
|
|
150
|
+
case node_model_1.NodeDetachQuerySchema: {
|
|
151
|
+
const address = yield this.detach(queryPayload.nameOrAddress);
|
|
152
|
+
if (address) {
|
|
153
|
+
const payload = new payload_builder_1.PayloadBuilder({ schema: address_payload_plugin_1.AddressSchema }).fields({ address }).build();
|
|
154
|
+
resultPayloads.push(payload);
|
|
162
155
|
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
}
|
|
169
|
-
|
|
156
|
+
break;
|
|
157
|
+
}
|
|
158
|
+
case node_model_1.NodeAttachedQuerySchema: {
|
|
159
|
+
const addresses = yield this.attached();
|
|
160
|
+
for (const address of addresses) {
|
|
161
|
+
const payload = new payload_builder_1.PayloadBuilder({ schema: address_payload_plugin_1.AddressSchema }).fields({ address }).build();
|
|
162
|
+
resultPayloads.push(payload);
|
|
170
163
|
}
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
}
|
|
177
|
-
|
|
164
|
+
break;
|
|
165
|
+
}
|
|
166
|
+
case node_model_1.NodeRegisteredQuerySchema: {
|
|
167
|
+
const addresses = yield this.registered();
|
|
168
|
+
for (const address of addresses) {
|
|
169
|
+
const payload = new payload_builder_1.PayloadBuilder({ schema: address_payload_plugin_1.AddressSchema }).fields({ address }).build();
|
|
170
|
+
resultPayloads.push(payload);
|
|
178
171
|
}
|
|
179
|
-
|
|
180
|
-
return yield _super.queryHandler.call(this, query, payloads);
|
|
172
|
+
break;
|
|
181
173
|
}
|
|
174
|
+
default:
|
|
175
|
+
return yield _super.queryHandler.call(this, query, payloads);
|
|
182
176
|
}
|
|
183
|
-
|
|
184
|
-
yield (0, error_1.handleErrorAsync)(ex, (error) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
185
|
-
var _a;
|
|
186
|
-
errorPayloads.push(new module_abstract_1.ModuleErrorBuilder()
|
|
187
|
-
.sources([yield wrapper.hashAsync()])
|
|
188
|
-
.name((_a = this.config.name) !== null && _a !== void 0 ? _a : '<Unknown>')
|
|
189
|
-
.query(query.schema)
|
|
190
|
-
.message(error.message)
|
|
191
|
-
.build());
|
|
192
|
-
}));
|
|
193
|
-
}
|
|
194
|
-
return (yield this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0];
|
|
177
|
+
return resultPayloads;
|
|
195
178
|
});
|
|
196
179
|
}
|
|
197
180
|
resolveAll(nameOrAddressOrFilter, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/AbstractNode.js
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert';
|
|
2
|
-
import { Account } from '@xyo-network/account';
|
|
3
2
|
import { AddressSchema } from '@xyo-network/address-payload-plugin';
|
|
4
3
|
import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder';
|
|
5
|
-
import { handleErrorAsync } from '@xyo-network/error';
|
|
6
4
|
import { NodeManifestPayloadSchema } from '@xyo-network/manifest-model';
|
|
7
|
-
import { AbstractModuleInstance, CompositeModuleResolver
|
|
5
|
+
import { AbstractModuleInstance, CompositeModuleResolver } from '@xyo-network/module-abstract';
|
|
8
6
|
import { duplicateModules, } from '@xyo-network/module-model';
|
|
9
7
|
import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeConfigSchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema, } from '@xyo-network/node-model';
|
|
10
8
|
import { PayloadBuilder } from '@xyo-network/payload-builder';
|
|
@@ -106,58 +104,44 @@ export class AbstractNode extends AbstractModuleInstance {
|
|
|
106
104
|
const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
|
|
107
105
|
const queryPayload = await wrapper.getQuery();
|
|
108
106
|
assertEx(this.queryable(query, payloads, queryConfig));
|
|
109
|
-
const queryAccount = Account.randomSync();
|
|
110
107
|
const resultPayloads = [];
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
const
|
|
116
|
-
|
|
117
|
-
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
|
|
118
|
-
resultPayloads.push(payload);
|
|
119
|
-
}
|
|
120
|
-
break;
|
|
108
|
+
switch (queryPayload.schema) {
|
|
109
|
+
case NodeAttachQuerySchema: {
|
|
110
|
+
const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external);
|
|
111
|
+
if (address) {
|
|
112
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
|
|
113
|
+
resultPayloads.push(payload);
|
|
121
114
|
}
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
}
|
|
128
|
-
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
117
|
+
case NodeDetachQuerySchema: {
|
|
118
|
+
const address = await this.detach(queryPayload.nameOrAddress);
|
|
119
|
+
if (address) {
|
|
120
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
|
|
121
|
+
resultPayloads.push(payload);
|
|
129
122
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
}
|
|
136
|
-
|
|
123
|
+
break;
|
|
124
|
+
}
|
|
125
|
+
case NodeAttachedQuerySchema: {
|
|
126
|
+
const addresses = await this.attached();
|
|
127
|
+
for (const address of addresses) {
|
|
128
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
|
|
129
|
+
resultPayloads.push(payload);
|
|
137
130
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
}
|
|
144
|
-
|
|
131
|
+
break;
|
|
132
|
+
}
|
|
133
|
+
case NodeRegisteredQuerySchema: {
|
|
134
|
+
const addresses = await this.registered();
|
|
135
|
+
for (const address of addresses) {
|
|
136
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build();
|
|
137
|
+
resultPayloads.push(payload);
|
|
145
138
|
}
|
|
146
|
-
|
|
147
|
-
return await super.queryHandler(query, payloads);
|
|
139
|
+
break;
|
|
148
140
|
}
|
|
141
|
+
default:
|
|
142
|
+
return await super.queryHandler(query, payloads);
|
|
149
143
|
}
|
|
150
|
-
|
|
151
|
-
await handleErrorAsync(ex, async (error) => {
|
|
152
|
-
errorPayloads.push(new ModuleErrorBuilder()
|
|
153
|
-
.sources([await wrapper.hashAsync()])
|
|
154
|
-
.name(this.config.name ?? '<Unknown>')
|
|
155
|
-
.query(query.schema)
|
|
156
|
-
.message(error.message)
|
|
157
|
-
.build());
|
|
158
|
-
});
|
|
159
|
-
}
|
|
160
|
-
return (await this.bindQueryResult(queryPayload, resultPayloads, [queryAccount], errorPayloads))[0];
|
|
144
|
+
return resultPayloads;
|
|
161
145
|
}
|
|
162
146
|
async resolveAll(nameOrAddressOrFilter, options) {
|
|
163
147
|
switch (typeof nameOrAddressOrFilter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,
|
|
1
|
+
{"version":3,"file":"AbstractNode.js","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAkB,aAAa,EAAE,MAAM,qCAAqC,CAAA;AACnF,OAAO,EAAqB,wBAAwB,EAAE,MAAM,mCAAmC,CAAA;AAC/F,OAAO,EAAuB,yBAAyB,EAAE,MAAM,6BAA6B,CAAA;AAC5F,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAC9F,OAAO,EACL,gBAAgB,GAOjB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EAMrB,yBAAyB,GAC1B,MAAM,yBAAyB,CAAA;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAI7D,MAAM,OAAgB,YACpB,SAAQ,sBAA2C;IAGnD,MAAM,CAAmB,aAAa,GAAa,CAAC,gBAAgB,CAAC,CAAA;IAElD,eAAe,GAAG,IAAI,uBAAuB,EAAE,CAAA;IAEjD,MAAM,GAAG,IAAI,CAAA;IAE9B,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAa,OAAO;QAClB,OAAO,CAAC,qBAAqB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,yBAAyB,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;IAC7H,CAAC;IAED,IAAuB,kBAAkB;QACvC,OAAO;YACL,+BAA+B,EAAE,KAAK;YACtC,iCAAiC,EAAE,KAAK;YACxC,+BAA+B,EAAE,KAAK;YACtC,mCAAmC,EAAE,KAAK;SAC3C,CAAA;IACH,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,MAAe;QAC3B,OAAQ,MAAuB,CAAC,MAAM,CAAA;IACxC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,CAAC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACvE,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC,CAAA;IAC3F,CAAC;IAEQ,KAAK,CAAC,QAAQ,CAAC,eAA0B;QAChD,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAA;IACpD,CAAC;IAED,QAAQ,CAAC,OAAuB;QAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAED,iBAAiB;QACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAIQ,KAAK,CAAC,OAAO,CACpB,qBAA6C,EAC7C,OAA6B;QAE7B,sFAAsF;QACtF,6CAA6C;QAC7C,IAAI,OAAO,qBAAqB,KAAK,QAAQ,EAAE;YAC7C,QAAQ,OAAO,EAAE,UAAU,EAAE;gBAC3B,KAAK,SAAS,CAAC,CAAC;oBACd,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;iBACxD;gBACD,KAAK,KAAK,CAAC,CAAC;oBACV,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAA;iBACpD;gBACD,OAAO,CAAC,CAAC;oBACP,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAA;iBAC3D;aACF;SACF;aAAM;YACL,QAAQ,OAAO,EAAE,UAAU,EAAE;gBAC3B,KAAK,KAAK,CAAC,CAAC;oBACV,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAA;iBACpD;gBACD,KAAK,SAAS,CAAC,CAAC;oBACd,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAA;iBACxD;gBACD,OAAO,CAAC,CAAC;oBACP,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAA;iBAC3D;aACF;SACF;IACH,CAAC;IAED,UAAU,CAAC,OAAuB;QAChC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;IAEkB,KAAK,CAAC,eAAe;QACtC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAA;QAC9C,MAAM,iBAAiB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAC9C,IAAI,cAAc,CAAiB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,CAC9H,CAAA;QAED,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,GAAG,iBAAiB,CAAC,CAAA;IACnE,CAAC;IAEkB,KAAK,CAAC,eAAe,CAAC,kBAA4B,EAAE;QACrE,MAAM,QAAQ,GAAwB,EAAE,GAAG,CAAC,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAA;QAC/G,MAAM,kBAAkB,GAAG,CAAC,GAAG,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAE7D,MAAM,aAAa,GAAG,CAAC,MAAsB,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC9H,MAAM,UAAU,GAAG,CAAC,MAAsB,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAA;QAElF,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAA;QACtH,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAA;YACzC,QAAQ,CAAC,OAAO,CAAC,OAAO,GAAG,cAAc,CAAA;SAC1C;QAED,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAA;QACrG,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5B,QAAQ,CAAC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAA;YACzC,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,aAAa,CAAA;SACxC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEkB,KAAK,CAAC,YAAY,CACnC,KAAQ,EACR,QAAoB,EACpB,WAAqB;QAErB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAY,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC/E,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAA;QAC7C,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACtD,MAAM,cAAc,GAAc,EAAE,CAAA;QACpC,QAAQ,YAAY,CAAC,MAAM,EAAE;YAC3B,KAAK,qBAAqB,CAAC,CAAC;gBAC1B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;gBACpF,IAAI,OAAO,EAAE;oBACX,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;oBACzF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAC7B;gBACD,MAAK;aACN;YACD,KAAK,qBAAqB,CAAC,CAAC;gBAC1B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;gBAC7D,IAAI,OAAO,EAAE;oBACX,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;oBACzF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAC7B;gBACD,MAAK;aACN;YACD,KAAK,uBAAuB,CAAC,CAAC;gBAC5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;gBACvC,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;oBAC/B,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;oBACzF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAC7B;gBACD,MAAK;aACN;YACD,KAAK,yBAAyB,CAAC,CAAC;gBAC9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;gBACzC,KAAK,MAAM,OAAO,IAAI,SAAS,EAAE;oBAC/B,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAA;oBACzF,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;iBAC7B;gBACD,MAAK;aACN;YACD;gBACE,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;SACnD;QACD,OAAO,cAAc,CAAA;IACvB,CAAC;IAIO,KAAK,CAAC,UAAU,CACtB,qBAA6C,EAC7C,OAA6B;QAE7B,QAAQ,OAAO,qBAAqB,EAAE;YACpC,KAAK,QAAQ,CAAC,CAAC;gBACb,OAAO,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC,CAAA;aAC5H;YACD,OAAO,CAAC,CAAC;gBACP,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CACtI,gBAAgB,CACjB,CAAA;aACF;SACF;IACH,CAAC;IAIO,KAAK,CAAC,cAAc,CAC1B,qBAA6C,EAC7C,OAA6B;QAE7B,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,IAAI,KAAK,CAAA;QAC7C,MAAM,IAAI,GAAG,SAAS,KAAK,MAAM,IAAI,SAAS,KAAK,KAAK,CAAA;QACxD,QAAQ,OAAO,qBAAqB,EAAE;YACpC,KAAK,QAAQ,CAAC,CAAC;gBACb,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;aACpF;YACD,OAAO,CAAC,CAAC;gBACP,OAAO,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;aACpF;SACF;IACH,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { QueryBoundWitness } from '@xyo-network/boundwitness-builder';
|
|
2
2
|
import { NodeManifestPayload } from '@xyo-network/manifest-model';
|
|
3
3
|
import { AbstractModuleInstance, CompositeModuleResolver } from '@xyo-network/module-abstract';
|
|
4
|
-
import { Module, ModuleConfig, ModuleFilter, ModuleFilterOptions, ModuleInstance,
|
|
4
|
+
import { Module, ModuleConfig, ModuleFilter, ModuleFilterOptions, ModuleInstance, ModuleQueryHandlerResult } from '@xyo-network/module-model';
|
|
5
5
|
import { NodeModule, NodeModuleEventData, NodeModuleParams, NodeQueryBase } from '@xyo-network/node-model';
|
|
6
6
|
import { Payload } from '@xyo-network/payload-model';
|
|
7
7
|
import { Promisable } from '@xyo-network/promise';
|
|
@@ -24,7 +24,7 @@ export declare abstract class AbstractNode<TParams extends NodeModuleParams = No
|
|
|
24
24
|
unregister(_module: ModuleInstance): Promisable<this>;
|
|
25
25
|
protected discoverHandler(): Promise<Payload[]>;
|
|
26
26
|
protected manifestHandler(ignoreAddresses?: string[]): Promise<NodeManifestPayload>;
|
|
27
|
-
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<
|
|
27
|
+
protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryHandlerResult>;
|
|
28
28
|
private resolveAll;
|
|
29
29
|
private resolvePrivate;
|
|
30
30
|
abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AbstractNode.d.ts","sourceRoot":"","sources":["../../src/AbstractNode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAC/F,OAAO,EAAE,mBAAmB,EAA6B,MAAM,6BAA6B,CAAA;AAC5F,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAC9F,OAAO,EAEL,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,cAAc,EACd,wBAAwB,EACzB,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAKL,UAAU,EACV,mBAAmB,EACnB,gBAAgB,EAEhB,aAAa,EAEd,MAAM,yBAAyB,CAAA;AAEhC,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,8BAAsB,YAAY,CAAC,OAAO,SAAS,gBAAgB,GAAG,gBAAgB,EAAE,UAAU,SAAS,mBAAmB,GAAG,mBAAmB,CAClJ,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC;IAEvE,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAqB;IAErE,SAAS,CAAC,QAAQ,CAAC,eAAe,0BAAgC;IAElE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAO;IAE9B,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAOnF;IAED,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO;IAIvB,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI7B,eAAe,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAI3B,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAIjF,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;IAInD,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;IAIlC,iBAAiB,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;IAI1B,OAAO,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IACxF,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAkCjH,UAAU,CAAC,OAAO,EAAE,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;cAI5B,eAAe,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;cASrC,eAAe,CAAC,eAAe,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,mBAAmB,CAAC;cAsB7E,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,wBAAwB,CAAC;YA4CtB,UAAU;YAkBV,cAAc;IAkB5B,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1F,QAAQ,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,GAAG,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC;CACvE"}
|
package/package.json
CHANGED
|
@@ -11,19 +11,17 @@
|
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
13
|
"@xylabs/assert": "^2.9.3",
|
|
14
|
-
"@xyo-network/
|
|
15
|
-
"@xyo-network/
|
|
16
|
-
"@xyo-network/
|
|
17
|
-
"@xyo-network/
|
|
18
|
-
"@xyo-network/
|
|
19
|
-
"@xyo-network/module": "~2.
|
|
20
|
-
"@xyo-network/
|
|
21
|
-
"@xyo-network/
|
|
22
|
-
"@xyo-network/
|
|
23
|
-
"@xyo-network/
|
|
24
|
-
"@xyo-network/
|
|
25
|
-
"@xyo-network/payload-model": "~2.68.0",
|
|
26
|
-
"@xyo-network/promise": "~2.68.0",
|
|
14
|
+
"@xyo-network/address-payload-plugin": "~2.69.0-rc.2",
|
|
15
|
+
"@xyo-network/boundwitness-builder": "~2.69.0-rc.2",
|
|
16
|
+
"@xyo-network/manifest-model": "~2.69.0-rc.2",
|
|
17
|
+
"@xyo-network/module": "~2.69.0-rc.2",
|
|
18
|
+
"@xyo-network/module-abstract": "~2.69.0-rc.2",
|
|
19
|
+
"@xyo-network/module-model": "~2.69.0-rc.2",
|
|
20
|
+
"@xyo-network/node-model": "~2.69.0-rc.2",
|
|
21
|
+
"@xyo-network/node-wrapper": "~2.69.0-rc.2",
|
|
22
|
+
"@xyo-network/payload-builder": "~2.69.0-rc.2",
|
|
23
|
+
"@xyo-network/payload-model": "~2.69.0-rc.2",
|
|
24
|
+
"@xyo-network/promise": "~2.69.0-rc.2",
|
|
27
25
|
"lodash": "^4.17.21"
|
|
28
26
|
},
|
|
29
27
|
"devDependencies": {
|
|
@@ -65,5 +63,6 @@
|
|
|
65
63
|
},
|
|
66
64
|
"sideEffects": false,
|
|
67
65
|
"types": "dist/types/index.d.ts",
|
|
68
|
-
"version": "2.
|
|
66
|
+
"version": "2.69.0-rc.2",
|
|
67
|
+
"stableVersion": "2.68.0"
|
|
69
68
|
}
|
package/src/AbstractNode.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { assertEx } from '@xylabs/assert'
|
|
2
|
-
import { Account } from '@xyo-network/account'
|
|
3
2
|
import { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'
|
|
4
3
|
import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
|
|
5
|
-
import { handleErrorAsync } from '@xyo-network/error'
|
|
6
4
|
import { NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'
|
|
7
|
-
import { AbstractModuleInstance, CompositeModuleResolver
|
|
5
|
+
import { AbstractModuleInstance, CompositeModuleResolver } from '@xyo-network/module-abstract'
|
|
8
6
|
import {
|
|
9
7
|
duplicateModules,
|
|
10
8
|
Module,
|
|
@@ -12,7 +10,7 @@ import {
|
|
|
12
10
|
ModuleFilter,
|
|
13
11
|
ModuleFilterOptions,
|
|
14
12
|
ModuleInstance,
|
|
15
|
-
|
|
13
|
+
ModuleQueryHandlerResult,
|
|
16
14
|
} from '@xyo-network/module-model'
|
|
17
15
|
import {
|
|
18
16
|
NodeAttachedQuerySchema,
|
|
@@ -27,7 +25,7 @@ import {
|
|
|
27
25
|
NodeRegisteredQuerySchema,
|
|
28
26
|
} from '@xyo-network/node-model'
|
|
29
27
|
import { PayloadBuilder } from '@xyo-network/payload-builder'
|
|
30
|
-
import {
|
|
28
|
+
import { Payload } from '@xyo-network/payload-model'
|
|
31
29
|
import { Promisable } from '@xyo-network/promise'
|
|
32
30
|
|
|
33
31
|
export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModuleParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
|
|
@@ -159,63 +157,48 @@ export abstract class AbstractNode<TParams extends NodeModuleParams = NodeModule
|
|
|
159
157
|
query: T,
|
|
160
158
|
payloads?: Payload[],
|
|
161
159
|
queryConfig?: TConfig,
|
|
162
|
-
): Promise<
|
|
160
|
+
): Promise<ModuleQueryHandlerResult> {
|
|
163
161
|
const wrapper = QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)
|
|
164
162
|
const queryPayload = await wrapper.getQuery()
|
|
165
163
|
assertEx(this.queryable(query, payloads, queryConfig))
|
|
166
|
-
const queryAccount = Account.randomSync()
|
|
167
164
|
const resultPayloads: Payload[] = []
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
const
|
|
173
|
-
|
|
174
|
-
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
|
|
175
|
-
resultPayloads.push(payload)
|
|
176
|
-
}
|
|
177
|
-
break
|
|
165
|
+
switch (queryPayload.schema) {
|
|
166
|
+
case NodeAttachQuerySchema: {
|
|
167
|
+
const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)
|
|
168
|
+
if (address) {
|
|
169
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
|
|
170
|
+
resultPayloads.push(payload)
|
|
178
171
|
}
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
}
|
|
185
|
-
|
|
172
|
+
break
|
|
173
|
+
}
|
|
174
|
+
case NodeDetachQuerySchema: {
|
|
175
|
+
const address = await this.detach(queryPayload.nameOrAddress)
|
|
176
|
+
if (address) {
|
|
177
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
|
|
178
|
+
resultPayloads.push(payload)
|
|
186
179
|
}
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
}
|
|
193
|
-
|
|
180
|
+
break
|
|
181
|
+
}
|
|
182
|
+
case NodeAttachedQuerySchema: {
|
|
183
|
+
const addresses = await this.attached()
|
|
184
|
+
for (const address of addresses) {
|
|
185
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
|
|
186
|
+
resultPayloads.push(payload)
|
|
194
187
|
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
}
|
|
201
|
-
|
|
188
|
+
break
|
|
189
|
+
}
|
|
190
|
+
case NodeRegisteredQuerySchema: {
|
|
191
|
+
const addresses = await this.registered()
|
|
192
|
+
for (const address of addresses) {
|
|
193
|
+
const payload = new PayloadBuilder({ schema: AddressSchema }).fields({ address }).build()
|
|
194
|
+
resultPayloads.push(payload)
|
|
202
195
|
}
|
|
203
|
-
|
|
204
|
-
return await super.queryHandler(query, payloads)
|
|
196
|
+
break
|
|
205
197
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
errorPayloads.push(
|
|
209
|
-
new ModuleErrorBuilder()
|
|
210
|
-
.sources([await wrapper.hashAsync()])
|
|
211
|
-
.name(this.config.name ?? '<Unknown>')
|
|
212
|
-
.query(query.schema)
|
|
213
|
-
.message(error.message)
|
|
214
|
-
.build(),
|
|
215
|
-
)
|
|
216
|
-
})
|
|
198
|
+
default:
|
|
199
|
+
return await super.queryHandler(query, payloads)
|
|
217
200
|
}
|
|
218
|
-
return
|
|
201
|
+
return resultPayloads
|
|
219
202
|
}
|
|
220
203
|
|
|
221
204
|
private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>
|