@nordicsemiconductor/nrf-jlink-js 0.0.9 → 0.0.11

package/dist/common.d.ts

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

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,20 +53,30 @@ 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 fs_1 = require("fs");
 var common_1 = require("./common");
+function winRegQuery(key) {
+    var _a;
+    if (process.platform !== 'win32') {
+        throw new Error('Unsupported platform');
+    }
+    var reg = path_1.default.resolve((_a = process.env.SystemRoot) !== null && _a !== void 0 ? _a : 'C:\\Windows', 'System32', 'reg.exe');
+    if (!(0, fs_1.existsSync)(reg)) {
+        reg = 'reg.exe';
+    }
+    return (0, child_process_1.execSync)("".concat(reg, " query ").concat(key)).toString().trim();
+}
 var getJLinkExePath = function () {
     switch (os_1.default.platform()) {
         case 'win32':
-            var path_2 = (0, child_process_1.execSync)('reg query HKEY_CURRENT_USER\\Software\\SEGGER\\J-Link /v InstallPath').toString();
-            var pathAlternative = (0, child_process_1.execSync)('reg query HKEY_LOCAL_MACHINE\\Software\\SEGGER\\J-Link /v InstallPath').toString();
-            if (!path_2 && !pathAlternative) {
-                throw new Error('JLink not installed');
+            var jlinkDir = winRegQuery('HKEY_CURRENT_USER\\Software\\SEGGER\\J-Link /v InstallPath');
+            if (!jlinkDir) {
+                jlinkDir = winRegQuery('HKEY_LOCAL_MACHINE\\Software\\SEGGER\\J-Link /v InstallPath');
             }
-            else if ((path_2 && typeof path_2 !== 'string') ||
-                (pathAlternative && typeof pathAlternative !== 'string')) {
-                throw new Error('Unable to read JLink install path');
+            if (!jlinkDir) {
+                throw new Error('JLink not installed');
             }
-            return (path_2 || pathAlternative);
+            return path_1.default.resolve(jlinkDir, 'JLink.exe');
         case 'linux':
         case 'darwin':
             return 'JLinkExe';
@@ -65,107 +84,111 @@ var getJLinkExePath = function () {
             throw new Error('Invalid platform');
     }
 };
+function killProcess(childProcess, signal) {
+    var pid = typeof childProcess === 'number' ? childProcess : childProcess === null || childProcess === void 0 ? void 0 : childProcess.pid;
+    if (!pid) {
+        return;
+    }
+    if (process.platform === 'win32') {
+        (0, child_process_1.spawn)('taskkill', ['/pid', "".concat(pid), '/f', '/t']);
+    }
+    else {
+        process.kill(pid, signal);
+    }
+}
 var getInstalledJLinkVersion = function () {
     return new Promise(function (resolve, reject) {
-        var jlinkExeCmd = (0, child_process_1.spawn)(getJLinkExePath(), ['-NoGUI', '1'], {
+        var jlinkExeCmd = (0, child_process_1.spawn)(getJLinkExePath(), ['-NoGUI', '1', '-USB', '0'], {
             shell: true,
         });
+        var output = '';
         var timeout = setTimeout(function () {
-            var pid = jlinkExeCmd === null || jlinkExeCmd === void 0 ? void 0 : jlinkExeCmd.pid;
-            if (pid) {
-                if (process.platform === 'win32') {
-                    (0, child_process_1.spawn)('taskkill', ['/pid', "".concat(pid), '/f', '/t']);
-                }
-                else {
-                    process.kill(pid);
-                }
-            }
-            reject('Failed to read Jlink Version');
+            killProcess(jlinkExeCmd.pid);
+            reject(new Error("Timeout while waiting for J-Link version. Output: ".concat(output)));
         }, 5000);
+        var versionRegExp = /^SEGGER J-Link Commander V([0-9a-z.]+) .*$/m;
         jlinkExeCmd.stdout.on('data', function (data) {
-            var versionRegExp = /DLL version (V\d+\.\d+\w*),.*/;
-            var versionMatch = data.toString().match(versionRegExp);
-            if (versionMatch === null || versionMatch === void 0 ? void 0 : versionMatch[1]) {
-                jlinkExeCmd.stdin.write(' exit\n');
-                resolve(versionMatch[1].toLowerCase());
-            }
-            else if (data.toString().includes('Connecting to')) {
-                jlinkExeCmd.stdin.write(' exit\n');
-                reject('Failed to read Jlink Version');
+            output += data.toString();
+            var match = output.match(versionRegExp);
+            if (match === null || match === void 0 ? void 0 : match[1]) {
+                clearTimeout(timeout);
+                killProcess(jlinkExeCmd.pid);
+                resolve(match[1]);
             }
         });
-        jlinkExeCmd.stderr.on('data', function () {
-            reject('Failed to read Jlink Version');
-        });
-        jlinkExeCmd.on('close', function () {
-            clearTimeout(timeout);
-        });
     });
 };
-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, response, hasContentLength, contentLength, reader, chunks, receivedLength, _c, done, value, chunksAll, position;
-    var _d, _e;
-    var jlinkUrls = _b.jlinkUrls;
-    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)(destinationFilePath || path_1.default.join(os_1.default.tmpdir(), path_1.default.basename(url)), Buffer.from(chunksAll))];
-            case 5: return [2 /*return*/, _f.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;
@@ -235,7 +258,11 @@ 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,6 +1,6 @@
 {
     "name": "@nordicsemiconductor/nrf-jlink-js",
-    "version": "0.0.9",
+    "version": "0.0.11",
     "main": "dist",
     "types": "dist",
     "files": [