Skip to content

Commit

Permalink
Convert mkid to ES
Browse files Browse the repository at this point in the history
  • Loading branch information
AnnaBlume99 committed Jul 3, 2023
1 parent d028f2e commit 6fd8c8c
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 53 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

Expand Down
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

Expand Down
6 changes: 3 additions & 3 deletions examples/network/pingpong/Makefile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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

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

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

create-network-identifiers:
mkdir -p ids
Expand Down
2 changes: 1 addition & 1 deletion relay/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ start-relay:
./troupe-p2p-relay --key=keys/relay.priv

generate-relay-key:
node $(TROUPE)/rt/built/p2p/mkid.js --privkeyfile=keys/relay.priv --idfile=keys/relay.id --verbose
node $(TROUPE)/rt/built/p2p/mkid.mjs --privkeyfile=keys/relay.priv --idfile=keys/relay.id --verbose
49 changes: 49 additions & 0 deletions rt/src/p2p/mkid.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// A small utility for creating p2p peer identifiers

// This utility checks that the files exists in order to
// prevent an accidental overwrite of key files

'use strict';
import * as fs from 'node:fs'
import * as fsPromises from 'node:fs/promises';
// const fsPromises = require('fs').promises
import PeerId from "peer-id";
//const args = require('yargs').argv;
import pkg from 'yargs'
const {argv} = pkg;

let outfile = argv.outfile
if (!outfile && ! (argv.privkeyfile && argv.idfile)) {
console.log ("Troupe p2p identifier generator")
console.log ("Usage: node $TROUPE/rt/bulit/p2p/mkid.mjs --outfile=FILENAME | --privkeyfile=FILENAME --idfile=FILENAME [ --verbose]");
process.exit(1)
}

async function ensureFileDoesntExist (f) {
if (fs.existsSync (f)) {
console.error ("File already exists", f)
process.exit (1)
}
}

(async () => {
let id = await PeerId.create();
const obj = id.toJSON();
if (argv.verbose) {
console.log("Created key with id:", obj.id);
}

const s = JSON.stringify(obj);
if (argv.outfile) {
await ensureFileDoesntExist (argv.outfile)
fsPromises.writeFile ((outfile as fs.PathLike), s, 'utf8');
}


if (argv.idfile && argv.privkeyfile) {
await ensureFileDoesntExist (argv.idfile)
await ensureFileDoesntExist (argv.privkeyfile)
fsPromises.writeFile ((argv.idfile as fs.PathLike), obj.id, 'utf8');
fsPromises.writeFile ((argv.privkeyfile as fs.PathLike), obj.privKey, 'utf8' );
}
}) ();
47 changes: 0 additions & 47 deletions rt/src/p2p/mkid.ts

This file was deleted.

0 comments on commit 6fd8c8c

Please sign in to comment.