fix: proper response handling

Rooyca · Sep 14, 2024 · 53326eb · 53326eb
1 parent 69a6c7d
commit 53326eb
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 29 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "api-request",
 	"name": "APIRequest",
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"minAppVersion": "0.15.0",
 	"description": "Fetch data from APIs or other sources. Responses in JSON, MD or HTML directly in your notes.",
 	"author": "rooyca",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "api-request",
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"description": "Fetch data from APIs or other sources. Responses in JSON, MD or HTML directly in your notes.",
 	"main": "main.js",
 	"scripts": {

diff --git a/src/main.ts b/src/main.ts
@@ -218,24 +218,8 @@ export default class MainAPIR extends Plugin {
 
 						if (!response_disabled) {
 							responseData  = await requestUrl({ url: URL, method, headers, body });
-							try {
-								responseData = responseData.json;
-							} catch(e) {
-								console.error(e)
-							}
 						} else {
-							responseData = JSON.parse(response_disabled);
-						}
-
-						// Save to a file
-						if (saveTo) {
-							try {
-								await this.app.vault.create(saveTo, responseData.text);
-								new Notice("Saved to: " + saveTo);
-							} catch (e) {
-								console.error(e.message);
-								new Notice("Error: " + e.message);
-							}
+							responseData = { json: JSON.parse(response_disabled) };
 						}
 
 						try {
@@ -245,7 +229,6 @@ export default class MainAPIR extends Plugin {
 									el.innerHTML = parser.parse(sanitizer.SanitizeHtml(responseData.text));
 								} catch (e) {
 									new Notice("Error: " + e.message);
-									console.log("Here we are!")
 									el.innerHTML = "<pre>" + sanitizer.SanitizeHtml(responseData.text) + "</pre>";
 								}
 
@@ -257,13 +240,24 @@ export default class MainAPIR extends Plugin {
 							console.error(e.message);
 						}
 
+						// Save to a file
+						if (saveTo) {
+							try {
+								await this.app.vault.create(saveTo, responseData.text);
+								new Notice("Saved to: " + saveTo);
+							} catch (e) {
+								console.error(e.message);
+								new Notice("Error: " + e.message);
+							}
+						}
+
 						if (notifyIf) {
 							const jsonPath = notifyIf[0];
 							const symbol = notifyIf[1];
 							const value = notifyIf[2]
 							const int_value = parseInt(value);
 
-							const jsonPathValue = jsonPath.split(".").reduce((acc, cv) => acc[cv], responseData);
+							const jsonPathValue = jsonPath.split(".").reduce((acc, cv) => acc[cv], responseData.json);
 							const lastValue = jsonPath.split(".").pop();
 							if (symbol === ">" && jsonPathValue > int_value) {
 								new Notice("APIR: " + lastValue + " is greater than " + int_value);
@@ -283,7 +277,7 @@ export default class MainAPIR extends Plugin {
 								el.createEl("strong", { text: "Error: Properties are not allowed without SHOW" });
 								return;
 							}
-							el.innerHTML = "<pre>" + JSON.stringify(responseData, null, 2) + "</pre>";
+							el.innerHTML = "<pre>" + JSON.stringify(responseData.json, null, 2) + "</pre>";
 							if (reqID) saveToID(reqID, el.innerText);
 							addBtnCopy(el, el.innerText);
 						} else {
@@ -313,8 +307,8 @@ export default class MainAPIR extends Plugin {
 								const numberBracesRegex = show.match(num_braces_regx);
 
 								if (!numberBracesRegex) {
-									if (Array.isArray(responseData)) {
-										for (let i = 0; i < responseData.length; i++) {
+									if (Array.isArray(responseData.json)) {
+										for (let i = 0; i < responseData.json.length; i++) {
 											temp_show += show.replace(in_braces_regx, i.toString()) + ", ";
 										}
 										show = temp_show;
@@ -329,7 +323,6 @@ export default class MainAPIR extends Plugin {
 													if (typeof current === "object") {
 														current = JSON.stringify(current, null, 2);
 													}
-													console.log(typeof current)
 													if (typeof current === 'string') current = encodeURIComponent(current);
 													result += current + ", ";
 													return;
@@ -384,7 +377,7 @@ export default class MainAPIR extends Plugin {
 											return result;
 										};
 
-										temp_show = processNestedObject(responseData, parts);
+										temp_show = processNestedObject(responseData.json, parts);
 										show = temp_show;
 
 
@@ -418,8 +411,8 @@ export default class MainAPIR extends Plugin {
 
 									if (trimmedKey.includes("->")) {
 										val = nestedValue(responseData, trimmedKey);
-									} else if (responseData && responseData[trimmedKey]) {
-										val = responseData[trimmedKey];
+									} else if (responseData.json && responseData.json[trimmedKey]) {
+										val = responseData.json[trimmedKey];
 									}
 
 									let propertyName = propertiesArray[index].trim();
@@ -450,7 +443,7 @@ export default class MainAPIR extends Plugin {
 								const trimmedKey = key.trim();
 								return trimmedKey.includes("->")
 									? nestedValue(responseData, trimmedKey)
-									: JSON.stringify(responseData[trimmedKey]) || trimmedKey;
+									: JSON.stringify(responseData.json[trimmedKey]) || trimmedKey;
 							};
 
 							const values = show.split(",")