@holochain/hc-spin 0.600.3-rc.0 → 0.601.0
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/CHANGELOG.md +6 -0
- package/dist/main/index.js +14 -14
- package/flake.lock +30 -30
- package/package.json +3 -3
- package/.envrc +0 -1
package/CHANGELOG.md
CHANGED
package/dist/main/index.js
CHANGED
|
@@ -12439,7 +12439,7 @@ function validateCliArgs(cliArgs, cliOpts, appDataRootDir) {
|
|
|
12439
12439
|
networkSeed: cliOpts.networkSeed,
|
|
12440
12440
|
targetArcFactor: cliOpts.targetArcFactor,
|
|
12441
12441
|
uiSource: cliOpts.uiPath ? { type: "path", path: cliOpts.uiPath } : cliOpts.uiPort ? { type: "port", port: cliOpts.uiPort } : { type: "path", path: path.join(appDataRootDir, "apps", appId, "ui") },
|
|
12442
|
-
|
|
12442
|
+
singalingUrl: cliOpts.signalingUrl,
|
|
12443
12443
|
bootstrapUrl: cliOpts.bootstrapUrl,
|
|
12444
12444
|
happOrWebhappPath: isHapp ? { type: "happ", path: happOrWebhappPath } : { type: "webhapp", path: happOrWebhappPath },
|
|
12445
12445
|
openDevtools: cliOpts.openDevtools ? true : false
|
|
@@ -12563,7 +12563,7 @@ function setLinkOpenHandlers(browserWindow) {
|
|
|
12563
12563
|
}
|
|
12564
12564
|
const rustUtils = require("@holochain/hc-spin-rust-utils");
|
|
12565
12565
|
const cli = new commander.Command();
|
|
12566
|
-
cli.name("hc-spin").description("CLI to run Holochain apps during development.").version(`${"0.600.
|
|
12566
|
+
cli.name("hc-spin").description("CLI to run Holochain apps during development.").version(`${"0.600.0"} (built for holochain ${"0.6.0"})`).argument(
|
|
12567
12567
|
"<path>",
|
|
12568
12568
|
"Path to .webhapp or .happ file to launch. If a .happ file is passed, either a UI path must be specified via --ui-path or a port pointing to a localhost server via --ui-port"
|
|
12569
12569
|
).option(
|
|
@@ -12585,8 +12585,8 @@ cli.name("hc-spin").description("CLI to run Holochain apps during development.")
|
|
|
12585
12585
|
"--ui-port <number>",
|
|
12586
12586
|
"Port pointing to a localhost dev server that serves your UI assets."
|
|
12587
12587
|
).option(
|
|
12588
|
-
"--
|
|
12589
|
-
"Url of the
|
|
12588
|
+
"--signaling-url <url>",
|
|
12589
|
+
"Url of the signaling server to use. By default, hc spin spins up a local development signaling server for you but this argument allows you to specify a custom one."
|
|
12590
12590
|
).option("--open-devtools", "Automatically open the devtools on startup.");
|
|
12591
12591
|
cli.parse();
|
|
12592
12592
|
const rl = require("readline").createInterface({
|
|
@@ -12664,29 +12664,29 @@ async function startLocalServices() {
|
|
|
12664
12664
|
const localServicesHandle = childProcess__namespace.spawn("kitsune2-bootstrap-srv");
|
|
12665
12665
|
return new Promise((resolve) => {
|
|
12666
12666
|
let bootStrapUrl;
|
|
12667
|
-
let
|
|
12667
|
+
let signalUrl;
|
|
12668
12668
|
let bootstrapRunning = false;
|
|
12669
|
-
let
|
|
12669
|
+
let signalRunnig = false;
|
|
12670
12670
|
localServicesHandle.stdout.pipe(split()).on("data", async (line) => {
|
|
12671
12671
|
console.log(`[hc-spin] | [kitsune2-bootstrap-srv]: ${line}`);
|
|
12672
12672
|
if (line.includes("#kitsune2_bootstrap_srv#listening#")) {
|
|
12673
12673
|
const hostAndPort = line.split("#kitsune2_bootstrap_srv#listening#")[1].split("#")[0];
|
|
12674
12674
|
bootStrapUrl = `http://${hostAndPort}`;
|
|
12675
|
-
|
|
12675
|
+
signalUrl = `ws://${hostAndPort}`;
|
|
12676
12676
|
}
|
|
12677
12677
|
if (line.includes("#kitsune2_bootstrap_srv#running#")) {
|
|
12678
12678
|
bootstrapRunning = true;
|
|
12679
|
-
|
|
12679
|
+
signalRunnig = true;
|
|
12680
12680
|
}
|
|
12681
|
-
if (bootstrapRunning &&
|
|
12682
|
-
resolve([bootStrapUrl,
|
|
12681
|
+
if (bootstrapRunning && signalRunnig && bootStrapUrl && signalUrl)
|
|
12682
|
+
resolve([bootStrapUrl, signalUrl]);
|
|
12683
12683
|
});
|
|
12684
12684
|
localServicesHandle.stderr.pipe(split()).on("data", async (line) => {
|
|
12685
12685
|
console.log(`[hc-spin] | [hc run-local-services] ERROR: ${line}`);
|
|
12686
12686
|
});
|
|
12687
12687
|
});
|
|
12688
12688
|
}
|
|
12689
|
-
async function spawnSandboxes(nAgents, happPath, bootStrapUrl,
|
|
12689
|
+
async function spawnSandboxes(nAgents, happPath, bootStrapUrl, signalUrl, appId, networkSeed, targetArcFactor) {
|
|
12690
12690
|
const generateArgs = [
|
|
12691
12691
|
"sandbox",
|
|
12692
12692
|
"--piped",
|
|
@@ -12711,7 +12711,7 @@ async function spawnSandboxes(nAgents, happPath, bootStrapUrl, relayUrl, appId,
|
|
|
12711
12711
|
if (targetArcFactor !== void 0) {
|
|
12712
12712
|
generateArgs.push("--target-arc-factor", targetArcFactor.toString());
|
|
12713
12713
|
}
|
|
12714
|
-
generateArgs.push("--bootstrap", bootStrapUrl, "
|
|
12714
|
+
generateArgs.push("--bootstrap", bootStrapUrl, "webrtc", signalUrl);
|
|
12715
12715
|
let readyConductors = 0;
|
|
12716
12716
|
const portsInfo = {};
|
|
12717
12717
|
const sandboxPaths = [];
|
|
@@ -12755,12 +12755,12 @@ electron.app.whenReady().then(async () => {
|
|
|
12755
12755
|
happTargetDir
|
|
12756
12756
|
);
|
|
12757
12757
|
}
|
|
12758
|
-
const [bootstrapUrl,
|
|
12758
|
+
const [bootstrapUrl, signalingUrl] = await startLocalServices();
|
|
12759
12759
|
const [sandboxHandle, sandboxPaths, portsInfo] = await spawnSandboxes(
|
|
12760
12760
|
CLI_OPTS.numAgents,
|
|
12761
12761
|
happTargetDir ? happTargetDir : CLI_OPTS.happOrWebhappPath.path,
|
|
12762
12762
|
CLI_OPTS.bootstrapUrl ? CLI_OPTS.bootstrapUrl : bootstrapUrl,
|
|
12763
|
-
CLI_OPTS.
|
|
12763
|
+
CLI_OPTS.singalingUrl ? CLI_OPTS.singalingUrl : signalingUrl,
|
|
12764
12764
|
CLI_OPTS.appId,
|
|
12765
12765
|
CLI_OPTS.networkSeed,
|
|
12766
12766
|
CLI_OPTS.targetArcFactor
|
package/flake.lock
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
"nodes": {
|
|
3
3
|
"crane": {
|
|
4
4
|
"locked": {
|
|
5
|
-
"lastModified":
|
|
6
|
-
"narHash": "sha256-
|
|
5
|
+
"lastModified": 1778106249,
|
|
6
|
+
"narHash": "sha256-cM/AuKy5tMhwOOQIbha8ZRRMHVfNf7cv2aljIw+qoCg=",
|
|
7
7
|
"owner": "ipetkov",
|
|
8
8
|
"repo": "crane",
|
|
9
|
-
"rev": "
|
|
9
|
+
"rev": "6d015ea29630b7ad2402841386da2cb617a470a7",
|
|
10
10
|
"type": "github"
|
|
11
11
|
},
|
|
12
12
|
"original": {
|
|
@@ -20,11 +20,11 @@
|
|
|
20
20
|
"nixpkgs-lib": "nixpkgs-lib"
|
|
21
21
|
},
|
|
22
22
|
"locked": {
|
|
23
|
-
"lastModified":
|
|
24
|
-
"narHash": "sha256-
|
|
23
|
+
"lastModified": 1777988971,
|
|
24
|
+
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
|
|
25
25
|
"owner": "hercules-ci",
|
|
26
26
|
"repo": "flake-parts",
|
|
27
|
-
"rev": "
|
|
27
|
+
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
|
|
28
28
|
"type": "github"
|
|
29
29
|
},
|
|
30
30
|
"original": {
|
|
@@ -36,16 +36,16 @@
|
|
|
36
36
|
"hc-scaffold": {
|
|
37
37
|
"flake": false,
|
|
38
38
|
"locked": {
|
|
39
|
-
"lastModified":
|
|
40
|
-
"narHash": "sha256-
|
|
39
|
+
"lastModified": 1774456561,
|
|
40
|
+
"narHash": "sha256-CQ3HUE++iyLWJFK9wt2TeusmbuLavGxF8kxnv8mMsVw=",
|
|
41
41
|
"owner": "holochain",
|
|
42
42
|
"repo": "scaffolding",
|
|
43
|
-
"rev": "
|
|
43
|
+
"rev": "3329e3c01572dc525ee95caa3d179dc659134572",
|
|
44
44
|
"type": "github"
|
|
45
45
|
},
|
|
46
46
|
"original": {
|
|
47
47
|
"owner": "holochain",
|
|
48
|
-
"ref": "v0.600.
|
|
48
|
+
"ref": "v0.600.3-rc.0",
|
|
49
49
|
"repo": "scaffolding",
|
|
50
50
|
"type": "github"
|
|
51
51
|
}
|
|
@@ -53,16 +53,16 @@
|
|
|
53
53
|
"holochain": {
|
|
54
54
|
"flake": false,
|
|
55
55
|
"locked": {
|
|
56
|
-
"lastModified":
|
|
57
|
-
"narHash": "sha256-
|
|
56
|
+
"lastModified": 1778596880,
|
|
57
|
+
"narHash": "sha256-uUJZkeqBAZgXtDf0juCRpKOUO3yY1gWEKWGqatWcVjY=",
|
|
58
58
|
"owner": "holochain",
|
|
59
59
|
"repo": "holochain",
|
|
60
|
-
"rev": "
|
|
60
|
+
"rev": "3bdeaccd1c54fa351e76f7347601dfbc061d5bd4",
|
|
61
61
|
"type": "github"
|
|
62
62
|
},
|
|
63
63
|
"original": {
|
|
64
64
|
"owner": "holochain",
|
|
65
|
-
"ref": "holochain-0.6.1
|
|
65
|
+
"ref": "holochain-0.6.1",
|
|
66
66
|
"repo": "holochain",
|
|
67
67
|
"type": "github"
|
|
68
68
|
}
|
|
@@ -79,11 +79,11 @@
|
|
|
79
79
|
"rust-overlay": "rust-overlay"
|
|
80
80
|
},
|
|
81
81
|
"locked": {
|
|
82
|
-
"lastModified":
|
|
83
|
-
"narHash": "sha256-
|
|
82
|
+
"lastModified": 1778614884,
|
|
83
|
+
"narHash": "sha256-Kxgtrs15iA9D0f4Sj/rt/yVRYk+Ew8TxeQrmMdYO0Qg=",
|
|
84
84
|
"owner": "holochain",
|
|
85
85
|
"repo": "holonix",
|
|
86
|
-
"rev": "
|
|
86
|
+
"rev": "9931f18ccf9721fc5469fd3ae9d5bb118a6bac5a",
|
|
87
87
|
"type": "github"
|
|
88
88
|
},
|
|
89
89
|
"original": {
|
|
@@ -96,16 +96,16 @@
|
|
|
96
96
|
"kitsune2": {
|
|
97
97
|
"flake": false,
|
|
98
98
|
"locked": {
|
|
99
|
-
"lastModified":
|
|
100
|
-
"narHash": "sha256
|
|
99
|
+
"lastModified": 1778073766,
|
|
100
|
+
"narHash": "sha256-/hG+/9VlZiC1u/UASbIOH0oeiUmKlzqvur++CWSVAbQ=",
|
|
101
101
|
"owner": "holochain",
|
|
102
102
|
"repo": "kitsune2",
|
|
103
|
-
"rev": "
|
|
103
|
+
"rev": "b33fa55606f8bd5020cffacf1ffae41f92d4d296",
|
|
104
104
|
"type": "github"
|
|
105
105
|
},
|
|
106
106
|
"original": {
|
|
107
107
|
"owner": "holochain",
|
|
108
|
-
"ref": "
|
|
108
|
+
"ref": "v0.4.1",
|
|
109
109
|
"repo": "kitsune2",
|
|
110
110
|
"type": "github"
|
|
111
111
|
}
|
|
@@ -129,11 +129,11 @@
|
|
|
129
129
|
},
|
|
130
130
|
"nixpkgs": {
|
|
131
131
|
"locked": {
|
|
132
|
-
"lastModified":
|
|
133
|
-
"narHash": "sha256-
|
|
132
|
+
"lastModified": 1778430510,
|
|
133
|
+
"narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
|
|
134
134
|
"owner": "nixos",
|
|
135
135
|
"repo": "nixpkgs",
|
|
136
|
-
"rev": "
|
|
136
|
+
"rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
|
|
137
137
|
"type": "github"
|
|
138
138
|
},
|
|
139
139
|
"original": {
|
|
@@ -145,11 +145,11 @@
|
|
|
145
145
|
},
|
|
146
146
|
"nixpkgs-lib": {
|
|
147
147
|
"locked": {
|
|
148
|
-
"lastModified":
|
|
149
|
-
"narHash": "sha256-
|
|
148
|
+
"lastModified": 1777168982,
|
|
149
|
+
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
|
|
150
150
|
"owner": "nix-community",
|
|
151
151
|
"repo": "nixpkgs.lib",
|
|
152
|
-
"rev": "
|
|
152
|
+
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
|
|
153
153
|
"type": "github"
|
|
154
154
|
},
|
|
155
155
|
"original": {
|
|
@@ -179,11 +179,11 @@
|
|
|
179
179
|
]
|
|
180
180
|
},
|
|
181
181
|
"locked": {
|
|
182
|
-
"lastModified":
|
|
183
|
-
"narHash": "sha256-
|
|
182
|
+
"lastModified": 1778555852,
|
|
183
|
+
"narHash": "sha256-55EmwooVAS4UpA0oWd5wilKPRqCiHD5BAej9QiNwheY=",
|
|
184
184
|
"owner": "oxalica",
|
|
185
185
|
"repo": "rust-overlay",
|
|
186
|
-
"rev": "
|
|
186
|
+
"rev": "f29b0f7a9f367e0056b716f8aa137cb41e784444",
|
|
187
187
|
"type": "github"
|
|
188
188
|
},
|
|
189
189
|
"original": {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@holochain/hc-spin",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"holochainVersion": "0.6.1
|
|
3
|
+
"version": "0.601.0",
|
|
4
|
+
"holochainVersion": "0.6.1",
|
|
5
5
|
"description": "CLI to run Holochain apps during development.",
|
|
6
6
|
"author": "matthme",
|
|
7
7
|
"homepage": "https://developer.holochain.org",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@electron-toolkit/preload": "^3.0.0",
|
|
37
37
|
"@electron-toolkit/utils": "^3.0.0",
|
|
38
38
|
"@holochain/client": "^0.20.0",
|
|
39
|
-
"@holochain/hc-spin-rust-utils": "0.601.1
|
|
39
|
+
"@holochain/hc-spin-rust-utils": "0.601.1",
|
|
40
40
|
"@msgpack/msgpack": "^2.8.0",
|
|
41
41
|
"bufferutil": "4.0.8",
|
|
42
42
|
"commander": "11.1.0",
|
package/.envrc
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
use flake
|