@peerbit/please 0.0.8 → 0.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/esm/bin.js CHANGED
@@ -6,7 +6,6 @@ import * as yargs from "yargs";
6
6
  import chalk from "chalk";
7
7
  import { waitForAsync } from "@peerbit/time";
8
8
  import path from "path";
9
- import { resolveBootstrapAddresses } from "@peerbit/network-utils";
10
9
  import { multiaddr } from "@multiformats/multiaddr";
11
10
  function ensureDirectoryExistence(filePath) {
12
11
  const dirname = path.dirname(filePath);
@@ -16,17 +15,21 @@ function ensureDirectoryExistence(filePath) {
16
15
  ensureDirectoryExistence(dirname);
17
16
  fs.mkdirSync(dirname);
18
17
  }
19
- const remoteRelayAddress = await resolveBootstrapAddresses("remote");
20
18
  const coerceAddresses = (addrs) => {
21
- return (Array.isArray(addrs) ? addrs : [addrs]).map(multiaddr);
19
+ return (Array.isArray(addrs) ? addrs : [addrs]).map((x) => multiaddr(x));
22
20
  };
21
+ // A random ID, but unique for this app
22
+ const ID = new Uint8Array([
23
+ 30, 221, 227, 76, 164, 10, 61, 8, 21, 176, 122, 5, 79, 110, 115, 255, 233,
24
+ 253, 92, 76, 146, 158, 46, 212, 14, 162, 30, 94, 1, 134, 99, 174,
25
+ ]);
23
26
  const cli = async (args) => {
24
27
  if (!args) {
25
28
  const { hideBin } = await import("yargs/helpers");
26
29
  args = hideBin(process.argv);
27
30
  }
28
31
  const peerbit = await Peerbit.create();
29
- const files = await peerbit.open(new Files(new Uint8Array(32)));
32
+ const files = await peerbit.open(new Files(ID));
30
33
  return yargs
31
34
  .default(args)
32
35
  .command({
@@ -42,12 +45,14 @@ const cli = async (args) => {
42
45
  type: "string",
43
46
  describe: "Relay address",
44
47
  defaultDescription: "?",
45
- default: remoteRelayAddress,
48
+ default: undefined,
46
49
  });
47
50
  return yargs;
48
51
  },
49
52
  handler: async (args) => {
50
- await peerbit.dial(coerceAddresses(args.relay));
53
+ if (args.relay) {
54
+ await Promise.all(coerceAddresses(args.relay).map((x) => peerbit.dial(x)));
55
+ }
51
56
  const file = fs.readFileSync(args.path);
52
57
  const id = await files.create(path.basename(args.path), file);
53
58
  console.log(`Id: ${chalk.green(id)}\n\nFile can now be fetched with:\n\nplease get ${id}`);
@@ -67,12 +72,6 @@ const cli = async (args) => {
67
72
  defaultDescription: "Current directory",
68
73
  demandOption: false,
69
74
  });
70
- yargs.option("relay", {
71
- type: "string",
72
- describe: "Relay address",
73
- defaultDescription: "?",
74
- default: "/ip4/127.0.0.1/tcp/8001/p2p/12D3KooWA796xdXd4CuAMxB9CNgmxLDpivbmQu8kusqSFFJ7qrqp",
75
- });
76
75
  yargs.option("force", {
77
76
  alias: "f",
78
77
  describe: "Overwrite existing files",
@@ -83,12 +82,14 @@ const cli = async (args) => {
83
82
  type: "string",
84
83
  describe: "Relay address",
85
84
  defaultDescription: "Bootstrap addresses for testing purposes",
86
- default: remoteRelayAddress,
85
+ default: undefined,
87
86
  });
88
87
  return yargs;
89
88
  },
90
89
  handler: async (args) => {
91
- await peerbit.dial(coerceAddresses(args.relay));
90
+ if (args.relay) {
91
+ await Promise.all(coerceAddresses(args.relay).map((x) => peerbit.dial(x)));
92
+ }
92
93
  console.log("Fetching file with id: " + args.id);
93
94
  // wait for at least 1 replicator
94
95
  await waitForAsync(async () => (await files.getReady()).size >= 1);
@@ -1 +1 @@
1
- {"version":3,"file":"bin.js","sourceRoot":"","sources":["../../src/bin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bin.js","sourceRoot":"","sources":["../../src/bin.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@peerbit/please",
3
- "version": "0.0.8",
3
+ "version": "0.0.10",
4
4
  "author": "dao.xyz",
5
5
  "repository": "https://github.com/@dao-xyz/peerbit-examples",
6
6
  "license": "Apache-2.0",
@@ -37,16 +37,15 @@
37
37
  "test:integration": "node ../../../node_modules/.bin/jest test -c ../../../jest.config.integration.ts --runInBand --forceExit"
38
38
  },
39
39
  "devDependencies": {
40
- "@peerbit/test-utils": "^1.0.12",
40
+ "@peerbit/test-utils": "^1",
41
41
  "@types/yargs": "^17.0.24",
42
42
  "typescript": "^5.1.3"
43
43
  },
44
44
  "dependencies": {
45
- "@peerbit/network-utils": "^0.0.2",
46
- "@peerbit/please-lib": "^0.0.5",
45
+ "@peerbit/please-lib": "^0.0.6",
47
46
  "chalk": "^5.3.0",
48
- "peerbit": "^1.1.5",
47
+ "peerbit": "^1",
49
48
  "yargs": "^17.7.2"
50
49
  },
51
- "gitHead": "296cc3285a6e5b9ce0876b0585f7133cc71bca23"
50
+ "gitHead": "61243721632f276a5b6109e147ec375947da9afd"
52
51
  }
package/src/bin.ts CHANGED
@@ -8,7 +8,6 @@ import { Argv } from "yargs";
8
8
  import chalk from "chalk";
9
9
  import { waitForAsync } from "@peerbit/time";
10
10
  import path from "path";
11
- import { resolveBootstrapAddresses } from "@peerbit/network-utils";
12
11
  import { multiaddr } from "@multiformats/multiaddr";
13
12
 
14
13
  function ensureDirectoryExistence(filePath) {
@@ -20,11 +19,16 @@ function ensureDirectoryExistence(filePath) {
20
19
  fs.mkdirSync(dirname);
21
20
  }
22
21
 
23
- const remoteRelayAddress = await resolveBootstrapAddresses("remote");
24
-
25
22
  const coerceAddresses = (addrs: string | string[]) => {
26
- return (Array.isArray(addrs) ? addrs : [addrs]).map(multiaddr);
23
+ return (Array.isArray(addrs) ? addrs : [addrs]).map((x) => multiaddr(x));
27
24
  };
25
+
26
+ // A random ID, but unique for this app
27
+ const ID = new Uint8Array([
28
+ 30, 221, 227, 76, 164, 10, 61, 8, 21, 176, 122, 5, 79, 110, 115, 255, 233,
29
+ 253, 92, 76, 146, 158, 46, 212, 14, 162, 30, 94, 1, 134, 99, 174,
30
+ ]);
31
+
28
32
  const cli = async (args?: string[]) => {
29
33
  if (!args) {
30
34
  const { hideBin } = await import("yargs/helpers");
@@ -32,7 +36,7 @@ const cli = async (args?: string[]) => {
32
36
  }
33
37
 
34
38
  const peerbit = await Peerbit.create();
35
- const files = await peerbit.open(new Files(new Uint8Array(32)));
39
+ const files = await peerbit.open(new Files(ID));
36
40
 
37
41
  return yargs
38
42
  .default(args)
@@ -49,13 +53,17 @@ const cli = async (args?: string[]) => {
49
53
  type: "string",
50
54
  describe: "Relay address",
51
55
  defaultDescription: "?",
52
- default: remoteRelayAddress,
56
+ default: undefined,
53
57
  });
54
58
  return yargs;
55
59
  },
56
60
 
57
61
  handler: async (args) => {
58
- await peerbit.dial(coerceAddresses(args.relay));
62
+ if (args.relay) {
63
+ await Promise.all(
64
+ coerceAddresses(args.relay).map((x) => peerbit.dial(x))
65
+ );
66
+ }
59
67
 
60
68
  const file = fs.readFileSync(args.path);
61
69
  const id = await files.create(path.basename(args.path), file);
@@ -80,13 +88,6 @@ const cli = async (args?: string[]) => {
80
88
  defaultDescription: "Current directory",
81
89
  demandOption: false,
82
90
  });
83
- yargs.option("relay", {
84
- type: "string",
85
- describe: "Relay address",
86
- defaultDescription: "?",
87
- default:
88
- "/ip4/127.0.0.1/tcp/8001/p2p/12D3KooWA796xdXd4CuAMxB9CNgmxLDpivbmQu8kusqSFFJ7qrqp",
89
- });
90
91
  yargs.option("force", {
91
92
  alias: "f",
92
93
  describe: "Overwrite existing files",
@@ -98,13 +99,17 @@ const cli = async (args?: string[]) => {
98
99
  describe: "Relay address",
99
100
  defaultDescription:
100
101
  "Bootstrap addresses for testing purposes",
101
- default: remoteRelayAddress,
102
+ default: undefined,
102
103
  });
103
104
  return yargs;
104
105
  },
105
106
 
106
107
  handler: async (args) => {
107
- await peerbit.dial(coerceAddresses(args.relay));
108
+ if (args.relay) {
109
+ await Promise.all(
110
+ coerceAddresses(args.relay).map((x) => peerbit.dial(x))
111
+ );
112
+ }
108
113
 
109
114
  console.log("Fetching file with id: " + args.id);
110
115