Skip to content

Commit

Permalink
Merge pull request #28 from felixwiemuth/dev-master-merged
Browse files Browse the repository at this point in the history
Merge master into dev
aslanix authored Feb 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents a979eea + 1d91921 commit 0dea01a
Showing 100 changed files with 1,714 additions and 2,940 deletions.
2 changes: 1 addition & 1 deletion examples/network/echo/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MKID=node $(TROUPE)/rt/built/p2p/mkid.js
MKID=node $(TROUPE)/rt/built/p2p/mkid.mjs
MKALIASES=node $(TROUPE)/rt/built/p2p/mkaliases.js
START=$(TROUPE)/network.sh

2 changes: 1 addition & 1 deletion examples/network/parallel/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MKID=node $(TROUPE)/rt/built/p2p/mkid.js
MKID=node $(TROUPE)/rt/built/p2p/mkid.mjs
MKALIASES=node $(TROUPE)/rt/built/p2p/mkaliases.js
START=$(TROUPE)/network.sh

2 changes: 1 addition & 1 deletion examples/network/pingpong/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MKID=node $(TROUPE)/rt/built/p2p/mkid.js
MKID=node $(TROUPE)/rt/built/p2p/mkid.mjs
MKALIASES=node $(TROUPE)/rt/built/p2p/mkaliases.js
START=$(TROUPE)/network.sh

5 changes: 3 additions & 2 deletions local.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
#!/bin/sh

tmp=`mktemp`
tmp=`mktemp`.js

$TROUPE/bin/troupec $1 --output=$tmp

if [ $? -eq 0 ]; then
node --stack-trace-limit=1000 $TROUPE/rt/built/troupe.js -f=$tmp --localonly #--debug
node --stack-trace-limit=1000 $TROUPE/rt/built/troupe.mjs -f=$tmp --localonly #--debug
rm $tmp
else
exit $?
2 changes: 1 addition & 1 deletion network.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

tmp=`mktemp`
tmp=`mktemp`.js

$TROUPE/bin/troupec $1 --output=$tmp

File renamed without changes.
File renamed without changes.
37 changes: 15 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -14,40 +14,33 @@
"author": "",
"license": "ISC",
"dependencies": {
"@chainsafe/libp2p-noise": "^12.0.1",
"@chainsafe/libp2p-yamux": "^4.0.2",
"@libp2p/bootstrap": "^8.0.0",
"@libp2p/interface-connection-manager": "^3.0.1",
"@libp2p/kad-dht": "^9.3.4",
"@libp2p/mdns": "^8.0.0",
"@libp2p/mplex": "^8.0.3",
"@libp2p/peer-store": "^8.2.1",
"@libp2p/tcp": "^7.0.1",
"@libp2p/websockets": "^6.0.1",
"@nodeutils/defaults-deep": "^1.1.0",
"chalk": "^4.1.0",
"@types/node": "^18.15.3",
"aggregate-error": "^4.0.1",
"chalk": "^5.2.0",
"find-free-port": "^2.0.0",
"it-length-prefixed": "^3.0.1",
"it-pipe": "^1.1.0",
"it-pushable": "^1.4.0",
"libp2p": "^0.27.4",
"libp2p-bootstrap": "^0.10.4",
"libp2p-kad-dht": "^0.18.6",
"libp2p-mdns": "^0.13.3",
"libp2p-mplex": "^0.9.5",
"libp2p-secio": "^0.12.4",
"libp2p-spdy": "^0.13.3",
"libp2p-tcp": "^0.14.4",
"libp2p-websocket-star": "^0.10.2",
"libp2p-websockets": "^0.13.6",
"libp2p": "^0.45.3",
"npm": "^6.14.4",
"p-defer": "^3.0.0",
"p-fifo": "^1.0.0",
"peer-id": "^0.13.11",
"peer-info": "^0.17.5",
"postinstall-postinstall": "^2.1.0",
"progress": "^2.0.3",
"pull-pushable": "^2.2.0",
"pull-stream": "^3.6.14",
"request": "^2.88.2",
"socket.io": "^2.3.0",
"streaming-iterables": "^4.1.2",
"update": "^0.7.4",
"uuid": "^7.0.2",
"winston": "^3.2.1",
"yargs": "^15.3.1"
},
"devDependencies": {
"@types/ws": "^8.5.4",
"@types/yargs": "^15.0.4",
"patch-package": "^6.5.1",
"postinstall-prepare": "^1.0.1",
5 changes: 3 additions & 2 deletions relay/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
start-relay:
./troupe-p2p-relay --key=keys/relay.priv
node relay.mjs

generate-relay-key:
node $(TROUPE)/rt/built/p2p/mkid.js --privkeyfile=keys/relay.priv --idfile=keys/relay.id --verbose
mkdir -p keys
node $(TROUPE)/rt/built/p2p/mkid.mjs --privkeyfile=keys/relay.priv --idfile=keys/relay.id --verbose
15 changes: 0 additions & 15 deletions relay/go.mod

This file was deleted.

1,292 changes: 0 additions & 1,292 deletions relay/go.sum

This file was deleted.

189 changes: 0 additions & 189 deletions relay/main.go

This file was deleted.

Loading

0 comments on commit 0dea01a

Please sign in to comment.