@nordicsemiconductor/nrf-jlink-js 0.0.8 → 0.0.10

package/dist/common.d.ts

@@ -7,4 +7,4 @@ export interface JLinkIndex {
     jlinkUrls: JLinkVariant;
 }
 export declare const fetchIndex: () => Promise<JLinkIndex>;
-export declare const saveToFile: (stream: NodeJS.ReadableStream, destinationFile: string) => Promise<string>;
+export declare const saveToFile: (destinationFile: string, data: Buffer) => Promise<string>;

package/dist/common.js

@@ -40,27 +40,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveToFile = exports.fetchIndex = exports.archs = exports.platforms = void 0;
-var axios_1 = __importDefault(require("axios"));
 var fs_1 = require("fs");
 var path_1 = __importDefault(require("path"));
 exports.platforms = ['darwin', 'linux', 'win32'];
 exports.archs = ['arm64', 'x64'];
 var fetchJSON = function (url) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, status, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4 /*yield*/, axios_1.default.get(url, {
-                    responseType: 'json',
+    var response;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, fetch(url, {
                     headers: {
                         Range: 'bytes=0-',
                     },
                 })];
             case 1:
-                _a = _b.sent(), status = _a.status, data = _a.data;
-                if (status !== 200 && status !== 206) {
+                response = _a.sent();
+                if (!response.ok) {
                     throw new Error("Unable to fetch file from ".concat(indexUrl, ". Got status code ").concat(status, "."));
                 }
-                return [2 /*return*/, data];
+                return [2 /*return*/, response.json()];
         }
     });
 }); };
@@ -83,17 +81,16 @@ var fetchIndex = function () { return __awaiter(void 0, void 0, void 0, function
     });
 }); };
 exports.fetchIndex = fetchIndex;
-var saveToFile = function (stream, destinationFile) {
-    (0, fs_1.mkdirSync)(path_1.default.dirname(destinationFile), { recursive: true });
-    return new Promise(function (resolve, reject) {
-        var file = (0, fs_1.createWriteStream)(destinationFile);
-        stream.pipe(file);
-        stream.on('error', reject);
-        stream.on('end', function () {
-            file.end(function () {
-                return resolve(destinationFile);
-            });
-        });
+var saveToFile = function (destinationFile, data) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        (0, fs_1.mkdirSync)(path_1.default.dirname(destinationFile), { recursive: true });
+        try {
+            (0, fs_1.writeFileSync)(destinationFile, data);
+        }
+        catch (e) {
+            throw new Error("Unable to write file to ".concat(destinationFile, ". Error: ").concat(e));
+        }
+        return [2 /*return*/, destinationFile];
     });
-};
+}); };
 exports.saveToFile = saveToFile;

package/dist/jlink.d.ts

@@ -10,6 +10,6 @@ interface JLinkState {
     installedVersion?: string;
 }
 export declare const getVersionToInstall: (fallbackVersion?: string) => Promise<JLinkState>;
-export declare const downloadAndSaveJLink: (destination: string, onUpdate?: (update: Update) => void) => Promise<string>;
+export declare const downloadAndSaveJLink: (destinationDir: string, destinationFileName?: string, onUpdate?: (update: Update) => void) => Promise<string>;
 export declare const downloadAndInstallJLink: (onUpdate?: (update: Update) => void) => Promise<void>;
 export {};

package/dist/jlink.js

@@ -35,6 +35,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -44,7 +53,6 @@ var child_process_1 = require("child_process");
 var os_1 = __importDefault(require("os"));
 var path_1 = __importDefault(require("path"));
 var semver_1 = __importDefault(require("semver"));
-var axios_1 = __importDefault(require("axios"));
 var common_1 = require("./common");
 var getJLinkExePath = function () {
     switch (os_1.default.platform()) {
@@ -103,48 +111,77 @@ var getInstalledJLinkVersion = function () {
         });
     });
 };
-var downloadJLink = function (_a, onUpdate_1, destinationFilePath_1) { return __awaiter(void 0, [_a, onUpdate_1, destinationFilePath_1], void 0, function (_b, onUpdate, destinationFilePath) {
-    var platform, arch, url, _c, status, stream;
-    var _d;
-    var jlinkUrls = _b.jlinkUrls;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
-            case 0:
-                platform = os_1.default.platform();
-                arch = os_1.default.arch();
-                // @ts-expect-error It is quite literally checked right before
-                if (!(platform in jlinkUrls) || !(arch in jlinkUrls[platform])) {
-                    throw new Error("JLink not available for ".concat(platform, "/").concat(arch));
-                }
-                url = (_d = jlinkUrls[platform]) === null || _d === void 0 ? void 0 : _d[arch];
-                if (!url) {
-                    throw new Error("JLink not available for ".concat(platform, "/").concat(arch));
-                }
-                return [4 /*yield*/, axios_1.default.get(url, {
-                        responseType: 'stream',
-                        headers: {
-                            Range: 'bytes=0-',
-                        },
-                        onDownloadProgress: function (_a) {
-                            var loaded = _a.loaded, total = _a.total;
-                            return loaded &&
-                                total &&
-                                (onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate({
-                                    step: 'download',
-                                    percentage: Number(((loaded / total) * 100).toFixed(2)),
-                                }));
-                        },
-                    })];
-            case 1:
-                _c = _e.sent(), status = _c.status, stream = _c.data;
-                if (status !== 200 && status !== 206) {
-                    throw new Error("Unable to download ".concat(url, ". Got status code ").concat(status, "."));
-                }
-                return [4 /*yield*/, (0, common_1.saveToFile)(stream, destinationFilePath || path_1.default.join(os_1.default.tmpdir(), path_1.default.basename(url)))];
-            case 2: return [2 /*return*/, _e.sent()];
-        }
+var downloadJLink = function (_a, onUpdate_1) {
+    var args_1 = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        args_1[_i - 2] = arguments[_i];
+    }
+    return __awaiter(void 0, __spreadArray([_a, onUpdate_1], args_1, true), void 0, function (_b, onUpdate, destinationDir, destinationFileName) {
+        var platform, arch, url, response, hasContentLength, contentLength, reader, chunks, receivedLength, _c, done, value, chunksAll, position;
+        var _d, _e;
+        var jlinkUrls = _b.jlinkUrls;
+        if (destinationDir === void 0) { destinationDir = os_1.default.tmpdir(); }
+        return __generator(this, function (_f) {
+            switch (_f.label) {
+                case 0:
+                    platform = os_1.default.platform();
+                    arch = os_1.default.arch();
+                    // @ts-expect-error It is quite literally checked right before
+                    if (!(platform in jlinkUrls) || !(arch in jlinkUrls[platform])) {
+                        throw new Error("JLink not available for ".concat(platform, "/").concat(arch));
+                    }
+                    url = (_d = jlinkUrls[platform]) === null || _d === void 0 ? void 0 : _d[arch];
+                    if (!url) {
+                        throw new Error("JLink not available for ".concat(platform, "/").concat(arch));
+                    }
+                    return [4 /*yield*/, fetch(url, {
+                            headers: {
+                                Range: 'bytes=0-',
+                            },
+                        })];
+                case 1:
+                    response = _f.sent();
+                    if (!response.ok) {
+                        throw new Error("Unable to download ".concat(url, ". Got status code ").concat(status, "."));
+                    }
+                    hasContentLength = response.headers.has('content-length');
+                    contentLength = hasContentLength
+                        ? Number(response.headers.get('content-length'))
+                        : 1;
+                    reader = (_e = response.body) === null || _e === void 0 ? void 0 : _e.getReader();
+                    chunks = [];
+                    receivedLength = 0;
+                    _f.label = 2;
+                case 2:
+                    if (!reader) return [3 /*break*/, 4];
+                    return [4 /*yield*/, reader.read()];
+                case 3:
+                    _c = _f.sent(), done = _c.done, value = _c.value;
+                    if (done) {
+                        return [3 /*break*/, 4];
+                    }
+                    chunks.push(value);
+                    receivedLength += value.length;
+                    onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate({
+                        step: 'download',
+                        percentage: hasContentLength
+                            ? Number(((receivedLength / contentLength) * 100).toFixed(2))
+                            : 0,
+                    });
+                    return [3 /*break*/, 2];
+                case 4:
+                    chunksAll = new Uint8Array(receivedLength);
+                    position = 0;
+                    chunks.forEach(function (chunk) {
+                        chunksAll.set(chunk, position);
+                        position += chunk.length;
+                    });
+                    return [4 /*yield*/, (0, common_1.saveToFile)(path_1.default.join(destinationDir, destinationFileName || path_1.default.basename(url)), Buffer.from(chunksAll))];
+                case 5: return [2 /*return*/, _f.sent()];
+            }
+        });
     });
-}); };
+};
 var installJLink = function (installerPath, onUpdate) {
     var command;
     var args;
@@ -214,7 +251,7 @@ var getVersionToInstall = function (fallbackVersion) { return __awaiter(void 0,
     });
 }); };
 exports.getVersionToInstall = getVersionToInstall;
-var downloadAndSaveJLink = function (destination, onUpdate) { return (0, common_1.fetchIndex)().then(function (v) { return downloadJLink(v, onUpdate, destination); }); };
+var downloadAndSaveJLink = function (destinationDir, destinationFileName, onUpdate) { return (0, common_1.fetchIndex)().then(function (v) { return downloadJLink(v, onUpdate, destinationDir, destinationFileName); }); };
 exports.downloadAndSaveJLink = downloadAndSaveJLink;
 var downloadAndInstallJLink = function (onUpdate) {
     return (0, common_1.fetchIndex)()

package/package.json

@@ -1,13 +1,12 @@
 {
     "name": "@nordicsemiconductor/nrf-jlink-js",
-    "version": "0.0.8",
+    "version": "0.0.10",
     "main": "dist",
     "types": "dist",
     "files": [
         "dist"
     ],
     "dependencies": {
-        "axios": "^1.7.9",
         "semver": "^7.7.2"
     },
     "scripts": {