@nordicsemiconductor/nrf-jlink-js 0.0.0-alpha1 → 0.0.0-alpha3

package/dist/common.d.ts

@@ -9,7 +9,7 @@ export interface JLinkVariant {
 }
 export interface JLinkIndex {
     version: string;
-    jlinkUrl: JLinkVariant;
+    jlinkUrls: JLinkVariant;
 }
 export declare const fetchIndex: () => Promise<JLinkIndex>;
 export declare const saveToFile: (stream: NodeJS.ReadableStream, destinationFile: string) => Promise<string>;

package/dist/common.js

@@ -56,7 +56,7 @@ var fetchJSON = function (url) { return __awaiter(void 0, void 0, void 0, functi
         }
     });
 }); };
-var indexUrl = "https://files.nordicsemi.com/artifactory/swtools/external/jlink/index.json";
+var indexUrl = "https://files.nordicsemi.com/artifactory/swtools/external/ncd/jlink/index.json";
 var fetchIndex = function () { return __awaiter(void 0, void 0, void 0, function () {
     var res;
     return __generator(this, function (_a) {
@@ -64,8 +64,8 @@ var fetchIndex = function () { return __awaiter(void 0, void 0, void 0, function
             case 0: return [4 /*yield*/, fetchJSON(indexUrl)];
             case 1:
                 res = _a.sent();
-                if (res == null || typeof res !== 'object' || res.version !== undefined || res.jlinkUrl !== undefined) {
-                    throw new Error('`source.json` does not have the expected content.');
+                if (res == null || typeof res !== 'object' || res.version === undefined || res.jlinkUrls === undefined) {
+                    throw new Error('`index.json` does not have the expected content.');
                 }
                 return [2 /*return*/, res];
         }

package/dist/jlink.js

@@ -73,9 +73,9 @@ var getInstalledJLinkVersion = function () {
             var output = data.toString();
             var versionRegExp = /DLL version (V\d+\.\d+\w*),.*/;
             var versionMatch = output.match(versionRegExp);
-            if (versionMatch) {
+            if (versionMatch === null || versionMatch === void 0 ? void 0 : versionMatch[1]) {
                 jlinkExeCmd.kill(9);
-                // resolve(versionMatch[1])
+                resolve(versionMatch[1]);
             }
             else if (data.toString().includes("Connecting to")) {
                 jlinkExeCmd.kill(9);
@@ -88,12 +88,22 @@ var getInstalledJLinkVersion = function () {
     });
 };
 var downloadJLink = function (_a, onUpdate_1) { return __awaiter(void 0, [_a, onUpdate_1], void 0, function (_b, onUpdate) {
-    var url, _c, status, stream, destinationFile;
-    var jlinkUrls = _b.jlinkUrl;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var platform, arch, url, _c, status, stream, destinationFile;
+    var _d;
+    var jlinkUrls = _b.jlinkUrls;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
-                url = "";
+                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) {
@@ -103,16 +113,16 @@ var downloadJLink = function (_a, onUpdate_1) { return __awaiter(void 0, [_a, on
                         },
                     })];
             case 1:
-                _c = _d.sent(), status = _c.status, stream = _c.data;
+                _c = _e.sent(), status = _c.status, stream = _c.data;
                 if (status !== 200) {
                     throw new Error("Unable to download ".concat(jlinkUrls, ". Got status code ").concat(status, "."));
                 }
                 destinationFile = path_1.default.join(os_1.default.tmpdir(), path_1.default.basename(url));
                 return [4 /*yield*/, (0, promises_1.mkdir)(path_1.default.dirname(destinationFile), { recursive: true })];
             case 2:
-                _d.sent();
+                _e.sent();
                 return [4 /*yield*/, (0, common_1.saveToFile)(stream, destinationFile)];
-            case 3: return [2 /*return*/, _d.sent()];
+            case 3: return [2 /*return*/, _e.sent()];
         }
     });
 }); };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nordicsemiconductor/nrf-jlink-js",
-  "version": "0.0.0-alpha1",
+  "version": "0.0.0-alpha3",
   "main": "dist",
   "types": "dist",
   "files": [
@@ -21,7 +21,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/NordicSemiconductor/nrf-jlink-js.git"
+    "url": "git+https://github.com/NordicSemiconductor/nrf-jlink-js.git"
   },
   "author": "Nordic Semiconductor ASA",
   "license": "Proprietary",