@dxos/network-manager 2.33.7 → 2.33.8-dev.6bc74570
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/browser-mocha/bundle.js +21486 -21483
- package/dist/src/protocol-factory.js +4 -3
- package/dist/src/protocol-factory.js.map +1 -1
- package/dist/src/testing/test-protocol.d.ts.map +1 -1
- package/dist/src/testing/test-protocol.js +7 -7
- package/dist/src/testing/test-protocol.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -10
- package/src/protocol-factory.ts +4 -4
- package/src/testing/test-protocol.ts +7 -7
|
@@ -11,6 +11,7 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
11
11
|
const debug_1 = __importDefault(require("debug"));
|
|
12
12
|
const crypto_1 = require("@dxos/crypto");
|
|
13
13
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
14
|
+
const protocols_1 = require("@dxos/protocols");
|
|
14
15
|
const log = (0, debug_1.default)('dxos:network-manager:protocol-factory');
|
|
15
16
|
/**
|
|
16
17
|
* Returns a function that takes a channel parameter, returns a Protocol object
|
|
@@ -30,7 +31,7 @@ const protocolFactory = ({ session = {}, plugins = [], getTopics }) => {
|
|
|
30
31
|
discoveryToPublicKey: (dk) => {
|
|
31
32
|
const publicKey = getTopics().find(topic => (0, crypto_1.discoveryKey)(topic).equals(dk));
|
|
32
33
|
if (publicKey) {
|
|
33
|
-
protocol.setContext({ topic:
|
|
34
|
+
protocol.setContext({ topic: protocols_1.PublicKey.stringify(publicKey) });
|
|
34
35
|
}
|
|
35
36
|
(0, assert_1.default)(publicKey, 'PublicKey not found in discovery.');
|
|
36
37
|
return publicKey;
|
|
@@ -49,7 +50,7 @@ const protocolFactory = ({ session = {}, plugins = [], getTopics }) => {
|
|
|
49
50
|
exports.protocolFactory = protocolFactory;
|
|
50
51
|
const createProtocolFactory = (topic, peerId, plugins) => (0, exports.protocolFactory)({
|
|
51
52
|
getTopics: () => [topic.asBuffer()],
|
|
52
|
-
session: { peerId:
|
|
53
|
+
session: { peerId: protocols_1.PublicKey.stringify(peerId.asBuffer()) },
|
|
53
54
|
plugins
|
|
54
55
|
});
|
|
55
56
|
exports.createProtocolFactory = createProtocolFactory;
|
|
@@ -59,7 +60,7 @@ exports.createProtocolFactory = createProtocolFactory;
|
|
|
59
60
|
*/
|
|
60
61
|
const transportProtocolProvider = (rendezvousKey, peerId, protocolPlugin) => (0, exports.protocolFactory)({
|
|
61
62
|
getTopics: () => [rendezvousKey],
|
|
62
|
-
session: { peerId:
|
|
63
|
+
session: { peerId: protocols_1.PublicKey.stringify(peerId) },
|
|
63
64
|
plugins: [protocolPlugin]
|
|
64
65
|
});
|
|
65
66
|
exports.transportProtocolProvider = transportProtocolProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protocol-factory.js","sourceRoot":"","sources":["../../src/protocol-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"protocol-factory.js","sourceRoot":"","sources":["../../src/protocol-factory.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,yCAA4C;AAC5C,uDAA0D;AAC1D,+CAA4C;AAI5C,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,uCAAuC,CAAC,CAAC;AAQ3D;;;;;;;;GAQG;AACI,MAAM,eAAe,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,SAAS,EAA0B,EAAoB,EAAE;IACrH,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC;IAClB,0CAA0C;IAC1C,OAAO,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE;QAChC,MAAM,QAAQ,GAAG,IAAI,wBAAQ,CAAC;YAC5B,aAAa,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;YAC7B,oBAAoB,EAAE,CAAC,EAAE,EAAE,EAAE;gBAC3B,MAAM,SAAS,GAAG,SAAS,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,qBAAY,EAAC,KAAK,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC5E,IAAI,SAAS,EAAE;oBACb,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,qBAAS,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;iBAChE;gBACD,IAAA,gBAAM,EAAC,SAAS,EAAE,mCAAmC,CAAC,CAAC;gBACvD,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,SAAS;YACT,WAAW,EAAE,OAAO;YACpB,YAAY,EAAE,OAAO;SACtB,CAAC,CAAC;QAEH,QAAQ;aACL,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;aAC9D,IAAI,EAAE,CAAC;QAEV,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACxB,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;AACJ,CAAC,CAAC;AA1BW,QAAA,eAAe,mBA0B1B;AAMK,MAAM,qBAAqB,GAAG,CAAC,KAAgB,EAAE,MAAiB,EAAE,OAAiB,EAAE,EAAE,CAAC,IAAA,uBAAe,EAAC;IAC/G,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IACnC,OAAO,EAAE,EAAE,MAAM,EAAE,qBAAS,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE;IAC3D,OAAO;CACR,CAAC,CAAC;AAJU,QAAA,qBAAqB,yBAI/B;AAEH;;;GAGG;AACI,MAAM,yBAAyB,GAAG,CAAC,aAAqB,EAAE,MAAc,EAAE,cAAmB,EAAoB,EAAE,CAAC,IAAA,uBAAe,EAAC;IACzI,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC;IAChC,OAAO,EAAE,EAAE,MAAM,EAAE,qBAAS,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;IAChD,OAAO,EAAE,CAAC,cAAc,CAAC;CAC1B,CAAC,CAAC;AAJU,QAAA,yBAAyB,6BAInC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-protocol.d.ts","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";;AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"test-protocol.d.ts","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";;AAQA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAU1D,eAAO,MAAM,SAAS,aAAc,QAAQ,WAG3C,CAAC;AAEF;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;IAClD,sCAAsC;IACtC,MAAM,gBAAC;IAEP,qBAAqB;IACrB,OAAO,SAAC;IAER,sBAAsB;IACtB,UAAU,UAAC;IAEX,UAAU,UAAS;IAEnB;;;;;;OAMG;gBACU,MAAM,EAAE,MAAM,EAAE,SAAS,UAAQ;IAU9C;;;OAGG;IACH,IAAI,MAAM,WAET;IAED;;;OAGG;IACH,IAAI,KAAK,UAER;IAED;;;;OAIG;IACH,eAAe;IAWf;;;;;OAKG;IACG,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAW/C,KAAK;IAIb,QAAQ,CAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG;IAUvC,cAAc,CAAE,QAAQ,EAAE,QAAQ;IAclC,iBAAiB,CAAE,QAAQ,EAAE,QAAQ;CAS5C;AAED;;GAEG;AAEH,eAAO,MAAM,oBAAoB,aAAc,MAAM,UAAU,MAAM,kBAAkB,GAAG,kCAIxF,CAAC"}
|
|
@@ -11,8 +11,8 @@ exports.testProtocolProvider = exports.TestProtocolPlugin = exports.getPeerId =
|
|
|
11
11
|
const assert_1 = __importDefault(require("assert"));
|
|
12
12
|
const debug_1 = __importDefault(require("debug"));
|
|
13
13
|
const events_1 = require("events");
|
|
14
|
-
const crypto_1 = require("@dxos/crypto");
|
|
15
14
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
15
|
+
const protocols_1 = require("@dxos/protocols");
|
|
16
16
|
const protocol_factory_1 = require("../protocol-factory");
|
|
17
17
|
const log = (0, debug_1.default)('dxos:network-manager:test');
|
|
18
18
|
const EXTENSION_NAME = 'test';
|
|
@@ -20,7 +20,7 @@ const EXTENSION_NAME = 'test';
|
|
|
20
20
|
const getPeerId = (protocol) => {
|
|
21
21
|
var _a;
|
|
22
22
|
const { peerId } = (_a = protocol.getSession()) !== null && _a !== void 0 ? _a : {};
|
|
23
|
-
return
|
|
23
|
+
return protocols_1.PublicKey.bufferize(peerId);
|
|
24
24
|
};
|
|
25
25
|
exports.getPeerId = getPeerId;
|
|
26
26
|
/**
|
|
@@ -81,7 +81,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
81
81
|
*/
|
|
82
82
|
async send(peerId, payload) {
|
|
83
83
|
(0, assert_1.default)(Buffer.isBuffer(peerId));
|
|
84
|
-
const peerIdStr =
|
|
84
|
+
const peerIdStr = protocols_1.PublicKey.stringify(peerId);
|
|
85
85
|
const peer = this._peers.get(peerIdStr);
|
|
86
86
|
// TODO(dboreham): Throw fatal error if peer not found.
|
|
87
87
|
const extension = peer.getExtension(EXTENSION_NAME);
|
|
@@ -93,7 +93,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
93
93
|
this.initCalled = true;
|
|
94
94
|
}
|
|
95
95
|
async _receive(protocol, data) {
|
|
96
|
-
const peerIdStr =
|
|
96
|
+
const peerIdStr = protocols_1.PublicKey.stringify((0, exports.getPeerId)(protocol));
|
|
97
97
|
let payload = data.data.toString();
|
|
98
98
|
if (this._uppercase) {
|
|
99
99
|
payload = payload.toUpperCase();
|
|
@@ -106,7 +106,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
106
106
|
if (peerId === undefined) {
|
|
107
107
|
return;
|
|
108
108
|
}
|
|
109
|
-
const peerIdStr =
|
|
109
|
+
const peerIdStr = protocols_1.PublicKey.stringify(peerId);
|
|
110
110
|
if (this._peers.has(peerIdStr)) {
|
|
111
111
|
return;
|
|
112
112
|
}
|
|
@@ -118,7 +118,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
118
118
|
if (peerId === undefined) {
|
|
119
119
|
return;
|
|
120
120
|
}
|
|
121
|
-
this._peers.delete(
|
|
121
|
+
this._peers.delete(protocols_1.PublicKey.stringify(peerId));
|
|
122
122
|
this.emit('disconnect', peerId);
|
|
123
123
|
}
|
|
124
124
|
}
|
|
@@ -129,7 +129,7 @@ exports.TestProtocolPlugin = TestProtocolPlugin;
|
|
|
129
129
|
// TODO(dboreham): Try to encapsulate swarmKey, nodeId.
|
|
130
130
|
const testProtocolProvider = (swarmKey, nodeId, protocolPlugin) => (0, protocol_factory_1.protocolFactory)({
|
|
131
131
|
getTopics: () => [swarmKey],
|
|
132
|
-
session: { peerId:
|
|
132
|
+
session: { peerId: protocols_1.PublicKey.stringify(nodeId) },
|
|
133
133
|
plugins: [protocolPlugin]
|
|
134
134
|
});
|
|
135
135
|
exports.testProtocolProvider = testProtocolProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-protocol.js","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,mEAAmE;AAEnE,oDAA4B;AAC5B,kDAA0B;AAC1B,mCAAsC;AAEtC,
|
|
1
|
+
{"version":3,"file":"test-protocol.js","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":"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"}
|