@nordicsemiconductor/nrf-jlink-js 0.0.10 → 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.js

@@ -53,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';
@@ -74,40 +84,37 @@ 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());
+            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]);
             }
-            else if (data.toString().includes('Connecting to')) {
-                jlinkExeCmd.stdin.write(' exit\n');
-                reject('Failed to read Jlink Version');
-            }
-        });
-        jlinkExeCmd.stderr.on('data', function () {
-            reject('Failed to read Jlink Version');
-        });
-        jlinkExeCmd.on('close', function () {
-            clearTimeout(timeout);
         });
     });
 };
@@ -251,7 +258,11 @@ var getVersionToInstall = function (fallbackVersion) { return __awaiter(void 0,
     });
 }); };
 exports.getVersionToInstall = getVersionToInstall;
-var downloadAndSaveJLink = function (destinationDir, destinationFileName, onUpdate) { return (0, common_1.fetchIndex)().then(function (v) { return downloadJLink(v, onUpdate, destinationDir, destinationFileName); }); };
+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.10",
+    "version": "0.0.11",
     "main": "dist",
     "types": "dist",
     "files": [