@nordicsemiconductor/nrf-jlink-js 0.0.0-alpha2 → 0.0.0-alpha4

package/dist/jlink.js

@@ -69,22 +69,36 @@ var getJLinkExePath = function () {
 var getInstalledJLinkVersion = function () {
     return new Promise(function (resolve, reject) {
         var jlinkExeCmd = (0, child_process_1.spawn)(getJLinkExePath(), ["-NoGUI", "1"], { shell: true });
+        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');
+        }, 5000);
         jlinkExeCmd.stdout.on("data", function (data) {
-            var output = data.toString();
             var versionRegExp = /DLL version (V\d+\.\d+\w*),.*/;
-            var versionMatch = output.match(versionRegExp);
-            if (versionMatch) {
-                jlinkExeCmd.kill(9);
-                // resolve(versionMatch[1])
+            var versionMatch = data.toString().match(versionRegExp);
+            if (versionMatch === null || versionMatch === void 0 ? void 0 : versionMatch[1]) {
+                jlinkExeCmd.stdin.write(' exit\n');
+                resolve(versionMatch[1]);
             }
             else if (data.toString().includes("Connecting to")) {
-                jlinkExeCmd.kill(9);
-                return;
+                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);
+        });
     });
 };
 var downloadJLink = function (_a, onUpdate_1) { return __awaiter(void 0, [_a, onUpdate_1], void 0, function (_b, onUpdate) {
@@ -108,8 +122,8 @@ var downloadJLink = function (_a, onUpdate_1) { return __awaiter(void 0, [_a, on
                         responseType: "stream",
                         onDownloadProgress: function (_a) {
                             var loaded = _a.loaded, total = _a.total;
-                            return onUpdate && loaded && total &&
-                                onUpdate({ step: "download", percentage: Number(((loaded / total) * 100).toFixed(2)) });
+                            return loaded && total &&
+                                (onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate({ step: "download", percentage: Number(((loaded / total) * 100).toFixed(2)) }));
                         },
                     })];
             case 1:
@@ -145,7 +159,7 @@ var installJLink = function (installerPath, onUpdate) {
         default:
             throw new Error("Invalid platform");
     }
-    onUpdate && onUpdate({ step: "install", percentage: 0 });
+    onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate({ step: "install", percentage: 0 });
     return new Promise(function (resolve, reject) {
         (0, child_process_1.execFile)(command, args, function (error, stdout, stderr) {
             if (error) {
@@ -154,8 +168,8 @@ var installJLink = function (installerPath, onUpdate) {
             if (stderr) {
                 reject(stderr);
             }
-            if (stdout && stdout.includes("successful")) {
-                onUpdate && onUpdate({ step: "install", percentage: 100 });
+            if (stdout.includes("successful")) {
+                onUpdate === null || onUpdate === void 0 ? void 0 : onUpdate({ step: "install", percentage: 100 });
                 return resolve();
             }
         });
@@ -173,37 +187,24 @@ var isValidVersion = function (installedVersion, expectedVersion) {
     return semver_1.default.gte(convertToSemverVersion(installedVersion), convertToSemverVersion(expectedVersion));
 };
 var getVersionToInstall = function (fallbackVersion) { return __awaiter(void 0, void 0, void 0, function () {
-    var state, _a, e_1, _b;
+    var versionToBeInstalled, installedVersion, installed, outdated;
+    var _a, _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
-            case 0:
-                state = {
-                    outdated: true,
-                    installed: false,
-                    versionToBeInstalled: fallbackVersion,
-                };
-                _c.label = 1;
+            case 0: return [4 /*yield*/, (0, common_1.fetchIndex)().catch(function () { return undefined; })];
             case 1:
-                _c.trys.push([1, 3, , 4]);
-                state.installed = true;
-                _a = state;
-                return [4 /*yield*/, getInstalledJLinkVersion()];
+                versionToBeInstalled = (_b = (_a = (_c.sent())) === null || _a === void 0 ? void 0 : _a.version) !== null && _b !== void 0 ? _b : fallbackVersion;
+                return [4 /*yield*/, getInstalledJLinkVersion().catch(function () { return undefined; })];
             case 2:
-                _a.installedVersion = _c.sent();
-                return [3 /*break*/, 4];
-            case 3:
-                e_1 = _c.sent();
-                return [3 /*break*/, 4];
-            case 4:
-                _b = state;
-                return [4 /*yield*/, (0, common_1.fetchIndex)()];
-            case 5:
-                _b.versionToBeInstalled = (_c.sent()).version;
-                if (!state.installed || !state.installedVersion) {
-                    return [2 /*return*/, state];
-                }
-                state.outdated = !isValidVersion(state.installedVersion, state.versionToBeInstalled);
-                return [2 /*return*/, state];
+                installedVersion = _c.sent();
+                installed = !!installedVersion;
+                outdated = !installed || !versionToBeInstalled || isValidVersion(installedVersion, versionToBeInstalled);
+                return [2 /*return*/, {
+                        outdated: outdated,
+                        installedVersion: installedVersion,
+                        installed: installed,
+                        versionToBeInstalled: versionToBeInstalled,
+                    }];
         }
     });
 }); };

package/package.json

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