@peerbit/rpc 2.1.3 → 2.1.4
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/lib/esm/controller.js +10 -10
- package/lib/esm/controller.js.map +1 -1
- package/lib/esm/utils.js +1 -1
- package/package.json +6 -6
- package/src/controller.ts +17 -14
- package/src/io.ts +1 -1
- package/src/utils.ts +1 -1
package/lib/esm/controller.js
CHANGED
|
@@ -4,8 +4,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
-
import { BorshError, deserialize, serialize, variant
|
|
8
|
-
import { DecryptedThing, toBase64, AccessError, X25519Keypair
|
|
7
|
+
import { BorshError, deserialize, serialize, variant } from "@dao-xyz/borsh";
|
|
8
|
+
import { DecryptedThing, toBase64, AccessError, X25519Keypair } from "@peerbit/crypto";
|
|
9
9
|
import { RequestV0, ResponseV0, RPCMessage } from "./encoding.js";
|
|
10
10
|
import { logger } from "./io.js";
|
|
11
11
|
import { Program } from "@peerbit/program";
|
|
@@ -85,7 +85,7 @@ export let RPC = class RPC extends Program {
|
|
|
85
85
|
this._onMessageBinded = this._onMessageBinded || this._onMessage.bind(this);
|
|
86
86
|
if (wasSubscribed) {
|
|
87
87
|
await this.node.services.pubsub.unsubscribe(this.rpcTopic, {
|
|
88
|
-
data: prevSubscriptionData
|
|
88
|
+
data: prevSubscriptionData
|
|
89
89
|
});
|
|
90
90
|
}
|
|
91
91
|
this._subscribing = this.node.services.pubsub
|
|
@@ -111,7 +111,7 @@ export let RPC = class RPC extends Program {
|
|
|
111
111
|
const maybeEncrypted = rpcMessage.request;
|
|
112
112
|
const decrypted = await maybeEncrypted.decrypt(this.node.keychain);
|
|
113
113
|
const response = await this._responseHandler(this._getRequestValueFn(decrypted), {
|
|
114
|
-
from: message.sender
|
|
114
|
+
from: message.sender
|
|
115
115
|
});
|
|
116
116
|
if (response && rpcMessage.respondTo) {
|
|
117
117
|
// send query and wait for replies in a generator like behaviour
|
|
@@ -121,17 +121,17 @@ export let RPC = class RPC extends Program {
|
|
|
121
121
|
// that is now known in the .pubsub network, hence the message might not be delivired if we
|
|
122
122
|
// send with { to: [RECIEVER] } param
|
|
123
123
|
const decryptedMessage = new DecryptedThing({
|
|
124
|
-
data: serializedResponse
|
|
124
|
+
data: serializedResponse
|
|
125
125
|
});
|
|
126
126
|
let maybeEncryptedMessage = decryptedMessage;
|
|
127
127
|
maybeEncryptedMessage = await decryptedMessage.encrypt(this._keypair, rpcMessage.respondTo);
|
|
128
128
|
await this.node.services.pubsub.publish(serialize(new ResponseV0({
|
|
129
129
|
response: maybeEncryptedMessage,
|
|
130
|
-
requestId: message.id
|
|
130
|
+
requestId: message.id
|
|
131
131
|
})), {
|
|
132
132
|
topics: [this.rpcTopic],
|
|
133
133
|
to: [message.sender],
|
|
134
|
-
strict: true
|
|
134
|
+
strict: true
|
|
135
135
|
});
|
|
136
136
|
}
|
|
137
137
|
}
|
|
@@ -144,7 +144,7 @@ export let RPC = class RPC extends Program {
|
|
|
144
144
|
}
|
|
145
145
|
handler({
|
|
146
146
|
message,
|
|
147
|
-
response: rpcMessage
|
|
147
|
+
response: rpcMessage
|
|
148
148
|
});
|
|
149
149
|
}
|
|
150
150
|
}
|
|
@@ -167,7 +167,7 @@ export let RPC = class RPC extends Program {
|
|
|
167
167
|
? request
|
|
168
168
|
: serialize(request);
|
|
169
169
|
const decryptedMessage = new DecryptedThing({
|
|
170
|
-
data: requestData
|
|
170
|
+
data: requestData
|
|
171
171
|
});
|
|
172
172
|
let maybeEncryptedMessage = decryptedMessage;
|
|
173
173
|
if (options?.encryption?.responders &&
|
|
@@ -176,7 +176,7 @@ export let RPC = class RPC extends Program {
|
|
|
176
176
|
}
|
|
177
177
|
const requestMessage = new RequestV0({
|
|
178
178
|
request: maybeEncryptedMessage,
|
|
179
|
-
respondTo
|
|
179
|
+
respondTo
|
|
180
180
|
});
|
|
181
181
|
return requestMessage;
|
|
182
182
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAEN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../../src/controller.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/utils.js
CHANGED
|
@@ -23,7 +23,7 @@ export const queryAll = (rpc, groups, request, responseHandler, options) => {
|
|
|
23
23
|
if (peersToQuery.length > 0) {
|
|
24
24
|
const results = await rpc.request(request, {
|
|
25
25
|
...options,
|
|
26
|
-
to: peersToQuery
|
|
26
|
+
to: peersToQuery
|
|
27
27
|
});
|
|
28
28
|
for (const result of results) {
|
|
29
29
|
if (!result.from) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@peerbit/rpc",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.4",
|
|
4
4
|
"description": "RPC calls for peers",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -32,13 +32,13 @@
|
|
|
32
32
|
"license": "MIT",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@dao-xyz/borsh": "^5.1.5",
|
|
35
|
-
"@peerbit/crypto": "1.0.
|
|
35
|
+
"@peerbit/crypto": "1.0.6",
|
|
36
36
|
"@peerbit/logger": "1.0.1",
|
|
37
|
-
"@peerbit/program": "2.2.
|
|
38
|
-
"@peerbit/time": "1.0.
|
|
37
|
+
"@peerbit/program": "2.2.3",
|
|
38
|
+
"@peerbit/time": "1.0.3"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@peerbit/test-utils": "^1.0.
|
|
41
|
+
"@peerbit/test-utils": "^1.0.20"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "0cfa376bc90c31e1063ddaf5435c828b490e0228"
|
|
44
44
|
}
|
package/src/controller.ts
CHANGED
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
BorshError,
|
|
4
4
|
deserialize,
|
|
5
5
|
serialize,
|
|
6
|
-
variant
|
|
6
|
+
variant
|
|
7
7
|
} from "@dao-xyz/borsh";
|
|
8
8
|
import {
|
|
9
9
|
DecryptedThing,
|
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
toBase64,
|
|
13
13
|
AccessError,
|
|
14
14
|
X25519PublicKey,
|
|
15
|
-
X25519Keypair
|
|
15
|
+
X25519Keypair
|
|
16
16
|
} from "@peerbit/crypto";
|
|
17
17
|
import { RequestV0, ResponseV0, RPCMessage } from "./encoding.js";
|
|
18
18
|
import { RPCOptions, logger, RPCResponse, PublishOptions } from "./io.js";
|
|
@@ -20,7 +20,7 @@ import { Address } from "@peerbit/program";
|
|
|
20
20
|
import {
|
|
21
21
|
DataEvent,
|
|
22
22
|
PubSubData,
|
|
23
|
-
PublishOptions as PubSubPublishOptions
|
|
23
|
+
PublishOptions as PubSubPublishOptions
|
|
24
24
|
} from "@peerbit/pubsub-interface";
|
|
25
25
|
import { Program } from "@peerbit/program";
|
|
26
26
|
import { DataMessage } from "@peerbit/stream-interface";
|
|
@@ -136,7 +136,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
136
136
|
|
|
137
137
|
if (wasSubscribed) {
|
|
138
138
|
await this.node.services.pubsub.unsubscribe(this.rpcTopic, {
|
|
139
|
-
data: prevSubscriptionData
|
|
139
|
+
data: prevSubscriptionData
|
|
140
140
|
});
|
|
141
141
|
}
|
|
142
142
|
|
|
@@ -171,7 +171,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
171
171
|
const response = await this._responseHandler(
|
|
172
172
|
this._getRequestValueFn(decrypted),
|
|
173
173
|
{
|
|
174
|
-
from: message.sender
|
|
174
|
+
from: message.sender
|
|
175
175
|
}
|
|
176
176
|
);
|
|
177
177
|
|
|
@@ -185,7 +185,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
185
185
|
// send with { to: [RECIEVER] } param
|
|
186
186
|
|
|
187
187
|
const decryptedMessage = new DecryptedThing<Uint8Array>({
|
|
188
|
-
data: serializedResponse
|
|
188
|
+
data: serializedResponse
|
|
189
189
|
});
|
|
190
190
|
let maybeEncryptedMessage: MaybeEncrypted<Uint8Array> =
|
|
191
191
|
decryptedMessage;
|
|
@@ -199,13 +199,13 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
199
199
|
serialize(
|
|
200
200
|
new ResponseV0({
|
|
201
201
|
response: maybeEncryptedMessage,
|
|
202
|
-
requestId: message.id
|
|
202
|
+
requestId: message.id
|
|
203
203
|
})
|
|
204
204
|
),
|
|
205
205
|
{
|
|
206
206
|
topics: [this.rpcTopic],
|
|
207
207
|
to: [message.sender],
|
|
208
|
-
strict: true
|
|
208
|
+
strict: true
|
|
209
209
|
}
|
|
210
210
|
);
|
|
211
211
|
}
|
|
@@ -218,7 +218,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
218
218
|
}
|
|
219
219
|
handler!({
|
|
220
220
|
message,
|
|
221
|
-
response: rpcMessage
|
|
221
|
+
response: rpcMessage
|
|
222
222
|
});
|
|
223
223
|
}
|
|
224
224
|
} catch (error: any) {
|
|
@@ -249,7 +249,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
249
249
|
: serialize(request);
|
|
250
250
|
|
|
251
251
|
const decryptedMessage = new DecryptedThing<Uint8Array>({
|
|
252
|
-
data: requestData
|
|
252
|
+
data: requestData
|
|
253
253
|
});
|
|
254
254
|
|
|
255
255
|
let maybeEncryptedMessage: MaybeEncrypted<Uint8Array> = decryptedMessage;
|
|
@@ -266,7 +266,7 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
266
266
|
|
|
267
267
|
const requestMessage = new RequestV0({
|
|
268
268
|
request: maybeEncryptedMessage,
|
|
269
|
-
respondTo
|
|
269
|
+
respondTo
|
|
270
270
|
});
|
|
271
271
|
|
|
272
272
|
return requestMessage;
|
|
@@ -373,9 +373,12 @@ export class RPC<Q, R> extends Program<RPCSetupOptions<Q, R>> {
|
|
|
373
373
|
|
|
374
374
|
const deferredPromise = pDefer();
|
|
375
375
|
options?.stopper && options.stopper(deferredPromise.resolve);
|
|
376
|
-
timeoutFn = setTimeout(
|
|
377
|
-
|
|
378
|
-
|
|
376
|
+
timeoutFn = setTimeout(
|
|
377
|
+
() => {
|
|
378
|
+
deferredPromise.resolve();
|
|
379
|
+
},
|
|
380
|
+
options?.timeout || 10 * 1000
|
|
381
|
+
);
|
|
379
382
|
|
|
380
383
|
const expectedResponders =
|
|
381
384
|
options?.to && options.to.length > 0
|
package/src/io.ts
CHANGED