xs-dev 1.2.2 → 1.2.3
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/build/package.json +2 -3
- package/build/src/toolbox/setup/esp32/windows.js +4 -9
- package/build/src/toolbox/setup/esp8266/windows.js +6 -13
- package/build/src/toolbox/setup/esp8266.js +8 -14
- package/build/src/toolbox/setup/moddable.js +4 -9
- package/build/src/toolbox/setup/nrf52.js +8 -14
- package/build/src/toolbox/system/fetch.js +15 -0
- package/build/types/src/toolbox/system/fetch.d.ts +2 -0
- package/package.json +2 -3
package/build/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xs-dev",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.3",
|
|
4
4
|
"description": "CLI for automating the setup and usage of Moddable XS tools",
|
|
5
5
|
"types": "build/types/types.d.ts",
|
|
6
6
|
"packageManager": "pnpm@10.29.2",
|
|
@@ -52,7 +52,6 @@
|
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@octokit/rest": "^20.1.1",
|
|
54
54
|
"@stricli/core": "^1.1.0",
|
|
55
|
-
"axios": "^1.2.1",
|
|
56
55
|
"gluegun": "^5.1.2",
|
|
57
56
|
"serialport": "^10.3.0",
|
|
58
57
|
"serve-handler": "^6.1.3",
|
|
@@ -74,7 +73,7 @@
|
|
|
74
73
|
"@babel/core": ">=7.20.12 <8.0.0",
|
|
75
74
|
"@changesets/cli": "^2.19.0",
|
|
76
75
|
"@justinribeiro/lite-youtube": "^1.5.0",
|
|
77
|
-
"@types/node": "^
|
|
76
|
+
"@types/node": "^24.0.0",
|
|
78
77
|
"@types/serve-handler": "^6.1.1",
|
|
79
78
|
"@types/tar-fs": "^2.0.1",
|
|
80
79
|
"@types/unzip-stream": "^0.3.1",
|
|
@@ -1,15 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.installDeps = installDeps;
|
|
7
4
|
exports.esp32Exists = esp32Exists;
|
|
8
5
|
const gluegun_1 = require("gluegun");
|
|
9
|
-
const axios_1 = __importDefault(require("axios"));
|
|
10
6
|
const util_1 = require("util");
|
|
11
7
|
const stream_1 = require("stream");
|
|
12
8
|
const errors_1 = require("../../system/errors");
|
|
9
|
+
const fetch_1 = require("../../system/fetch");
|
|
13
10
|
const finishedPromise = (0, util_1.promisify)(stream_1.finished);
|
|
14
11
|
const IDF_INSTALLER = 'https://github.com/espressif/idf-installer/releases/download/online-2.15/esp-idf-tools-setup-online-2.15.exe';
|
|
15
12
|
async function installDeps(spinner, ESP32_DIR, IDF_PATH) {
|
|
@@ -20,10 +17,8 @@ async function installDeps(spinner, ESP32_DIR, IDF_PATH) {
|
|
|
20
17
|
spinner.start('Downloading ESP-IDF Tools Installer');
|
|
21
18
|
const destination = gluegun_1.filesystem.resolve(ESP32_DIR, 'esp-idf-tools-setup-online-2.15.exe');
|
|
22
19
|
const writer = gluegun_1.filesystem.createWriteStream(destination);
|
|
23
|
-
const
|
|
24
|
-
|
|
25
|
-
});
|
|
26
|
-
response.data.pipe(writer);
|
|
20
|
+
const download = await (0, fetch_1.fetchStream)(IDF_INSTALLER);
|
|
21
|
+
download.pipe(writer);
|
|
27
22
|
await finishedPromise(writer);
|
|
28
23
|
spinner.succeed();
|
|
29
24
|
gluegun_1.print.info(`When prompted, select "Use an Existing ESP-IDF Directory" and choose ${IDF_PATH}.`);
|
|
@@ -39,4 +34,4 @@ function esp32Exists() {
|
|
|
39
34
|
gluegun_1.filesystem.exists(process.env.IDF_TOOLS_PATH) === 'dir' &&
|
|
40
35
|
gluegun_1.filesystem.exists(process.env.IDF_PATH) === 'dir');
|
|
41
36
|
}
|
|
42
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
37
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2luZG93cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NldHVwL2VzcDMyL3dpbmRvd3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFhQSxrQ0E2QkM7QUFFRCxrQ0FPQztBQW5ERCxxQ0FBbUQ7QUFFbkQsK0JBQWdDO0FBQ2hDLG1DQUFpQztBQUVqQyxnREFBaUQ7QUFDakQsOENBQWdEO0FBRWhELE1BQU0sZUFBZSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxpQkFBUSxDQUFDLENBQUE7QUFFM0MsTUFBTSxhQUFhLEdBQ2pCLDhHQUE4RyxDQUFBO0FBRXpHLEtBQUssVUFBVSxXQUFXLENBQy9CLE9BQXlDLEVBQ3pDLFNBQWlCLEVBQ2pCLFFBQWdCO0lBRWhCLElBQUksV0FBVyxFQUFFLEVBQUUsQ0FBQztRQUNsQixlQUFLLENBQUMsSUFBSSxDQUFDLDZCQUE2QixPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ3JFLE9BQU8sSUFBQSxvQkFBVyxHQUFFLENBQUE7SUFDdEIsQ0FBQztJQUVELE9BQU8sQ0FBQyxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQTtJQUNwRCxNQUFNLFdBQVcsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FDcEMsU0FBUyxFQUNULHFDQUFxQyxDQUN0QyxDQUFBO0lBQ0QsTUFBTSxNQUFNLEdBQUcsb0JBQVUsQ0FBQyxpQkFBaUIsQ0FBQyxXQUFXLENBQUMsQ0FBQTtJQUN4RCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUEsbUJBQVcsRUFBQyxhQUFhLENBQUMsQ0FBQTtJQUNqRCxRQUFRLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQ3JCLE1BQU0sZUFBZSxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBQzdCLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUVqQixlQUFLLENBQUMsSUFBSSxDQUNSLHdFQUF3RSxRQUFRLEdBQUcsQ0FDcEYsQ0FBQTtJQUNELGVBQUssQ0FBQyxJQUFJLENBQUMsZ0RBQWdELENBQUMsQ0FBQTtJQUM1RCxPQUFPLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUE7SUFDaEQsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLFdBQVcsRUFBRSxDQUFDLENBQUE7SUFDNUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFBO0lBQ2pCLE9BQU8sSUFBQSxvQkFBVyxHQUFFLENBQUE7QUFDdEIsQ0FBQztBQUVELFNBQWdCLFdBQVc7SUFDekIsT0FBTyxDQUNMLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLFNBQVM7UUFDbEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEtBQUssU0FBUztRQUN4QyxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGNBQWMsQ0FBQyxLQUFLLEtBQUs7UUFDdkQsb0JBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxLQUFLLENBQ2xELENBQUE7QUFDSCxDQUFDIn0=
|
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.installPython = installPython;
|
|
7
4
|
exports.installDeps = installDeps;
|
|
8
5
|
const gluegun_1 = require("gluegun");
|
|
9
6
|
const stream_1 = require("stream");
|
|
10
|
-
const axios_1 = __importDefault(require("axios"));
|
|
11
7
|
const unzip_stream_1 = require("unzip-stream");
|
|
12
8
|
const util_1 = require("util");
|
|
13
9
|
const windows_1 = require("../windows");
|
|
14
10
|
const constants_1 = require("../constants");
|
|
15
11
|
const errors_1 = require("../../system/errors");
|
|
12
|
+
const fetch_1 = require("../../system/fetch");
|
|
16
13
|
const finishedPromise = (0, util_1.promisify)(stream_1.finished);
|
|
17
14
|
const ESP_TOOL = 'https://github.com/igrr/esptool-ck/releases/download/0.4.13/esptool-0.4.13-win32.zip';
|
|
18
15
|
const ESP_TOOL_VERSION = 'esptool-0.4.13-win32';
|
|
@@ -46,20 +43,16 @@ async function installDeps(spinner, ESP_DIR) {
|
|
|
46
43
|
const CYGWIN_BIN = gluegun_1.filesystem.resolve(ESP_DIR, 'cygwin', 'bin');
|
|
47
44
|
spinner.start('Downloading ESP Tool');
|
|
48
45
|
let writer = (0, unzip_stream_1.Extract)({ path: ESP_DIR });
|
|
49
|
-
let
|
|
50
|
-
|
|
51
|
-
});
|
|
52
|
-
response.data.pipe(writer);
|
|
46
|
+
let download = await (0, fetch_1.fetchStream)(ESP_TOOL);
|
|
47
|
+
download.pipe(writer);
|
|
53
48
|
await finishedPromise(writer);
|
|
54
49
|
gluegun_1.filesystem.move(ESP_TOOL_EXE, ESP_TOOL_DESTINATION, { overwrite: true });
|
|
55
50
|
gluegun_1.filesystem.remove(ESP_TOOL_DIR);
|
|
56
51
|
spinner.succeed();
|
|
57
52
|
spinner.start('Downloading Cygwin toolchain support package');
|
|
58
53
|
writer = (0, unzip_stream_1.Extract)({ path: ESP_DIR });
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
});
|
|
62
|
-
response.data.pipe(writer);
|
|
54
|
+
download = await (0, fetch_1.fetchStream)(CYGWIN);
|
|
55
|
+
download.pipe(writer);
|
|
63
56
|
await finishedPromise(writer);
|
|
64
57
|
spinner.succeed();
|
|
65
58
|
spinner.start('Setting environment variables');
|
|
@@ -81,4 +74,4 @@ async function installDeps(spinner, ESP_DIR) {
|
|
|
81
74
|
spinner.succeed();
|
|
82
75
|
return (0, errors_1.successVoid)();
|
|
83
76
|
}
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2luZG93cy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NldHVwL2VzcDgyNjYvd2luZG93cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQWtCQSxzQ0FrQ0M7QUFFRCxrQ0ErQ0M7QUFyR0QscUNBQW1EO0FBQ25ELG1DQUFpQztBQUVqQywrQ0FBb0Q7QUFDcEQsK0JBQWdDO0FBQ2hDLHdDQUE4QztBQUM5Qyw0Q0FBMEM7QUFDMUMsZ0RBQTBEO0FBQzFELDhDQUFnRDtBQUdoRCxNQUFNLGVBQWUsR0FBRyxJQUFBLGdCQUFTLEVBQUMsaUJBQVEsQ0FBQyxDQUFBO0FBRTNDLE1BQU0sUUFBUSxHQUNaLHNGQUFzRixDQUFBO0FBQ3hGLE1BQU0sZ0JBQWdCLEdBQUcsc0JBQXNCLENBQUE7QUFDL0MsTUFBTSxNQUFNLEdBQUcsd0ZBQXdGLENBQUE7QUFFaEcsS0FBSyxVQUFVLGFBQWEsQ0FDakMsT0FBeUM7SUFFekMsSUFBSSxnQkFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUNwQyx5RkFBeUY7UUFDekYsSUFBSSxDQUFDO1lBQ0gsTUFBTSxnQkFBTSxDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQTtRQUNuQyxDQUFDO1FBQUMsT0FBTyxLQUFLLEVBQUUsQ0FBQztZQUNmLGVBQUssQ0FBQyxLQUFLLENBQUMscUJBQXFCLENBQUMsQ0FBQTtZQUNsQyxlQUFLLENBQUMsSUFBSSxDQUNSLCtEQUErRCxDQUNoRSxDQUFBO1lBQ0QsZUFBSyxDQUFDLElBQUksQ0FDUixrSEFBa0gsQ0FDbkgsQ0FBQTtZQUNELGVBQUssQ0FBQyxJQUFJLENBQ1IsOEVBQThFLENBQy9FLENBQUE7WUFDRCxlQUFLLENBQUMsSUFBSSxDQUNSLGlHQUFpRyxDQUNsRyxDQUFBO1lBQ0QsT0FBTyxJQUFBLGdCQUFPLEVBQUMsb0JBQW9CLENBQUMsQ0FBQTtRQUN0QyxDQUFDO1FB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
|
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.default = default_1;
|
|
7
7
|
const gluegun_1 = require("gluegun");
|
|
8
|
-
const axios_1 = __importDefault(require("axios"));
|
|
9
8
|
const stream_1 = require("stream");
|
|
10
9
|
const util_1 = require("util");
|
|
11
10
|
const tar_fs_1 = require("tar-fs");
|
|
@@ -22,6 +21,7 @@ const windows_2 = require("./windows");
|
|
|
22
21
|
const devices_1 = require("../prompt/devices");
|
|
23
22
|
const exec_1 = require("../system/exec");
|
|
24
23
|
const errors_1 = require("../system/errors");
|
|
24
|
+
const fetch_1 = require("../system/fetch");
|
|
25
25
|
const finishedPromise = (0, util_1.promisify)(stream_1.finished);
|
|
26
26
|
async function default_1() {
|
|
27
27
|
const OS = (0, os_1.type)().toLowerCase();
|
|
@@ -55,19 +55,15 @@ async function default_1() {
|
|
|
55
55
|
spinner.start('Downloading xtensa toolchain');
|
|
56
56
|
if (isWindows) {
|
|
57
57
|
const writer = (0, unzip_stream_1.Extract)({ path: ESP_DIR });
|
|
58
|
-
const
|
|
59
|
-
|
|
60
|
-
});
|
|
61
|
-
response.data.pipe(writer);
|
|
58
|
+
const download = await (0, fetch_1.fetchStream)(TOOLCHAIN);
|
|
59
|
+
download.pipe(writer);
|
|
62
60
|
await finishedPromise(writer);
|
|
63
61
|
}
|
|
64
62
|
else {
|
|
65
63
|
const writer = (0, tar_fs_1.extract)(ESP_DIR, { readable: true });
|
|
66
64
|
const gunzip = (0, zlib_1.createGunzip)();
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
});
|
|
70
|
-
response.data.pipe(gunzip).pipe(writer);
|
|
65
|
+
const download = await (0, fetch_1.fetchStream)(TOOLCHAIN);
|
|
66
|
+
download.pipe(gunzip).pipe(writer);
|
|
71
67
|
await finishedPromise(writer);
|
|
72
68
|
}
|
|
73
69
|
spinner.succeed();
|
|
@@ -76,10 +72,8 @@ async function default_1() {
|
|
|
76
72
|
if (gluegun_1.filesystem.exists(ARDUINO_CORE_PATH) === false) {
|
|
77
73
|
spinner.start('Downloading arduino core tooling');
|
|
78
74
|
const writer = (0, unzip_stream_1.Extract)({ path: ESP_DIR });
|
|
79
|
-
const
|
|
80
|
-
|
|
81
|
-
});
|
|
82
|
-
response.data.pipe(writer);
|
|
75
|
+
const download = await (0, fetch_1.fetchStream)(ARDUINO_CORE);
|
|
76
|
+
download.pipe(writer);
|
|
83
77
|
await finishedPromise(writer);
|
|
84
78
|
spinner.succeed();
|
|
85
79
|
}
|
|
@@ -122,4 +116,4 @@ async function default_1() {
|
|
|
122
116
|
`);
|
|
123
117
|
return (0, errors_1.successVoid)();
|
|
124
118
|
}
|
|
125
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNwODI2Ni5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy90b29sYm94L3NldHVwL2VzcDgyNjYudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFzQkEsNEJBZ0hDO0FBdElELHFDQUFtRDtBQUNuRCxtQ0FBaUM7QUFDakMsK0JBQWdDO0FBQ2hDLG1DQUFnQztBQUNoQywrQkFBbUM7QUFDbkMsK0NBQW9EO0FBQ3BELDJCQUF5QztBQUN6QywyQ0FBNEQ7QUFDNUQseUNBQTJDO0FBQzNDLGdFQUF1QztBQUN2Qyx1Q0FBNkQ7QUFDN0QsMkNBQWlFO0FBQ2pFLCtDQUFxRTtBQUNyRSx1Q0FBdUQ7QUFDdkQsK0NBQWdEO0FBRWhELHlDQUFrRDtBQUNsRCw2Q0FBa0U7QUFDbEUsMkNBQTZDO0FBRTdDLE1BQU0sZUFBZSxHQUFHLElBQUEsZ0JBQVMsRUFBQyxpQkFBUSxDQUFDLENBQUE7QUFFNUIsS0FBSztJQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFBLFNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO0lBQ2pELE1BQU0sU0FBUyxHQUFHLEVBQUUsS0FBSyxZQUFZLENBQUE7SUFDckMsTUFBTSxTQUFTLEdBQUcsMkZBQTJGLFNBQVMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksU0FBUyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO0lBQ3BLLE1BQU0sWUFBWSxHQUNoQiw4RUFBOEUsQ0FBQTtJQUNoRixNQUFNLGFBQWEsR0FBRyxtREFBbUQsQ0FBQTtJQUN6RSxNQUFNLFVBQVUsR0FBRyxjQUFjLENBQUE7SUFDakMsTUFBTSxPQUFPLEdBQUcsb0JBQVUsQ0FBQyxPQUFPLENBQUMsdUJBQVcsRUFBRSxLQUFLLENBQUMsQ0FBQTtJQUN0RCxNQUFNLFNBQVMsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsa0JBQWtCLENBQUMsQ0FBQTtJQUNqRSxNQUFNLGNBQWMsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDL0QsTUFBTSxpQkFBaUIsR0FBRyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsZUFBZSxDQUFDLENBQUE7SUFFdEUsTUFBTSxJQUFBLHdCQUFpQixHQUFFLENBQUE7SUFFekIsTUFBTSxPQUFPLEdBQUcsZUFBSyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQzVCLE9BQU8sQ0FBQyxLQUFLLENBQUMsMEJBQTBCLENBQUMsQ0FBQTtJQUV6Qyw0QkFBNEI7SUFDNUIsSUFBSSxDQUFDLElBQUEseUJBQWMsR0FBRSxFQUFFLENBQUM7UUFDdEIsT0FBTyxDQUFDLElBQUksQ0FDVix5REFBeUQsc0JBQVksQ0FBQyxFQUFFLENBQUMsd0JBQXdCLENBQ2xHLENBQUE7UUFDRCxPQUFPLElBQUEsZ0JBQU8sRUFDWix5REFBeUQsc0JBQVksQ0FBQyxFQUFFLENBQUMsd0JBQXdCLENBQ2xHLENBQUE7SUFDSCxDQUFDO0lBRUQsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNkLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSxxQ0FBMkIsRUFBQyxPQUFPLENBQUMsQ0FBQTtRQUN6RCxJQUFJLElBQUEsa0JBQVMsRUFBQyxNQUFNLENBQUM7WUFBRSxPQUFPLE1BQU0sQ0FBQTtJQUN0QyxDQUFDO0lBRUQseUNBQXlDO0lBQ3pDLE9BQU8sQ0FBQyxJQUFJLENBQUMsNEJBQTRCLENBQUMsQ0FBQTtJQUMxQyxvQkFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUV2Qix5Q0FBeUM7SUFDekMsSUFBSSxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxjQUFjLENBQUMsS0FBSyxLQUFLLEVBQUUsQ0FBQztRQUNoRCxPQUFPLENBQUMsS0FBSyxDQUFDLDhCQUE4QixDQUFDLENBQUE7UUFFN0MsSUFBSSxTQUFTLEVBQUUsQ0FBQztZQUNkLE1BQU0sTUFBTSxHQUFHLElBQUEsc0JBQVUsRUFBQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsQ0FBQyxDQUFBO1lBQzVDLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBQSxtQkFBVyxFQUFDLFNBQVMsQ0FBQyxDQUFBO1lBQzdDLFFBQVEsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDckIsTUFBTSxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDL0IsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLE1BQU0sR0FBRyxJQUFBLGdCQUFPLEVBQUMsT0FBTyxFQUFFLEVBQUUsUUFBUSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7WUFDbkQsTUFBTSxNQUFNLEdBQUcsSUFBQSxtQkFBWSxHQUFFLENBQUE7WUFDN0IsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLG1CQUFXLEVBQUMsU0FBUyxDQUFDLENBQUE7WUFDN0MsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDbEMsTUFBTSxlQUFlLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDL0IsQ0FBQztRQUNELE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNuQixDQUFDO0lBRUQsaURBQWlEO0lBQ2pELElBQUksb0JBQVUsQ0FBQyxNQUFNLENBQUMsaUJBQWlCLENBQUMsS0FBSyxLQUFLLEVBQUUsQ0FBQztRQUNuRCxPQUFPLENBQUMsS0FBSyxDQUFDLGtDQUFrQyxDQUFDLENBQUE7UUFDakQsTUFBTSxNQUFNLEdBQUcsSUFBQSxzQkFBVSxFQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUE7UUFDNUMsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFBLG1CQUFXLEVBQUMsWUFBWSxDQUFDLENBQUE7UUFDaEQsUUFBUSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUNyQixNQUFNLGVBQWUsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUM3QixPQUFPLENBQUMsT0FBTyxFQUFFLENBQUE7SUFDbkIsQ0FBQztJQUVELDRCQUE0QjtJQUM1QixJQUFJLG9CQUFVLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUFLLEtBQUssRUFBRSxDQUFDO1FBQzNDLE9BQU8sQ0FBQyxLQUFLLENBQUMsK0JBQStCLENBQUMsQ0FBQTtRQUM5QyxNQUFNLGdCQUFNLENBQUMsS0FBSyxDQUNoQiwwQ0FBMEMsVUFBVSxJQUFJLGFBQWEsSUFBSSxTQUFTLEVBQUUsQ0FDckYsQ0FBQTtRQUNELE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQTtJQUNuQixDQUFDO0lBRUQsb0RBQW9EO0lBQ3BELElBQUksRUFBRSxLQUFLLFFBQVEsRUFBRSxDQUFDO1FBQ3BCLE1BQU0sTUFBTSxHQUFHLE1BQU0sSUFBQSxpQkFBYyxFQUFDLE9BQU8sQ0FBQyxDQUFBO1FBQzVDLElBQUksSUFBQSxrQkFBUyxFQUFDLE1BQU0sQ0FBQztZQUFFLE9BQU8sTUFBTSxDQUFBO0lBQ3RDLENBQUM7SUFFRCxJQUFJLEVBQUUsS0FBSyxPQUFPLEVBQUUsQ0FBQztRQUNuQixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUEsbUJBQWdCLEVBQUMsT0FBTyxDQUFDLENBQUE7UUFDOUMsSUFBSSxJQUFBLGtCQUFTLEVBQUMsTUFBTSxDQUFDO1lBQUUsT0FBTyxNQUFNLENBQUE7SUFDdEMsQ0FBQztJQUVELElBQUksU0FBUyxFQUFFLENBQUM7UUFDZCxNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUEscUJBQWtCLEVBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxDQUFBO1FBQ3pELElBQUksSUFBQSxrQkFBUyxFQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUM7WUFDdEIsZUFBSyxDQUFDLEtBQUssQ0FDVCw4RUFBOEUsQ0FDL0UsQ0FBQTtZQUNELE9BQU8sTUFBTSxDQUFBO1FBQ2YsQ0FBQztJQUNILENBQUM7SUFFRCxpREFBaUQ7SUFDakQsSUFBSSxFQUFFLEtBQUssUUFBUSxJQUFJLEVBQUUsS0FBSyxPQUFPLEVBQUUsQ0FBQztRQUN0QyxJQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQ3ZDLE9BQU8sQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtZQUNyQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsR0FBRyxPQUFPLENBQUE7WUFDOUIsTUFBTSxJQUFBLGdCQUFNLEVBQUMsNkJBQWlCLEVBQUUsbUJBQW1CLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQTtRQUM1RSxDQUFDO0lBQ0gsQ0FBQyxDQUFDLGtEQUFrRDtJQUVwRCxPQUFPLENBQUMsT0FBTyxDQUFDOzt5Q0FFdUIsU0FBUyxDQUFDLENBQUMsQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDLENBQUMsa0JBQWtCOztHQUVoRyxDQUFDLENBQUE7SUFFRixPQUFPLElBQUEsb0JBQVcsR0FBRSxDQUFBO0FBQ3RCLENBQUMifQ==
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.MissingReleaseAssetError = void 0;
|
|
7
4
|
exports.moddableExists = moddableExists;
|
|
@@ -14,10 +11,10 @@ const util_1 = require("util");
|
|
|
14
11
|
const gluegun_1 = require("gluegun");
|
|
15
12
|
const rest_1 = require("@octokit/rest");
|
|
16
13
|
const unzip_stream_1 = require("unzip-stream");
|
|
17
|
-
const axios_1 = __importDefault(require("axios"));
|
|
18
14
|
const constants_1 = require("./constants");
|
|
19
15
|
const devices_1 = require("../prompt/devices");
|
|
20
16
|
const errors_1 = require("../system/errors");
|
|
17
|
+
const fetch_1 = require("../system/fetch");
|
|
21
18
|
const finishedPromise = (0, util_1.promisify)(stream_1.finished);
|
|
22
19
|
function moddableExists() {
|
|
23
20
|
const OS = (0, os_1.type)().toLowerCase();
|
|
@@ -91,11 +88,9 @@ async function downloadReleaseTools({ writePath, assetName, release, }) {
|
|
|
91
88
|
const zipWriter = (0, unzip_stream_1.Extract)({
|
|
92
89
|
path: writePath,
|
|
93
90
|
});
|
|
94
|
-
const
|
|
95
|
-
|
|
96
|
-
});
|
|
97
|
-
response.data.pipe(zipWriter);
|
|
91
|
+
const download = await (0, fetch_1.fetchStream)(moddableTools.browser_download_url);
|
|
92
|
+
download.pipe(zipWriter);
|
|
98
93
|
await finishedPromise(zipWriter);
|
|
99
94
|
});
|
|
100
95
|
}
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
96
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZGFibGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9tb2RkYWJsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFjQSx3Q0FjQztBQU1ELGdEQTBCQztBQVFELG9DQXNCQztBQWNELG9EQW1CQztBQTNIRCwyQkFBeUM7QUFDekMsbUNBQWlDO0FBQ2pDLCtCQUFnQztBQUNoQyxxQ0FBNEM7QUFDNUMsd0NBQXFFO0FBQ3JFLCtDQUFvRDtBQUNwRCwyQ0FBMEM7QUFFMUMsK0NBQWdEO0FBQ2hELDZDQUFxRDtBQUNyRCwyQ0FBNkM7QUFFN0MsTUFBTSxlQUFlLEdBQUcsSUFBQSxnQkFBUyxFQUFDLGlCQUFRLENBQUMsQ0FBQTtBQUUzQyxTQUFnQixjQUFjO0lBQzVCLE1BQU0sRUFBRSxHQUFHLElBQUEsU0FBWSxHQUFFLENBQUMsV0FBVyxFQUFZLENBQUE7SUFDakQsTUFBTSxXQUFXLEdBQUcsc0JBQVksQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO0lBQ2pELE1BQU0sWUFBWSxHQUFHLG9CQUFVLENBQUMsTUFBTSxDQUNwQyxvQkFBVSxDQUFDLE9BQU8sQ0FBQyx3QkFBWSxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsV0FBVyxFQUFFLFNBQVMsQ0FBQyxDQUN6RSxDQUFBO0lBQ0QsTUFBTSxVQUFVLEdBQUcsb0JBQVUsQ0FBQyxNQUFNLENBQ2xDLG9CQUFVLENBQUMsT0FBTyxDQUFDLHdCQUFZLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxXQUFXLEVBQUUsT0FBTyxDQUFDLENBQ3ZFLENBQUE7SUFDRCxPQUFPLENBQ0wsT0FBTyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEtBQUssU0FBUztRQUNsQyxvQkFBVSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEtBQUs7UUFDakQsQ0FBQyxZQUFZ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
|
|
@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.default = default_1;
|
|
30
|
-
const axios_1 = __importDefault(require("axios"));
|
|
31
30
|
const node_fs_1 = require("node:fs");
|
|
32
31
|
const gluegun_1 = require("gluegun");
|
|
33
32
|
const node_os_1 = require("node:os");
|
|
@@ -43,6 +42,7 @@ const windows_1 = require("./windows");
|
|
|
43
42
|
const upsert_1 = __importDefault(require("../patching/upsert"));
|
|
44
43
|
const windows_2 = require("./nrf52/windows");
|
|
45
44
|
const errors_1 = require("../system/errors");
|
|
45
|
+
const fetch_1 = require("../system/fetch");
|
|
46
46
|
const finishedPromise = (0, node_util_1.promisify)(node_stream_1.finished);
|
|
47
47
|
const ARCH_ALIAS = {
|
|
48
48
|
darwin_arm64: 'darwin-arm64',
|
|
@@ -94,10 +94,8 @@ async function default_1() {
|
|
|
94
94
|
const writer = isWindows
|
|
95
95
|
? (0, unzip_stream_1.Extract)({ path: NRF52_DIR })
|
|
96
96
|
: (0, tar_fs_1.extract)(NRF52_DIR, { readable: true });
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
});
|
|
100
|
-
const stream = isWindows ? response.data : response.data.pipe(createUnxz());
|
|
97
|
+
const download = await (0, fetch_1.fetchStream)(TOOLCHAIN_DOWNLOAD);
|
|
98
|
+
const stream = isWindows ? download : download.pipe(createUnxz());
|
|
101
99
|
stream.pipe(writer);
|
|
102
100
|
await finishedPromise(writer);
|
|
103
101
|
spinner.succeed();
|
|
@@ -105,20 +103,16 @@ async function default_1() {
|
|
|
105
103
|
if (gluegun_1.filesystem.exists(UF2CONV_PATH) === false) {
|
|
106
104
|
spinner.start('Downloading Adafruit nRF52 Bootloader');
|
|
107
105
|
const writer = (0, node_fs_1.createWriteStream)(UF2CONV_PATH, { mode: 0o755 });
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
});
|
|
111
|
-
response.data.pipe(writer);
|
|
106
|
+
const download = await (0, fetch_1.fetchStream)(ADAFRUIT_NRF52_BOOTLOADER_UF2CONV_DOWNLOAD);
|
|
107
|
+
download.pipe(writer);
|
|
112
108
|
await finishedPromise(writer);
|
|
113
109
|
spinner.succeed();
|
|
114
110
|
}
|
|
115
111
|
if (gluegun_1.filesystem.exists(NRF5_SDK_PATH) === false) {
|
|
116
112
|
spinner.start('Downloading nRF5 SDK');
|
|
117
113
|
const writer = (0, unzip_stream_1.Extract)({ path: NRF52_DIR });
|
|
118
|
-
const
|
|
119
|
-
|
|
120
|
-
});
|
|
121
|
-
response.data.pipe(writer);
|
|
114
|
+
const download = await (0, fetch_1.fetchStream)(NRF5_SDK_DOWNLOAD);
|
|
115
|
+
download.pipe(writer);
|
|
122
116
|
await finishedPromise(writer);
|
|
123
117
|
spinner.succeed();
|
|
124
118
|
}
|
|
@@ -156,4 +150,4 @@ async function default_1() {
|
|
|
156
150
|
`);
|
|
157
151
|
return (0, errors_1.successVoid)();
|
|
158
152
|
}
|
|
159
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
153
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnJmNTIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zZXR1cC9ucmY1Mi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBMkJBLDRCQStIQztBQTFKRCxxQ0FBMkM7QUFDM0MscUNBQTJDO0FBQzNDLHFDQUFvRDtBQUNwRCw2Q0FBd0U7QUFDeEUsbUNBQWdDO0FBQ2hDLHlDQUFxQztBQUNyQywrQ0FBb0Q7QUFHcEQsK0NBQWdEO0FBQ2hELHlDQUFnRTtBQUNoRSwyQ0FBNEQ7QUFDNUQseUNBQTJDO0FBQzNDLHVDQUErRDtBQUMvRCxnRUFBdUM7QUFDdkMsNkNBQStDO0FBQy9DLDZDQUFrRTtBQUNsRSwyQ0FBNkM7QUFFN0MsTUFBTSxlQUFlLEdBQUcsSUFBQSxxQkFBUyxFQUFDLHNCQUFRLENBQUMsQ0FBQTtBQUUzQyxNQUFNLFVBQVUsR0FBMkI7SUFDekMsWUFBWSxFQUFFLGNBQWM7SUFDNUIsVUFBVSxFQUFFLGVBQWU7SUFDM0IsU0FBUyxFQUFFLFFBQVE7SUFDbkIsY0FBYyxFQUFFLGdCQUFnQjtDQUNqQyxDQUFBO0FBQ2MsS0FBSztJQUNsQixNQUFNLEVBQUUsR0FBRyxJQUFBLGNBQVksR0FBRSxDQUFDLFdBQVcsRUFBWSxDQUFBO0lBQ2pELE1BQU0sU0FBUyxHQUFHLEVBQUUsS0FBSyxZQUFZLENBQUE7SUFDckMsTUFBTSxTQUFTLEdBQUcsK0JBQStCLFVBQVUsQ0FBQyxHQUFHLEVBQUUsSUFBSSxJQUFBLGNBQUksR0FBRSxFQUFFLENBQUMsZ0JBQWdCLENBQUE7SUFDOUYsTUFBTSxrQkFBa0IsR0FBRywwRUFBMEUsU0FBUyxJQUFJLFNBQVMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQTtJQUNoSixNQUFNLDBDQUEwQyxHQUM5QyxrRkFBa0YsQ0FBQTtJQUNwRixNQUFNLFFBQVEsR0FBRyx5QkFBeUIs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
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.fetchStream = fetchStream;
|
|
4
|
+
const node_stream_1 = require("node:stream");
|
|
5
|
+
async function fetchStream(url) {
|
|
6
|
+
const response = await fetch(url);
|
|
7
|
+
if (!response.ok) {
|
|
8
|
+
throw new Error(`HTTP ${response.status} ${response.statusText}: ${url}`);
|
|
9
|
+
}
|
|
10
|
+
if (response.body === null) {
|
|
11
|
+
throw new Error(`Empty response body: ${url}`);
|
|
12
|
+
}
|
|
13
|
+
return node_stream_1.Readable.fromWeb(response.body);
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmV0Y2guanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvdG9vbGJveC9zeXN0ZW0vZmV0Y2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQSxrQ0FTQztBQVhELDZDQUFzQztBQUUvQixLQUFLLFVBQVUsV0FBVyxDQUFDLEdBQVc7SUFDM0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDakMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNqQixNQUFNLElBQUksS0FBSyxDQUFDLFFBQVEsUUFBUSxDQUFDLE1BQU0sSUFBSSxRQUFRLENBQUMsVUFBVSxLQUFLLEdBQUcsRUFBRSxDQUFDLENBQUE7SUFDM0UsQ0FBQztJQUNELElBQUksUUFBUSxDQUFDLElBQUksS0FBSyxJQUFJLEVBQUUsQ0FBQztRQUMzQixNQUFNLElBQUksS0FBSyxDQUFDLHdCQUF3QixHQUFHLEVBQUUsQ0FBQyxDQUFBO0lBQ2hELENBQUM7SUFDRCxPQUFPLHNCQUFRLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQTtBQUN4QyxDQUFDIn0=
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xs-dev",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.3",
|
|
4
4
|
"description": "CLI for automating the setup and usage of Moddable XS tools",
|
|
5
5
|
"types": "build/types/types.d.ts",
|
|
6
6
|
"packageManager": "pnpm@10.29.2",
|
|
@@ -52,7 +52,6 @@
|
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@octokit/rest": "^20.1.1",
|
|
54
54
|
"@stricli/core": "^1.1.0",
|
|
55
|
-
"axios": "^1.2.1",
|
|
56
55
|
"gluegun": "^5.1.2",
|
|
57
56
|
"serialport": "^10.3.0",
|
|
58
57
|
"serve-handler": "^6.1.3",
|
|
@@ -74,7 +73,7 @@
|
|
|
74
73
|
"@babel/core": ">=7.20.12 <8.0.0",
|
|
75
74
|
"@changesets/cli": "^2.19.0",
|
|
76
75
|
"@justinribeiro/lite-youtube": "^1.5.0",
|
|
77
|
-
"@types/node": "^
|
|
76
|
+
"@types/node": "^24.0.0",
|
|
78
77
|
"@types/serve-handler": "^6.1.1",
|
|
79
78
|
"@types/tar-fs": "^2.0.1",
|
|
80
79
|
"@types/unzip-stream": "^0.3.1",
|