Skip to content

Commit b9a22a6

Browse files
adklempneradklempner
committed
fix: refactor config printing into own function
1 parent 090ef12 commit b9a22a6

File tree

3 files changed

+54
-68
lines changed

3 files changed

+54
-68
lines changed

‎packages/run/scripts/info.ts‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
NODE1_PEER_ID,
1111
NODE2_PEER_ID
1212
} from "../src/constants.js";
13-
import { getProjectName } from "../src/utils.js";
13+
import { getProjectName, printWakuConfig } from "../src/utils.js";
1414

1515
const __filename = fileURLToPath(import.meta.url);
1616
const __dirname = dirname(__filename);
@@ -65,39 +65,7 @@ try {
6565
const peer2: string = NODE2_PEER_ID;
6666

6767
// Print TypeScript-style config
68-
process.stdout.write(
69-
`${colors.blue}import${colors.reset} { createLightNode } ${colors.blue}from${colors.reset} ${colors.yellow}"@waku/sdk"${colors.reset};\n`
70-
);
71-
process.stdout.write(`\n`);
72-
process.stdout.write(
73-
`${colors.blue}const${colors.reset} waku = ${colors.blue}await${colors.reset} createLightNode({\n`
74-
);
75-
process.stdout.write(
76-
` defaultBootstrap: ${colors.cyan}false${colors.reset},\n`
77-
);
78-
process.stdout.write(` bootstrapPeers: [\n`);
79-
process.stdout.write(
80-
` ${colors.yellow}"/ip4/127.0.0.1/tcp/${node1Port}/ws/p2p/${peer1}"${colors.reset},\n`
81-
);
82-
process.stdout.write(
83-
` ${colors.yellow}"/ip4/127.0.0.1/tcp/${node2Port}/ws/p2p/${peer2}"${colors.reset}\n`
84-
);
85-
process.stdout.write(` ],\n`);
86-
process.stdout.write(` numPeersToUse: ${colors.cyan}2${colors.reset},\n`);
87-
process.stdout.write(` libp2p: {\n`);
88-
process.stdout.write(
89-
` filterMultiaddrs: ${colors.cyan}false${colors.reset}\n`
90-
);
91-
process.stdout.write(` },\n`);
92-
process.stdout.write(` networkConfig: {\n`);
93-
process.stdout.write(
94-
` clusterId: ${colors.cyan}${clusterId}${colors.reset},\n`
95-
);
96-
process.stdout.write(
97-
` numShardsInCluster: ${colors.cyan}8${colors.reset}\n`
98-
);
99-
process.stdout.write(` }\n`);
100-
process.stdout.write(`});\n`);
68+
printWakuConfig(colors, node1Port, node2Port, peer1, peer2, clusterId);
10169
} catch (error: unknown) {
10270
const err = error as { cause?: { code?: string }; message?: string };
10371
if (err.cause?.code === "ECONNREFUSED") {

‎packages/run/scripts/start.ts‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
NODE1_PEER_ID,
1111
NODE2_PEER_ID
1212
} from "../src/constants.js";
13-
import { getProjectName } from "../src/utils.js";
13+
import { getProjectName, printWakuConfig } from "../src/utils.js";
1414

1515
const __filename = fileURLToPath(import.meta.url);
1616
const __dirname = dirname(__filename);
@@ -133,39 +133,7 @@ try {
133133
`${colors.gray}Copy this into your application:${colors.reset}\n\n`
134134
);
135135

136-
process.stdout.write(
137-
`${colors.blue}import${colors.reset} { createLightNode } ${colors.blue}from${colors.reset} ${colors.yellow}"@waku/sdk"${colors.reset};\n`
138-
);
139-
process.stdout.write(`\n`);
140-
process.stdout.write(
141-
`${colors.blue}const${colors.reset} waku = ${colors.blue}await${colors.reset} createLightNode({\n`
142-
);
143-
process.stdout.write(
144-
` defaultBootstrap: ${colors.cyan}false${colors.reset},\n`
145-
);
146-
process.stdout.write(` bootstrapPeers: [\n`);
147-
process.stdout.write(
148-
` ${colors.yellow}"/ip4/127.0.0.1/tcp/${node1Port}/ws/p2p/${peer1}"${colors.reset},\n`
149-
);
150-
process.stdout.write(
151-
` ${colors.yellow}"/ip4/127.0.0.1/tcp/${node2Port}/ws/p2p/${peer2}"${colors.reset}\n`
152-
);
153-
process.stdout.write(` ],\n`);
154-
process.stdout.write(` numPeersToUse: ${colors.cyan}2${colors.reset},\n`);
155-
process.stdout.write(` libp2p: {\n`);
156-
process.stdout.write(
157-
` filterMultiaddrs: ${colors.cyan}false${colors.reset}\n`
158-
);
159-
process.stdout.write(` },\n`);
160-
process.stdout.write(` networkConfig: {\n`);
161-
process.stdout.write(
162-
` clusterId: ${colors.cyan}${clusterId}${colors.reset},\n`
163-
);
164-
process.stdout.write(
165-
` numShardsInCluster: ${colors.cyan}8${colors.reset}\n`
166-
);
167-
process.stdout.write(` }\n`);
168-
process.stdout.write(`});\n`);
136+
printWakuConfig(colors, node1Port, node2Port, peer1, peer2, clusterId);
169137
process.stdout.write(`\n`);
170138
process.stdout.write(`${colors.gray}Management:${colors.reset}\n`);
171139

‎packages/run/src/utils.ts‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,53 @@ export function getProjectName(packageRoot: string): string {
99
const version = packageJson.version.replace(/\./g, "-");
1010
return `${name}-${version}`;
1111
}
12+
13+
interface Colors {
14+
reset: string;
15+
cyan: string;
16+
blue: string;
17+
yellow: string;
18+
}
19+
20+
export function printWakuConfig(
21+
colors: Colors,
22+
node1Port: string,
23+
node2Port: string,
24+
peer1: string,
25+
peer2: string,
26+
clusterId: string
27+
): void {
28+
process.stdout.write(
29+
`${colors.blue}import${colors.reset} { createLightNode } ${colors.blue}from${colors.reset} ${colors.yellow}"@waku/sdk"${colors.reset};\n`
30+
);
31+
process.stdout.write(`\n`);
32+
process.stdout.write(
33+
`${colors.blue}const${colors.reset} waku = ${colors.blue}await${colors.reset} createLightNode({\n`
34+
);
35+
process.stdout.write(
36+
` defaultBootstrap: ${colors.cyan}false${colors.reset},\n`
37+
);
38+
process.stdout.write(` bootstrapPeers: [\n`);
39+
process.stdout.write(
40+
` ${colors.yellow}"/ip4/127.0.0.1/tcp/${node1Port}/ws/p2p/${peer1}"${colors.reset},\n`
41+
);
42+
process.stdout.write(
43+
` ${colors.yellow}"/ip4/127.0.0.1/tcp/${node2Port}/ws/p2p/${peer2}"${colors.reset}\n`
44+
);
45+
process.stdout.write(` ],\n`);
46+
process.stdout.write(` numPeersToUse: ${colors.cyan}2${colors.reset},\n`);
47+
process.stdout.write(` libp2p: {\n`);
48+
process.stdout.write(
49+
` filterMultiaddrs: ${colors.cyan}false${colors.reset}\n`
50+
);
51+
process.stdout.write(` },\n`);
52+
process.stdout.write(` networkConfig: {\n`);
53+
process.stdout.write(
54+
` clusterId: ${colors.cyan}${clusterId}${colors.reset},\n`
55+
);
56+
process.stdout.write(
57+
` numShardsInCluster: ${colors.cyan}8${colors.reset}\n`
58+
);
59+
process.stdout.write(` }\n`);
60+
process.stdout.write(`});\n`);
61+
}

0 commit comments

Comments
 (0)