Skip to content

Commit

Permalink
fix wrong names for topology::discovery; disable `runOnTransientConne…
Browse files Browse the repository at this point in the history
…ctions`
  • Loading branch information
d-roak committed Jul 2, 2024
1 parent 9e9be3a commit 1c332b4
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion examples/canvas/src/handlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ICanvas } from "./objects/canvas";

// TODO: this should be superseded by wasm and main ts-topology library
export const handleCanvasMessages = (canvas: ICanvas, e: any) => {
if (e.detail.msg.topic === "_peer-discovery._p2p._pubsub") return;
if (e.detail.msg.topic === "topology::discovery") return;
const input = uint8ArrayToString(e.detail.msg.data);
const message = JSON.parse(input);
switch (message["type"]) {
Expand Down
2 changes: 1 addition & 1 deletion examples/canvas/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ async function init() {
node.addCustomGroupMessageHandler((e) => {
handleCanvasMessages(canvasCRO, e);
peers = node.getPeers();
discoveryPeers = node.getPeersPerGroup("_peer-discovery._p2p._pubsub");
discoveryPeers = node.getPeersPerGroup("topology::discovery");
if (canvasCRO) {
objectPeers = node.getPeersPerGroup(canvasCRO.getObjectId());
}
Expand Down
26 changes: 13 additions & 13 deletions examples/canvas/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -624,11 +624,11 @@
resolved "https://registry.yarnpkg.com/@sindresorhus/fnv1a/-/fnv1a-3.1.0.tgz#f8e46597298f6fd4c12dc901cdd4e73beb4d24fa"
integrity sha512-KV321z5m/0nuAg83W1dPLy85HpHDk7Sdi4fJbwvacWsEhAh+rZUW4ZfGcXmUIvjZg4ss2bcwNlRhJ7GBEUG08w==

"@topology-foundation/[email protected].10", "@topology-foundation/crdt@file:../../packages/crdt":
version "0.0.10"
"@topology-foundation/[email protected].11", "@topology-foundation/crdt@file:../../packages/crdt":
version "0.0.11"

"@topology-foundation/[email protected].10", "@topology-foundation/network@file:../../packages/network":
version "0.0.10"
"@topology-foundation/[email protected].11", "@topology-foundation/network@file:../../packages/network":
version "0.0.11"
dependencies:
"@chainsafe/libp2p-gossipsub" "^13.0.0"
"@chainsafe/libp2p-noise" "^15.0.0"
Expand All @@ -648,20 +648,20 @@
libp2p "^1.6.0"

"@topology-foundation/node@file:../../packages/node":
version "0.0.10"
version "0.0.11"
dependencies:
"@libp2p/dcutr" "^1.1.0"
"@topology-foundation/crdt" "0.0.10"
"@topology-foundation/network" "0.0.10"
"@topology-foundation/object" "0.0.10"
"@topology-foundation/crdt" "0.0.11"
"@topology-foundation/network" "0.0.11"
"@topology-foundation/object" "0.0.11"

"@topology-foundation/[email protected].10":
version "0.0.10"
resolved "https://registry.yarnpkg.com/@topology-foundation/object/-/object-0.0.10.tgz#04bb130d923b9c5a08d0222f05ce21b2c13c270d"
integrity sha512-XlvnBTIDV/00rdtJ/ZZXGNdw34flSI5SkjpAiw304RF62IiMGH/hEvdfw9A24rTjF2YmzZz0a94ExLxTDBkeTA==
"@topology-foundation/[email protected].11":
version "0.0.11"
resolved "https://registry.yarnpkg.com/@topology-foundation/object/-/object-0.0.11.tgz#eefc084ad1231d01340e31a400223944178ae207"
integrity sha512-zIXzu6U1FYwEXBqCht/JBo71RNC5tL2wJbo5qI6WeotHpNYLpcCM/X0y7M+fvKQtdyb/vJRf2FjwIjqA1knI9g==

"@topology-foundation/object@file:../../packages/object":
version "0.0.10"
version "0.0.11"

"@tsconfig/node10@^1.0.7":
version "1.0.11"
Expand Down
6 changes: 3 additions & 3 deletions packages/network/src/node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export class TopologyNetworkNode {
identify: identify(),
pubsub: gossipsub({
allowPublishToZeroTopicPeers: true,
runOnTransientConnection: true,
// runOnTransientConnection: true,
}),
dcutr: dcutr(),
},
Expand Down Expand Up @@ -181,7 +181,7 @@ export class TopologyNetworkNode {
try {
const connection = await this._node?.dial([multiaddr(`/p2p/${peerId}`)]);
const stream = <Stream>await connection?.newStream(protocols, {
runOnTransientConnection: true,
// runOnTransientConnection: true,
});
stringToStream(stream, message);

Expand All @@ -205,7 +205,7 @@ export class TopologyNetworkNode {

const connection = await this._node?.dial(peerId);
const stream: Stream = (await connection?.newStream(protocols, {
runOnTransientConnection: true,
// runOnTransientConnection: true,
})) as Stream;
stringToStream(stream, message);

Expand Down

0 comments on commit 1c332b4

Please sign in to comment.