github/recorder
1
0
Fork 0
mirror of https://github.com/owntracks/recorder.git synced 2026-02-13 20:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] wrong API URL when called from /index.html https://github.com/owntracks/talk/issues/151

Browse Source
This commit is contained in:
Christoph Krey
2022-12-05 20:38:23 +01:00
parent 423ca2ebc2
commit 4dd7a8481e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docroot/index.html
View File

@@ -50,7 +50,7 @@
const f7d = new Date(Date.now() - 7 * days).toISOString();
const f30d = new Date(Date.now() - 24 * days).toISOString();
const data = await fetchApiData({ endpoint: "last", includeSearchParams: true });
const data = await( fetchApiData({ endpoint: "last", includeSearchParams: true, rootLevel: true }));
for (const d of data) {
if (!d._type) {

10
docroot/utils/network.js
View File

@@ -7,12 +7,13 @@ import { debug } from "./debug.js";
* @param {string} endpoint - The name of the API endpoint.
* @param {boolean} options.useWebsocket - Connect over the websocket protocol instead of standard HTTP.
* @param {boolean} options.includeSearchParams - Copy over any search parameters that are defined on the page URL.
* @param {boolean} options.rootLevel - indicate function is called from rootLevel URL
*
* @returns {URL} - A full URL for the API endpoint.
*/
export function getApiUrl(endpoint, { useWebsocket = false, includeSearchParams = false }){
export function getApiUrl(endpoint, { useWebsocket = false, includeSearchParams = false, rootLevel = false }){
const apiUrl = new URL(`../${ useWebsocket ? "ws" : "api/0" }${endpoint === undefined ? "" : `/${endpoint}`}`, window.location);
const apiUrl = new URL(`${ rootLevel ? "./" : "../" }${ useWebsocket ? "ws" : "api/0" }${endpoint === undefined ? "" : `/${endpoint}`}`, window.location);
if(useWebsocket) apiUrl.protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
@@ -31,13 +32,14 @@ export function getApiUrl(endpoint, { useWebsocket = false, includeSearchParams
* @param {RequestInfo} options.url - A full URL/Request to the API endpoint.
* @param {string} options.endpoint - The name of the API endpoint.
* @param {boolean} options.includeSearchParams - Copy over any search parameters that are defined on the page URL.
* @param {boolean} options.rootLevel - indicate function is called from rootLevel URL
*
* @returns {Promise<object>} - The data returned by the API.
*/
export async function fetchApiData({ url, endpoint, includeSearchParams }){
export async function fetchApiData({ url, endpoint, includeSearchParams, rootLevel }){
if(url === undefined){
url = getApiUrl(endpoint, { includeSearchParams });
url = getApiUrl(endpoint, { includeSearchParams, rootLevel });
}
debug("Connecting to API endpoint:", url);