crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Fixed bug with GET_QDN_RESOURCE_URL action.

Browse Source
This commit is contained in:
CalDescent 2023-04-11 19:03:56 +01:00
parent 7f53983d77
commit e2a2a1f956
1 changed files with 23 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/resources/q-apps/q-apps.js
View File

@ -21,7 +21,7 @@ function httpGetAsyncWithEvent(event, url) {
}) })
.catch((error) => { .catch((error) => {
let res = new Object(); let res = {};
res.error = error; res.error = error;
handleResponse(JSON.stringify(res), responseText); handleResponse(JSON.stringify(res), responseText);
}) })
@ -160,30 +160,27 @@ window.addEventListener("message", (event) => {
console.log("Core received event: " + JSON.stringify(event.data)); console.log("Core received event: " + JSON.stringify(event.data));
let url; let url;
let response;
let data = event.data; let data = event.data;
switch (data.action) { switch (data.action) {
case "GET_ACCOUNT_DATA": case "GET_ACCOUNT_DATA":
response = httpGetAsyncWithEvent(event, "/addresses/" + data.address); return httpGetAsyncWithEvent(event, "/addresses/" + data.address);
break;
case "GET_ACCOUNT_NAMES": case "GET_ACCOUNT_NAMES":
response = httpGetAsyncWithEvent(event, "/names/address/" + data.address); return httpGetAsyncWithEvent(event, "/names/address/" + data.address);
break;
case "GET_NAME_DATA": case "GET_NAME_DATA":
response = httpGetAsyncWithEvent(event, "/names/" + data.name); return httpGetAsyncWithEvent(event, "/names/" + data.name);
break;
case "GET_QDN_RESOURCE_URL": case "GET_QDN_RESOURCE_URL":
response = buildResourceUrl(data.service, data.name, data.identifier, data.path, false); const response = buildResourceUrl(data.service, data.name, data.identifier, data.path, false);
break; handleResponse(event, response);
return;
case "LINK_TO_QDN_RESOURCE": case "LINK_TO_QDN_RESOURCE":
if (data.service == null) data.service = "WEBSITE"; // Default to WEBSITE if (data.service == null) data.service = "WEBSITE"; // Default to WEBSITE
window.location = buildResourceUrl(data.service, data.name, data.identifier, data.path, true); window.location = buildResourceUrl(data.service, data.name, data.identifier, data.path, true);
break; return;
case "LIST_QDN_RESOURCES": case "LIST_QDN_RESOURCES":
url = "/arbitrary/resources?"; url = "/arbitrary/resources?";
@ -196,8 +193,7 @@ window.addEventListener("message", (event) => {
if (data.limit != null) url = url.concat("&limit=" + data.limit); if (data.limit != null) url = url.concat("&limit=" + data.limit);
if (data.offset != null) url = url.concat("&offset=" + data.offset); if (data.offset != null) url = url.concat("&offset=" + data.offset);
if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString()); if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString());
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "SEARCH_QDN_RESOURCES": case "SEARCH_QDN_RESOURCES":
url = "/arbitrary/resources/search?"; url = "/arbitrary/resources/search?";
@ -212,8 +208,7 @@ window.addEventListener("message", (event) => {
if (data.limit != null) url = url.concat("&limit=" + data.limit); if (data.limit != null) url = url.concat("&limit=" + data.limit);
if (data.offset != null) url = url.concat("&offset=" + data.offset); if (data.offset != null) url = url.concat("&offset=" + data.offset);
if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString()); if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString());
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "FETCH_QDN_RESOURCE": case "FETCH_QDN_RESOURCE":
url = "/arbitrary/" + data.service + "/" + data.name; url = "/arbitrary/" + data.service + "/" + data.name;
@ -222,20 +217,17 @@ window.addEventListener("message", (event) => {
if (data.filepath != null) url = url.concat("&filepath=" + data.filepath); if (data.filepath != null) url = url.concat("&filepath=" + data.filepath);
if (data.rebuild != null) url = url.concat("&rebuild=" + new Boolean(data.rebuild).toString()) if (data.rebuild != null) url = url.concat("&rebuild=" + new Boolean(data.rebuild).toString())
if (data.encoding != null) url = url.concat("&encoding=" + data.encoding); if (data.encoding != null) url = url.concat("&encoding=" + data.encoding);
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "GET_QDN_RESOURCE_STATUS": case "GET_QDN_RESOURCE_STATUS":
url = "/arbitrary/resource/status/" + data.service + "/" + data.name; url = "/arbitrary/resource/status/" + data.service + "/" + data.name;
if (data.identifier != null) url = url.concat("/" + data.identifier); if (data.identifier != null) url = url.concat("/" + data.identifier);
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "GET_QDN_RESOURCE_PROPERTIES": case "GET_QDN_RESOURCE_PROPERTIES":
let identifier = (data.identifier != null) ? data.identifier : "default"; let identifier = (data.identifier != null) ? data.identifier : "default";
url = "/arbitrary/resource/properties/" + data.service + "/" + data.name + "/" + identifier; url = "/arbitrary/resource/properties/" + data.service + "/" + data.name + "/" + identifier;
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "SEARCH_CHAT_MESSAGES": case "SEARCH_CHAT_MESSAGES":
url = "/chat/messages?"; url = "/chat/messages?";
@ -249,32 +241,27 @@ window.addEventListener("message", (event) => {
if (data.limit != null) url = url.concat("&limit=" + data.limit); if (data.limit != null) url = url.concat("&limit=" + data.limit);
if (data.offset != null) url = url.concat("&offset=" + data.offset); if (data.offset != null) url = url.concat("&offset=" + data.offset);
if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString()); if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString());
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "LIST_GROUPS": case "LIST_GROUPS":
url = "/groups?"; url = "/groups?";
if (data.limit != null) url = url.concat("&limit=" + data.limit); if (data.limit != null) url = url.concat("&limit=" + data.limit);
if (data.offset != null) url = url.concat("&offset=" + data.offset); if (data.offset != null) url = url.concat("&offset=" + data.offset);
if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString()); if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString());
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "GET_BALANCE": case "GET_BALANCE":
url = "/addresses/balance/" + data.address; url = "/addresses/balance/" + data.address;
if (data.assetId != null) url = url.concat("&assetId=" + data.assetId); if (data.assetId != null) url = url.concat("&assetId=" + data.assetId);
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "GET_AT": case "GET_AT":
url = "/at" + data.atAddress; url = "/at" + data.atAddress;
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "GET_AT_DATA": case "GET_AT_DATA":
url = "/at/" + data.atAddress + "/data"; url = "/at/" + data.atAddress + "/data";
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "LIST_ATS": case "LIST_ATS":
url = "/at/byfunction/" + data.codeHash58 + "?"; url = "/at/byfunction/" + data.codeHash58 + "?";
@ -282,8 +269,7 @@ window.addEventListener("message", (event) => {
if (data.limit != null) url = url.concat("&limit=" + data.limit); if (data.limit != null) url = url.concat("&limit=" + data.limit);
if (data.offset != null) url = url.concat("&offset=" + data.offset); if (data.offset != null) url = url.concat("&offset=" + data.offset);
if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString()); if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString());
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "FETCH_BLOCK": case "FETCH_BLOCK":
if (data.signature != null) { if (data.signature != null) {
@ -293,16 +279,14 @@ window.addEventListener("message", (event) => {
} }
url = url.concat("?"); url = url.concat("?");
if (data.includeOnlineSignatures != null) url = url.concat("&includeOnlineSignatures=" + data.includeOnlineSignatures); if (data.includeOnlineSignatures != null) url = url.concat("&includeOnlineSignatures=" + data.includeOnlineSignatures);
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "FETCH_BLOCK_RANGE": case "FETCH_BLOCK_RANGE":
url = "/blocks/range/" + data.height + "?"; url = "/blocks/range/" + data.height + "?";
if (data.count != null) url = url.concat("&count=" + data.count); if (data.count != null) url = url.concat("&count=" + data.count);
if (data.reverse != null) url = url.concat("&reverse=" + data.reverse); if (data.reverse != null) url = url.concat("&reverse=" + data.reverse);
if (data.includeOnlineSignatures != null) url = url.concat("&includeOnlineSignatures=" + data.includeOnlineSignatures); if (data.includeOnlineSignatures != null) url = url.concat("&includeOnlineSignatures=" + data.includeOnlineSignatures);
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "SEARCH_TRANSACTIONS": case "SEARCH_TRANSACTIONS":
url = "/transactions/search?"; url = "/transactions/search?";
@ -315,15 +299,13 @@ window.addEventListener("message", (event) => {
if (data.limit != null) url = url.concat("&limit=" + data.limit); if (data.limit != null) url = url.concat("&limit=" + data.limit);
if (data.offset != null) url = url.concat("&offset=" + data.offset); if (data.offset != null) url = url.concat("&offset=" + data.offset);
if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString()); if (data.reverse != null) url = url.concat("&reverse=" + new Boolean(data.reverse).toString());
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
case "GET_PRICE": case "GET_PRICE":
url = "/crosschain/price/" + data.blockchain + "?"; url = "/crosschain/price/" + data.blockchain + "?";
if (data.maxtrades != null) url = url.concat("&maxtrades=" + data.maxtrades); if (data.maxtrades != null) url = url.concat("&maxtrades=" + data.maxtrades);
if (data.inverse != null) url = url.concat("&inverse=" + data.inverse); if (data.inverse != null) url = url.concat("&inverse=" + data.inverse);
response = httpGetAsyncWithEvent(event, url); return httpGetAsyncWithEvent(event, url);
break;
default: default:
// Pass to parent (UI), in case they can fulfil this request // Pass to parent (UI), in case they can fulfil this request