@nordicsemiconductor/nrf-jlink-js 0.0.4 → 0.0.6

package/dist/{src/index.d.ts → index.d.ts}

@@ -1,2 +1,2 @@
-import { downloadAndInstallJLink, getVersionToInstall, downloadAndSaveJLink } from './jlink';
-export { downloadAndInstallJLink, getVersionToInstall, downloadAndSaveJLink };
+import { downloadAndInstallJLink, getVersionToInstall, downloadAndSaveJLink, installJLink } from './jlink';
+export { downloadAndInstallJLink, getVersionToInstall, downloadAndSaveJLink, installJLink };

package/dist/{src/index.js → index.js}

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadAndSaveJLink = exports.getVersionToInstall = exports.downloadAndInstallJLink = void 0;
+exports.installJLink = exports.downloadAndSaveJLink = exports.getVersionToInstall = exports.downloadAndInstallJLink = void 0;
 var jlink_1 = require("./jlink");
 Object.defineProperty(exports, "downloadAndInstallJLink", { enumerable: true, get: function () { return jlink_1.downloadAndInstallJLink; } });
 Object.defineProperty(exports, "getVersionToInstall", { enumerable: true, get: function () { return jlink_1.getVersionToInstall; } });
 Object.defineProperty(exports, "downloadAndSaveJLink", { enumerable: true, get: function () { return jlink_1.downloadAndSaveJLink; } });
+Object.defineProperty(exports, "installJLink", { enumerable: true, get: function () { return jlink_1.installJLink; } });

package/dist/{src/jlink.d.ts → jlink.d.ts}

@@ -2,6 +2,7 @@ interface Update {
     step: 'install' | 'download';
     percentage: number;
 }
+export declare const installJLink: (installerPath: string, onUpdate?: (update: Update) => void) => Promise<void>;
 interface JLinkState {
     outdated: boolean;
     installed: boolean;

package/dist/{src/jlink.js → jlink.js}

@@ -35,20 +35,11 @@ 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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadAndInstallJLink = exports.downloadAndSaveJLink = exports.getVersionToInstall = void 0;
+exports.downloadAndInstallJLink = exports.downloadAndSaveJLink = exports.getVersionToInstall = exports.installJLink = void 0;
 var child_process_1 = require("child_process");
 var os_1 = __importDefault(require("os"));
 var path_1 = __importDefault(require("path"));
@@ -112,52 +103,45 @@ var getInstalledJLinkVersion = function () {
         });
     });
 };
-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, destinationPath) {
-        var platform, arch, url, _c, status, stream;
-        var _d;
-        var jlinkUrls = _b.jlinkUrls;
-        if (destinationPath === void 0) { destinationPath = os_1.default.tmpdir(); }
-        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',
-                            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) {
-                        throw new Error("Unable to download ".concat(url, ". Got status code ").concat(status, "."));
-                    }
-                    return [4 /*yield*/, (0, common_1.saveToFile)(stream, path_1.default.join(destinationPath, path_1.default.basename(url)))];
-                case 2: return [2 /*return*/, _e.sent()];
-            }
-        });
+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',
+                        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) {
+                    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 installJLink = function (installerPath, onUpdate) {
     var command;
     var args;
@@ -190,6 +174,7 @@ var installJLink = function (installerPath, onUpdate) {
         });
     });
 };
+exports.installJLink = installJLink;
 var convertToSemverVersion = function (version) {
     var _a;
     var _b = (_a = version.match(/V?(\d+\.\d+)(.)?/)) !== null && _a !== void 0 ? _a : [], majorMinor = _b[1], patchLetter = _b[2];
@@ -233,6 +218,6 @@ exports.downloadAndSaveJLink = downloadAndSaveJLink;
 var downloadAndInstallJLink = function (onUpdate) {
     return (0, common_1.fetchIndex)()
         .then(function (v) { return downloadJLink(v, onUpdate); })
-        .then(function (v) { return installJLink(v, onUpdate); });
+        .then(function (v) { return (0, exports.installJLink)(v, onUpdate); });
 };
 exports.downloadAndInstallJLink = downloadAndInstallJLink;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/nrf-jlink-js",
-    "version": "0.0.4",
+    "version": "0.0.6",
     "main": "dist",
     "types": "dist",
     "files": [

package/dist/scripts/upload-jlink.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env ts-node
-export {};

package/dist/scripts/upload-jlink.js

@@ -1,295 +0,0 @@
-#!/usr/bin/env ts-node
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var path_1 = __importDefault(require("path"));
-var axios_1 = __importDefault(require("axios"));
-var os_1 = __importDefault(require("os"));
-var fs_1 = __importDefault(require("fs"));
-var common_1 = require("../src/common");
-var SEGGER_DOWNLOAD_BASE_URL = 'https://www.segger.com/downloads/jlink';
-var ARTIFACTORY_UPLOAD_BASE_URL = "https://files.nordicsemi.com/artifactory/swtools/external/ncd/jlink";
-var platformToJlinkPlatform = function (variant) {
-    switch (variant) {
-        case 'win32':
-            return 'Windows';
-        case 'linux':
-            return 'Linux';
-        case 'darwin':
-            return 'MacOSX';
-        default:
-            throw new Error("Unknown variant ".concat(variant));
-    }
-};
-var doPerVariant = function (variants, action) { return __awaiter(void 0, void 0, void 0, function () {
-    var ret, _loop_1, _i, platforms_1, platform;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                ret = {};
-                _loop_1 = function (platform) {
-                    var _b, _c, _d, _e;
-                    return __generator(this, function (_f) {
-                        switch (_f.label) {
-                            case 0:
-                                _b = ret;
-                                _c = platform;
-                                _e = (_d = Object).fromEntries;
-                                return [4 /*yield*/, Promise.all(common_1.archs.map(function (arch) { return __awaiter(void 0, void 0, void 0, function () {
-                                        var _a;
-                                        return __generator(this, function (_b) {
-                                            switch (_b.label) {
-                                                case 0:
-                                                    _a = [arch];
-                                                    return [4 /*yield*/, action(variants[platform][arch])];
-                                                case 1: return [2 /*return*/, _a.concat([
-                                                        (_b.sent()) ||
-                                                            variants[platform][arch]
-                                                    ])];
-                                            }
-                                        });
-                                    }); }))];
-                            case 1:
-                                _b[_c] = _e.apply(_d, [_f.sent()]);
-                                return [2 /*return*/];
-                        }
-                    });
-                };
-                _i = 0, platforms_1 = common_1.platforms;
-                _a.label = 1;
-            case 1:
-                if (!(_i < platforms_1.length)) return [3 /*break*/, 4];
-                platform = platforms_1[_i];
-                return [5 /*yield**/, _loop_1(platform)];
-            case 2:
-                _a.sent();
-                _a.label = 3;
-            case 3:
-                _i++;
-                return [3 /*break*/, 1];
-            case 4: return [2 /*return*/, ret];
-        }
-    });
-}); };
-var downloadInstallers = function (fileNames) { return __awaiter(void 0, void 0, void 0, function () {
-    var incorrectFiles, ret;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                console.log('Started downloading all JLink variants.');
-                incorrectFiles = [];
-                return [4 /*yield*/, doPerVariant(fileNames, function (fileName) { return __awaiter(void 0, void 0, void 0, function () {
-                        var url, _a, status, stream;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    url = "".concat(SEGGER_DOWNLOAD_BASE_URL, "/").concat(fileName);
-                                    console.log('Started download:', url);
-                                    return [4 /*yield*/, axios_1.default.postForm(url, { accept_license_agreement: 'accepted' }, {
-                                            responseType: 'stream',
-                                            headers: {
-                                                'Content-Type': 'application/x-www-form-urlencoded',
-                                            },
-                                        })];
-                                case 1:
-                                    _a = _b.sent(), status = _a.status, stream = _a.data;
-                                    if (status !== 200) {
-                                        throw new Error("Unable to download ".concat(url, ". Got status code ").concat(status, "."));
-                                    }
-                                    if (!(stream.statusMessage === 'OK')) return [3 /*break*/, 3];
-                                    console.log('Finished download:', url);
-                                    return [4 /*yield*/, (0, common_1.saveToFile)(stream, path_1.default.join(os_1.default.tmpdir(), fileName))];
-                                case 2: return [2 /*return*/, _b.sent()];
-                                case 3:
-                                    incorrectFiles.push(fileName);
-                                    console.log('Failed to download (check if file exists):', url);
-                                    return [2 /*return*/, 'Incorrect'];
-                            }
-                        });
-                    }); })];
-            case 1:
-                ret = _a.sent();
-                if (incorrectFiles.length > 0) {
-                    throw new Error("Failed to download: ".concat(incorrectFiles.join(', ')));
-                }
-                console.log('Finished downloading all JLink variants.');
-                return [2 /*return*/, ret];
-        }
-    });
-}); };
-var getStandardisedVersion = function (rawVersion) {
-    var _a;
-    var regex = /[vV]?(\d+)\.(\d\d)(.{0,1})/;
-    var _b = (_a = rawVersion.match(regex)) !== null && _a !== void 0 ? _a : [], parsedVersion = _b[0], major = _b[1], minor = _b[2], patch = _b[3];
-    if (!parsedVersion || !major || !minor) {
-        throw new Error("Unable to parse version ".concat(rawVersion, ". Valid formats: v12.34, v1.23a, V1.23a, 12.34, 1.23a"));
-    }
-    return {
-        major: major,
-        minor: minor,
-        patch: patch === null || patch === void 0 ? void 0 : patch.toLowerCase(),
-    };
-};
-var getFileFormat = function (platform) {
-    switch (platform) {
-        case 'win32':
-            return 'exe';
-        case 'darwin':
-            return 'pkg';
-        case 'linux':
-            return 'deb';
-        default:
-            throw new Error("Unknown platform ".concat(process.platform));
-    }
-};
-var getFileNames = function (rawVersion) {
-    var version = getStandardisedVersion(rawVersion);
-    var fileNames = {};
-    var _loop_2 = function (platform) {
-        fileNames[platform] = Object.fromEntries(common_1.archs.map(function (arch) {
-            var _a;
-            return [
-                arch,
-                "JLink_".concat(platformToJlinkPlatform(platform), "_V").concat(version.major).concat(version.minor).concat((_a = version.patch) !== null && _a !== void 0 ? _a : '', "_").concat(arch == 'x64' ? 'x86_64' : arch, ".").concat(getFileFormat(platform)),
-            ];
-        }));
-    };
-    for (var _i = 0, platforms_2 = common_1.platforms; _i < platforms_2.length; _i++) {
-        var platform = platforms_2[_i];
-        _loop_2(platform);
-    }
-    return fileNames;
-};
-var getUpdatedSourceJson = function (version, jlinkUrls) { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-    return [2 /*return*/, (0, common_1.fetchIndex)().then(function (index) { return (__assign(__assign({}, index), { version: version, jlinkUrls: jlinkUrls })); })];
-}); }); };
-var uploadFile = function (url, data) { return __awaiter(void 0, void 0, void 0, function () {
-    var res, _a, _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
-            case 0: return [4 /*yield*/, fetch(url, {
-                    method: 'PUT',
-                    body: data,
-                    headers: {
-                        Authorization: "Bearer ".concat(process.env.ARTIFACTORY_TOKEN),
-                    },
-                })];
-            case 1:
-                res = _d.sent();
-                if (!!res.ok) return [3 /*break*/, 3];
-                _a = Error.bind;
-                _c = (_b = "Unable to upload to ".concat(url, ". Status code: ").concat(res.status, ". Body: ")).concat;
-                return [4 /*yield*/, res.text()];
-            case 2: throw new (_a.apply(Error, [void 0, _c.apply(_b, [_d.sent()])]))();
-            case 3: return [2 /*return*/];
-        }
-    });
-}); };
-var upload = function (version, files) {
-    if (!process.env.ARTIFACTORY_TOKEN) {
-        throw new Error('ARTIFACTORY_TOKEN environment variable not set');
-    }
-    console.log('Started uploading all JLink variants.');
-    return new Promise(function (resolve) { return __awaiter(void 0, void 0, void 0, function () {
-        var jlinkUrls, targetUrl, versionObject, updatedIndexJSON;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, doPerVariant(files, function (filePath) { return __awaiter(void 0, void 0, void 0, function () {
-                        var fileName, targetUrl;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    fileName = path_1.default.basename(filePath);
-                                    console.log('Started upload:', fileName);
-                                    targetUrl = "".concat(ARTIFACTORY_UPLOAD_BASE_URL, "/").concat(fileName);
-                                    return [4 /*yield*/, uploadFile(targetUrl, fs_1.default.readFileSync(filePath))];
-                                case 1:
-                                    _a.sent();
-                                    fs_1.default.rmSync(filePath);
-                                    console.log('Finished upload:', fileName);
-                                    return [2 /*return*/, targetUrl];
-                            }
-                        });
-                    }); })];
-                case 1:
-                    jlinkUrls = _a.sent();
-                    // Index
-                    console.log('Started uploading Index');
-                    targetUrl = "".concat(ARTIFACTORY_UPLOAD_BASE_URL, "/index.json");
-                    versionObject = getStandardisedVersion(version);
-                    return [4 /*yield*/, getUpdatedSourceJson("v".concat(versionObject.major, ".").concat(versionObject.minor).concat(versionObject.patch || ''), jlinkUrls)];
-                case 2:
-                    updatedIndexJSON = _a.sent();
-                    return [4 /*yield*/, uploadFile(targetUrl, Buffer.from(JSON.stringify(updatedIndexJSON, null, 2)))];
-                case 3:
-                    _a.sent();
-                    console.log('Finished uploading Index');
-                    return [2 /*return*/, resolve(targetUrl)];
-            }
-        });
-    }); });
-};
-var main = function (version) {
-    return downloadInstallers(getFileNames(version)).then(function (files) {
-        return upload(version, files);
-    });
-};
-var runAsScript = require.main === module;
-if (runAsScript) {
-    var versionIndex = process.argv.findIndex(function (arg) { return arg === '--version' || arg === '-v'; }) + 1;
-    var version = versionIndex > 0 ? process.argv[versionIndex] : undefined;
-    if (!version) {
-        console.error('No version passed with --version or -v');
-        process.exit(1);
-    }
-    main(version);
-}