@remix_labs/machine-starter 2.1999.0-dev → 2.2002.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/common.js +33 -91
- package/groovebox_build.js +1 -1
- package/index.js +1 -0
- package/machine-wasm.worker.js +1 -1
- package/package.json +3 -3
- package/package_pub.json +1 -1
- package/start.js +11 -29
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@remix_labs/machine-starter",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.2002.0",
|
|
4
4
|
"description": "start the groove",
|
|
5
5
|
"main": "node.js",
|
|
6
6
|
"browser": "index.js",
|
|
@@ -11,8 +11,8 @@
|
|
|
11
11
|
"author": "Remixlabs staff",
|
|
12
12
|
"license": "ISC",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@remix_labs/hub-client": "2.
|
|
15
|
-
"nanoid": "^
|
|
14
|
+
"@remix_labs/hub-client": "2.2002.0",
|
|
15
|
+
"nanoid": "^3.1.12",
|
|
16
16
|
"web-worker": "^1.2.0"
|
|
17
17
|
},
|
|
18
18
|
"repository": "https://github.com/remixlabs/groovebox.git"
|
package/package_pub.json
CHANGED
package/start.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import Process from "process";
|
|
2
2
|
import { StartWASM2, Hub } from "./node.js";
|
|
3
|
-
import { StartMixCompiler, WaitForMixCompiler } from "@remix_labs/mixc-starter";
|
|
4
3
|
|
|
5
4
|
if (Process.stdout._handle)
|
|
6
5
|
Process.stdout._handle.setBlocking(true);
|
|
@@ -29,42 +28,25 @@ if (mqttURL.startsWith("https:")) {
|
|
|
29
28
|
let mqttUser = Process.env["MIX_MQTT_USER"] || "dummy";
|
|
30
29
|
let mqttToken = Process.env["MIX_MQTT_TOKEN"] || "";
|
|
31
30
|
let noOutputViaMQTT = Process.env["MIX_MQTT_NO_OUTPUT"] !== undefined;
|
|
32
|
-
|
|
33
|
-
console.log("Machine params: variant=" + variant + " baseURL=" + baseURL, " mqttURL=" + mqttURL, " mqttUser=" + mqttUser, " mqttToken=" + mqttToken, " id=" + id, " noOutputViaMQTT=" + noOutputViaMQTT, " withMixc=" + with_mixc);
|
|
34
|
-
let protoquery = Process.env["PROTOQUERY_ROOT"] || "";
|
|
35
|
-
let wasm_base = Process.env["MIX_WASM_BASE"] || "file://" + protoquery + "/wasm-build/artifacts/lib/wasm32-unknown-unknown";
|
|
31
|
+
console.log("Machine params: variant=" + variant + " baseURL=" + baseURL, " mqttURL=" + mqttURL, " mqttUser=" + mqttUser, " mqttToken=" + mqttToken, " id=" + id, " noOutputViaMQTT=" + noOutputViaMQTT);
|
|
36
32
|
let w = new Hub.Worker();
|
|
37
|
-
globalThis.GROOVEBOX_ALLOW_INSECURE_HTTP = true;
|
|
38
33
|
w.configure({wsURL: mqttURL, user:mqttUser, token:mqttToken}).then(resp => {
|
|
39
34
|
if (variant == "BYTE") variant = "QCODE";
|
|
40
35
|
switch(variant) {
|
|
41
36
|
case "WASM":
|
|
42
37
|
case "WAT":
|
|
43
38
|
case "QCODE":
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
machType: variant,
|
|
55
|
-
localFFIs: {},
|
|
56
|
-
});
|
|
39
|
+
MixSetMask(64 + 256 + 512 + 1024);
|
|
40
|
+
StartWASM2(w, {
|
|
41
|
+
baseURL: baseURL,
|
|
42
|
+
org: "local",
|
|
43
|
+
workspace: "local",
|
|
44
|
+
vmID: id,
|
|
45
|
+
user: mqttUser,
|
|
46
|
+
token: mqttToken,
|
|
47
|
+
noOutputViaMQTT: noOutputViaMQTT,
|
|
48
|
+
machType: variant
|
|
57
49
|
});
|
|
58
|
-
if (with_mixc) {
|
|
59
|
-
let mixcConfig = {
|
|
60
|
-
org: "local",
|
|
61
|
-
workspace: "local",
|
|
62
|
-
wasm_base: wasm_base
|
|
63
|
-
};
|
|
64
|
-
StartMixCompiler(w, mixcConfig).then(startVM);
|
|
65
|
-
} else {
|
|
66
|
-
startVM()
|
|
67
|
-
};
|
|
68
50
|
break
|
|
69
51
|
default:
|
|
70
52
|
throw(new Error("unknown MIX_MACHINE_VARIANT: " + variant))
|