@nordicsemiconductor/nrf-jlink-js 0.0.11 → 0.9.1

package/dist/jlink.js

@@ -55,6 +55,7 @@ var path_1 = __importDefault(require("path"));
 var semver_1 = __importDefault(require("semver"));
 var fs_1 = require("fs");
 var common_1 = require("./common");
+var util_1 = require("util");
 function winRegQuery(key) {
     var _a;
     if (process.platform !== 'win32') {
@@ -67,16 +68,18 @@ function winRegQuery(key) {
     return (0, child_process_1.execSync)("".concat(reg, " query ").concat(key)).toString().trim();
 }
 var getJLinkExePath = function () {
+    var _a;
     switch (os_1.default.platform()) {
         case 'win32':
-            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');
+            var cwd = winRegQuery('HKEY_CURRENT_USER\\Software\\SEGGER\\J-Link /v InstallPath');
+            if (!cwd) {
+                cwd = winRegQuery('HKEY_LOCAL_MACHINE\\Software\\SEGGER\\J-Link /v InstallPath');
             }
-            if (!jlinkDir) {
+            cwd = ((_a = /InstallPath\s+\w+\s+(.*)/.exec(cwd)) !== null && _a !== void 0 ? _a : [])[1];
+            if (!cwd) {
                 throw new Error('JLink not installed');
             }
-            return path_1.default.resolve(jlinkDir, 'JLink.exe');
+            return "\"".concat(path_1.default.join(cwd, 'JLink.exe'), "\"");
         case 'linux':
         case 'darwin':
             return 'JLinkExe';
@@ -84,40 +87,23 @@ 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', '-USB', '0'], {
-            shell: true,
-        });
-        var output = '';
-        var timeout = setTimeout(function () {
-            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) {
-            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]);
-            }
-        });
+var getInstalledJLinkVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
+    var output, versionRegExp, match;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4 /*yield*/, (0, util_1.promisify)(child_process_1.exec)("".concat(getJLinkExePath(), " -CommandFile foo")).catch(function (e) { return e; })];
+            case 1:
+                output = _b.sent();
+                versionRegExp = /^SEGGER J-Link Commander V([0-9a-z.]+) .*$/m;
+                match = (_a = output.stdout.match(versionRegExp)) === null || _a === void 0 ? void 0 : _a[1];
+                if (!match) {
+                    throw new Error("Couldn't get jlink version.");
+                }
+                return [2 /*return*/, "v".concat(match)];
+        }
     });
-};
+}); };
 var downloadJLink = function (_a, onUpdate_1) {
     var args_1 = [];
     for (var _i = 2; _i < arguments.length; _i++) {
@@ -202,7 +188,7 @@ var installJLink = function (installerPath, onUpdate) {
             args = ['sh', '-c', "dpkg -i \"".concat(installerPath, "\"")];
             break;
         case 'win32':
-            command = "\"".concat(installerPath, "\"");
+            command = installerPath;
             break;
         default:
             throw new Error('Invalid platform');

package/package.json

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