Skip to content

Commit 6fd8c8c

Browse files
committed
Convert mkid to ES
1 parent d028f2e commit 6fd8c8c

File tree

6 files changed

+55
-53
lines changed

6 files changed

+55
-53
lines changed

examples/network/echo/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MKID=node $(TROUPE)/rt/built/p2p/mkid.js
1+
MKID=node $(TROUPE)/rt/built/p2p/mkid.mjs
22
MKALIASES=node $(TROUPE)/rt/built/p2p/mkaliases.js
33
START=$(TROUPE)/network.sh
44

examples/network/parallel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MKID=node $(TROUPE)/rt/built/p2p/mkid.js
1+
MKID=node $(TROUPE)/rt/built/p2p/mkid.mjs
22
MKALIASES=node $(TROUPE)/rt/built/p2p/mkaliases.js
33
START=$(TROUPE)/network.sh
44

examples/network/pingpong/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
MKID=node $(TROUPE)/rt/built/p2p/mkid.js
1+
MKID=node $(TROUPE)/rt/built/p2p/mkid.mjs
22
MKALIASES=node $(TROUPE)/rt/built/p2p/mkaliases.js
33
START=$(TROUPE)/network.sh
44

55
zero.listener:
6-
$(START) zero.trp --id=ids/pingpong-listener.json --rspawn=true --aliases=aliases.json --stdiolev={} # --debug --debugp2p
6+
$(START) zero.trp --id=ids/pingpong-listener.json --rspawn=true --aliases=aliases.json --stdiolev={} --debug --debugp2p
77

88
pingpong.dialer:
9-
$(START) p2ppingpong.trp --id=ids/pingpong-dialer.json --aliases=aliases.json # --debug --debugp2p
9+
$(START) p2ppingpong.trp --id=ids/pingpong-dialer.json --aliases=aliases.json --debug --debugp2p
1010

1111
create-network-identifiers:
1212
mkdir -p ids

relay/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ start-relay:
22
./troupe-p2p-relay --key=keys/relay.priv
33

44
generate-relay-key:
5-
node $(TROUPE)/rt/built/p2p/mkid.js --privkeyfile=keys/relay.priv --idfile=keys/relay.id --verbose
5+
node $(TROUPE)/rt/built/p2p/mkid.mjs --privkeyfile=keys/relay.priv --idfile=keys/relay.id --verbose

rt/src/p2p/mkid.mts

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
// A small utility for creating p2p peer identifiers
2+
3+
// This utility checks that the files exists in order to
4+
// prevent an accidental overwrite of key files
5+
6+
'use strict';
7+
import * as fs from 'node:fs'
8+
import * as fsPromises from 'node:fs/promises';
9+
// const fsPromises = require('fs').promises
10+
import PeerId from "peer-id";
11+
//const args = require('yargs').argv;
12+
import pkg from 'yargs'
13+
const {argv} = pkg;
14+
15+
let outfile = argv.outfile
16+
if (!outfile && ! (argv.privkeyfile && argv.idfile)) {
17+
console.log ("Troupe p2p identifier generator")
18+
console.log ("Usage: node $TROUPE/rt/bulit/p2p/mkid.mjs --outfile=FILENAME | --privkeyfile=FILENAME --idfile=FILENAME [ --verbose]");
19+
process.exit(1)
20+
}
21+
22+
async function ensureFileDoesntExist (f) {
23+
if (fs.existsSync (f)) {
24+
console.error ("File already exists", f)
25+
process.exit (1)
26+
}
27+
}
28+
29+
(async () => {
30+
let id = await PeerId.create();
31+
const obj = id.toJSON();
32+
if (argv.verbose) {
33+
console.log("Created key with id:", obj.id);
34+
}
35+
36+
const s = JSON.stringify(obj);
37+
if (argv.outfile) {
38+
await ensureFileDoesntExist (argv.outfile)
39+
fsPromises.writeFile ((outfile as fs.PathLike), s, 'utf8');
40+
}
41+
42+
43+
if (argv.idfile && argv.privkeyfile) {
44+
await ensureFileDoesntExist (argv.idfile)
45+
await ensureFileDoesntExist (argv.privkeyfile)
46+
fsPromises.writeFile ((argv.idfile as fs.PathLike), obj.id, 'utf8');
47+
fsPromises.writeFile ((argv.privkeyfile as fs.PathLike), obj.privKey, 'utf8' );
48+
}
49+
}) ();

rt/src/p2p/mkid.ts

Lines changed: 0 additions & 47 deletions
This file was deleted.

0 commit comments

Comments
 (0)