@xaidenlabs/uso 1.1.97 → 1.1.98
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/package.json +1 -1
- package/packages/uso-core/dist/cjs/execution/runner.d.ts.map +1 -1
- package/packages/uso-core/dist/cjs/execution/runner.js +8 -2
- package/packages/uso-core/dist/cjs/execution/runner.js.map +1 -1
- package/packages/uso-core/dist/esm/execution/runner.d.ts.map +1 -1
- package/packages/uso-core/dist/esm/execution/runner.js +8 -2
- package/packages/uso-core/dist/esm/execution/runner.js.map +1 -1
- package/packages/uso-core/src/execution/runner.ts +12 -8
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE3E,wBAAsB,OAAO,CAC3B,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE3E,wBAAsB,OAAO,CAC3B,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,CAyCxB"}
|
|
@@ -5,8 +5,14 @@ const node_child_process_1 = require("node:child_process");
|
|
|
5
5
|
async function runTask(task, route, attempt) {
|
|
6
6
|
return new Promise((resolve) => {
|
|
7
7
|
const isWindows = process.platform === "win32";
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
let shell = isWindows ? "cmd.exe" : "/bin/bash";
|
|
9
|
+
let shellArgs = [isWindows ? "/c" : "-c", `${task.command} ${task.args.join(" ")}`];
|
|
10
|
+
if (isWindows && route === "wsl") {
|
|
11
|
+
shell = "wsl.exe";
|
|
12
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
13
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup} && ${task.command} ${task.args.join(" ")}`];
|
|
14
|
+
}
|
|
15
|
+
const child = (0, node_child_process_1.spawn)(shell, shellArgs, {
|
|
10
16
|
env: process.env,
|
|
11
17
|
});
|
|
12
18
|
let stdout = "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":";;AAGA,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":";;AAGA,0BA6CC;AAhDD,2DAA2C;AAGpC,KAAK,UAAU,OAAO,CAC3B,IAAmB,EACnB,KAAmB,EACnB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC/C,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QAChD,IAAI,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpF,IAAI,SAAS,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACjC,KAAK,GAAG,SAAS,CAAC;YAClB,MAAM,QAAQ,GAAG,8HAA8H,CAAC;YAChJ,SAAS,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5G,CAAC;QAED,MAAM,KAAK,GAAG,IAAA,0BAAK,EAAC,KAAK,EAAE,SAAS,EAAE;YACpC,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,CAAC;YAC3B,OAAO,CAAC;gBACN,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,OAAO;gBACP,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACjD,KAAK;gBACL,MAAM,EAAE,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;gBAC7C,MAAM;gBACN,MAAM;gBACN,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE3E,wBAAsB,OAAO,CAC3B,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE3E,wBAAsB,OAAO,CAC3B,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,CAyCxB"}
|
|
@@ -2,8 +2,14 @@ import { spawn } from "node:child_process";
|
|
|
2
2
|
export async function runTask(task, route, attempt) {
|
|
3
3
|
return new Promise((resolve) => {
|
|
4
4
|
const isWindows = process.platform === "win32";
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
let shell = isWindows ? "cmd.exe" : "/bin/bash";
|
|
6
|
+
let shellArgs = [isWindows ? "/c" : "-c", `${task.command} ${task.args.join(" ")}`];
|
|
7
|
+
if (isWindows && route === "wsl") {
|
|
8
|
+
shell = "wsl.exe";
|
|
9
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
10
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup} && ${task.command} ${task.args.join(" ")}`];
|
|
11
|
+
}
|
|
12
|
+
const child = spawn(shell, shellArgs, {
|
|
7
13
|
env: process.env,
|
|
8
14
|
});
|
|
9
15
|
let stdout = "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,IAAmB,EACnB,KAAmB,EACnB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC/C,
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../src/execution/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAG3C,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,IAAmB,EACnB,KAAmB,EACnB,OAAe;IAEf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC;QAC/C,IAAI,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;QAChD,IAAI,SAAS,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpF,IAAI,SAAS,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;YACjC,KAAK,GAAG,SAAS,CAAC;YAClB,MAAM,QAAQ,GAAG,8HAA8H,CAAC;YAChJ,SAAS,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,QAAQ,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5G,CAAC;QAED,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE;YACpC,GAAG,EAAE,OAAO,CAAC,GAAG;SACjB,CAAC,CAAC;QAEH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAA8B,EAAE,EAAE;YACzD,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;QAEH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,CAAC;YAC3B,OAAO,CAAC;gBACN,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,OAAO;gBACP,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBACjD,KAAK;gBACL,MAAM,EAAE,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;gBAC7C,MAAM;gBACN,MAAM;gBACN,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -8,14 +8,18 @@ export async function runTask(
|
|
|
8
8
|
): Promise<AttemptRecord> {
|
|
9
9
|
return new Promise((resolve) => {
|
|
10
10
|
const isWindows = process.platform === "win32";
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
}
|
|
18
|
-
|
|
11
|
+
let shell = isWindows ? "cmd.exe" : "/bin/bash";
|
|
12
|
+
let shellArgs = [isWindows ? "/c" : "-c", `${task.command} ${task.args.join(" ")}`];
|
|
13
|
+
|
|
14
|
+
if (isWindows && route === "wsl") {
|
|
15
|
+
shell = "wsl.exe";
|
|
16
|
+
const envSetup = 'source $HOME/.cargo/env 2>/dev/null; export PATH="$HOME/.local/share/solana/install/active_release/bin:$HOME/.avm/bin:$PATH"';
|
|
17
|
+
shellArgs = ["-d", "Ubuntu", "-e", "bash", "-c", `${envSetup} && ${task.command} ${task.args.join(" ")}`];
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
const child = spawn(shell, shellArgs, {
|
|
21
|
+
env: process.env,
|
|
22
|
+
});
|
|
19
23
|
|
|
20
24
|
let stdout = "";
|
|
21
25
|
let stderr = "";
|