@klauswuestefeld/jux-web 2024.2.6-2 → 2024.2.6-3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/api-client.d.ts +1 -1
  2. package/dist/jux-web.js +14 -8
  3. package/dist/main.esm.js +14 -8
  4. package/dist/main.js +14 -8
  5. package/package.json +1 -1
package/dist/api-client.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export declare const setBackendUrl: (backendUrl: string) => void;
2
2
  export declare const handleJuxEvents: (ev: Event) => void;
3
- export declare const backendRequest: (requestType: string, url: string, postContent: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
3
+ export declare const backendRequest: (requestType: string, urlString: string, params: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
4
4
  export declare const backendPost: (endpoint: string, postContent: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
5
5
  export declare const backendGet: (endpoint: string, params: any, onJsonResponse: (response: any) => any, onHelpMessage: (message: string) => any) => void;
6
6
  export declare const requestMagicLink: (data: any, onJsonResponse: (response: any) => any) => void;
package/dist/jux-web.js CHANGED
@@ -196,15 +196,21 @@ var juxWeb = (function (exports) {
196
196
  const backendHelpMessage = (req) => {
197
197
  return req.response && req.response.error || req.response || req;
198
198
  };
199
- const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMessage) => {
200
- if (url.includes(getBackendUrl())) {
201
- url = url.replace(getBackendUrl(), getBackendUrlToTry());
199
+ const backendRequest = (requestType, urlString, params, onJsonResponse, onHelpMessage) => {
200
+ if (urlString.includes(getBackendUrl())) {
201
+ urlString = urlString.replace(getBackendUrl(), getBackendUrlToTry());
202
202
  }
203
- else if (url.includes(getSecondaryBackendUrl())) {
204
- url = url.replace(getSecondaryBackendUrl(), getBackendUrlToTry());
203
+ else if (urlString.includes(getSecondaryBackendUrl())) {
204
+ urlString = urlString.replace(getSecondaryBackendUrl(), getBackendUrlToTry());
205
205
  }
206
206
  clearInterval(timeout);
207
207
  const req = new XMLHttpRequest();
208
+ const url = new URL(urlString);
209
+ if (requestType === 'GET') {
210
+ if (!params)
211
+ return;
212
+ Object.keys(params).forEach(k => url.searchParams.set(k, params[k]));
213
+ }
208
214
  req.open(requestType, url, true);
209
215
  // @ts-ignore
210
216
  const backendToken = window.store.backendToken;
@@ -233,10 +239,10 @@ var juxWeb = (function (exports) {
233
239
  const backupBackendUrl = getBackendUrlToTry() === getBackendUrl()
234
240
  ? getSecondaryBackendUrl()
235
241
  : getBackendUrl();
236
- url = url.replace(getBackendUrlToTry(), backupBackendUrl);
242
+ urlString = urlString.replace(getBackendUrlToTry(), backupBackendUrl);
237
243
  getBackendUrlToTry = () => backupBackendUrl;
238
244
  timeout = setTimeout(() => {
239
- backendRequest(requestType, url, postContent, onJsonResponse, onHelpMessage);
245
+ backendRequest(requestType, urlString, params, onJsonResponse, onHelpMessage);
240
246
  }, 2000);
241
247
  }
242
248
  else {
@@ -257,7 +263,7 @@ var juxWeb = (function (exports) {
257
263
  }
258
264
  };
259
265
  req.timeout = 25000;
260
- req.send(postContent);
266
+ req.send(params);
261
267
  };
262
268
  const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
263
269
  backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
package/dist/main.esm.js CHANGED
@@ -195,15 +195,21 @@ const removeOverlay = () => {
195
195
  const backendHelpMessage = (req) => {
196
196
  return req.response && req.response.error || req.response || req;
197
197
  };
198
- const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMessage) => {
199
- if (url.includes(getBackendUrl())) {
200
- url = url.replace(getBackendUrl(), getBackendUrlToTry());
198
+ const backendRequest = (requestType, urlString, params, onJsonResponse, onHelpMessage) => {
199
+ if (urlString.includes(getBackendUrl())) {
200
+ urlString = urlString.replace(getBackendUrl(), getBackendUrlToTry());
201
201
  }
202
- else if (url.includes(getSecondaryBackendUrl())) {
203
- url = url.replace(getSecondaryBackendUrl(), getBackendUrlToTry());
202
+ else if (urlString.includes(getSecondaryBackendUrl())) {
203
+ urlString = urlString.replace(getSecondaryBackendUrl(), getBackendUrlToTry());
204
204
  }
205
205
  clearInterval(timeout);
206
206
  const req = new XMLHttpRequest();
207
+ const url = new URL(urlString);
208
+ if (requestType === 'GET') {
209
+ if (!params)
210
+ return;
211
+ Object.keys(params).forEach(k => url.searchParams.set(k, params[k]));
212
+ }
207
213
  req.open(requestType, url, true);
208
214
  // @ts-ignore
209
215
  const backendToken = window.store.backendToken;
@@ -232,10 +238,10 @@ const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMes
232
238
  const backupBackendUrl = getBackendUrlToTry() === getBackendUrl()
233
239
  ? getSecondaryBackendUrl()
234
240
  : getBackendUrl();
235
- url = url.replace(getBackendUrlToTry(), backupBackendUrl);
241
+ urlString = urlString.replace(getBackendUrlToTry(), backupBackendUrl);
236
242
  getBackendUrlToTry = () => backupBackendUrl;
237
243
  timeout = setTimeout(() => {
238
- backendRequest(requestType, url, postContent, onJsonResponse, onHelpMessage);
244
+ backendRequest(requestType, urlString, params, onJsonResponse, onHelpMessage);
239
245
  }, 2000);
240
246
  }
241
247
  else {
@@ -256,7 +262,7 @@ const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMes
256
262
  }
257
263
  };
258
264
  req.timeout = 25000;
259
- req.send(postContent);
265
+ req.send(params);
260
266
  };
261
267
  const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
262
268
  backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
package/dist/main.js CHANGED
@@ -219,15 +219,21 @@ const removeOverlay = () => {
219
219
  const backendHelpMessage = (req) => {
220
220
  return req.response && req.response.error || req.response || req;
221
221
  };
222
- const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMessage) => {
223
- if (url.includes(getBackendUrl())) {
224
- url = url.replace(getBackendUrl(), getBackendUrlToTry());
222
+ const backendRequest = (requestType, urlString, params, onJsonResponse, onHelpMessage) => {
223
+ if (urlString.includes(getBackendUrl())) {
224
+ urlString = urlString.replace(getBackendUrl(), getBackendUrlToTry());
225
225
  }
226
- else if (url.includes(getSecondaryBackendUrl())) {
227
- url = url.replace(getSecondaryBackendUrl(), getBackendUrlToTry());
226
+ else if (urlString.includes(getSecondaryBackendUrl())) {
227
+ urlString = urlString.replace(getSecondaryBackendUrl(), getBackendUrlToTry());
228
228
  }
229
229
  clearInterval(timeout);
230
230
  const req = new XMLHttpRequest();
231
+ const url = new URL(urlString);
232
+ if (requestType === 'GET') {
233
+ if (!params)
234
+ return;
235
+ Object.keys(params).forEach(k => url.searchParams.set(k, params[k]));
236
+ }
231
237
  req.open(requestType, url, true);
232
238
  // @ts-ignore
233
239
  const backendToken = window.store.backendToken;
@@ -256,10 +262,10 @@ const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMes
256
262
  const backupBackendUrl = getBackendUrlToTry() === getBackendUrl()
257
263
  ? getSecondaryBackendUrl()
258
264
  : getBackendUrl();
259
- url = url.replace(getBackendUrlToTry(), backupBackendUrl);
265
+ urlString = urlString.replace(getBackendUrlToTry(), backupBackendUrl);
260
266
  getBackendUrlToTry = () => backupBackendUrl;
261
267
  timeout = setTimeout(() => {
262
- backendRequest(requestType, url, postContent, onJsonResponse, onHelpMessage);
268
+ backendRequest(requestType, urlString, params, onJsonResponse, onHelpMessage);
263
269
  }, 2000);
264
270
  }
265
271
  else {
@@ -280,7 +286,7 @@ const backendRequest = (requestType, url, postContent, onJsonResponse, onHelpMes
280
286
  }
281
287
  };
282
288
  req.timeout = 25000;
283
- req.send(postContent);
289
+ req.send(params);
284
290
  };
285
291
  const backendPost = (endpoint, postContent, onJsonResponse, onHelpMessage) => {
286
292
  backendRequest('POST', getApiUrl() + endpoint, postContent, onJsonResponse, onHelpMessage);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@klauswuestefeld/jux-web",
3
- "version": "2024.2.6-2",
3
+ "version": "2024.2.6-3",
4
4
  "author": "Jux.House",
5
5
  "license": "Copyrighted",
6
6
  "description": "",