@akc42/app-utils 3.3.4 → 3.6.0

package/README.md

@@ -86,22 +86,6 @@ debug has been replaced with a version that works differently and is incompatibl
   `this.keys.lastPressed`, and it will return the complete binding object
 
 
-# config-promise
-
-  This module provides two functions:-
-
-  1. This first is the default function which when called returns a promise. 
-  2. a `mockConfig` function which can be used by a test harness to provide the promise returned by the default function
-  
-  If a request is made for the promise and it hasn't yet been created a new promise is made with a fetch get request to `/api/config`
-  to retrieve the configuration data.  If the server is down, this request will continue attempting to get the value once a minute ad
-  infinitum.
-
-  The configuration data is returned to resolve the promise, but local session
-  storage also has one item added to it for each of the first level properties
-  of this data.  If the property is a String, this is stored in the session
-  storage as is, otherwise the value is passed through `JSON.stringify` and that is stored. 
-
 # csv
 
   the modules default export is a function which can be called with a name and optionally a parameters object.  The name is added to `/api/csv/` to make a download request and if they exist the parameters object is turned into a query string.  The response from that uri is downloaded (expected to be a csv file).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akc42/app-utils",
-  "version": "3.3.4",
+  "version": "3.6.0",
   "description": "General Utilities for SPAs",
   "exports": {
     ".": "./*.js"

package/post-api.js

@@ -34,7 +34,7 @@ export default async function api(url, params, blob, signal) {
   let text;
   try {
     const response = await window.fetch(address, options);
-    if (!response.ok) throw new CustomEvent('api-error', {composed: true, bubbles: true , detail:response.status});
+    if (!response.ok) throw new CustomEvent('api-error', {composed: true, bubbles: true , detail:{status:response.status, url:address}});
     performance.mark('fetchdone', {detail: address});
     performance.measure('apicalltime',{start: 'fetchapi', end:'fetchdone', detail: address});
     if (blob) {
@@ -54,7 +54,7 @@ export default async function api(url, params, blob, signal) {
     if (!options.signal || !options.signal.aborted) {
       if (err.type === 'api-error') throw err; //just throw whatever error we had
       //we failed to parse the json - the actual code should be in the text near the end;
-      throw new CustomEvent('api-error', { composed: true, bubbles: true, detail: parseInt((text?? '---502---').slice(-6, -3), 10) });
+      throw new CustomEvent('api-error', { composed: true, bubbles: true, detail: {status:parseInt((text?? '---502---').slice(-6, -3), 10), url:address }});
     }
   }
 }

package/config-promise.js

@@ -1,72 +0,0 @@
-/**
-@licence
-    Copyright (c) 2020 Alan Chandler, all rights reserved
-
-    This file is part of @akc42/app-utils.
-
-    @akc42/app-utils is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    @akc42/app-utils is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with @akc42/app-utils.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-let configPromise;
-
-export function setConfig(promise) {
-  configPromise = promise; //set to undefined to allow config call to request from server again.
-}
-
-async function config() {
-  if (typeof configPromise === 'undefined') {
-    let resolved = false;
-    let resolver;
-    configPromise = new Promise(accept => resolver = accept);
-    let text;
-    let config;
-    while (!resolved) {
-      try {
-        const response = await window.fetch('/api/config', { method: 'get' })
-        if (!response.ok) throw new CustomEvent('api-error', { composed: true, bubbles: true, detail: response.status });
-        text = await response.text();
-        config = JSON.parse(text); 
-        /* 
-          some uses of this put the config in sessionStorage, but that only works if every config value is a string
-          so we check if they are a string, otherwise we stringify them
-        */
-        for (const p in config) {
-          const v = config[p];
-          if (typeof v === 'string') {
-            sessionStorage.setItem(p, v);
-          } else {
-            sessionStorage.setItem(p,JSON.stringify(v));
-          }
-        }
-        resolver(config);
-        resolved = true;
-      } catch (err) {
-        if (err.detail === 502) {
-          //server down so wait a minute and try again;
-          await new Promise(accept => {
-            setTimeout(accept, 60000);
-          });
-        } else {
-          if (err.type === 'api-error') throw err; //just throw whatever error we had
-          //we failed to parse the json - the actual code should be in the text near the end;
-          throw new CustomEvent('api-error', { composed: true, bubbles: true, detail: parseInt(text.substr(-6, 3), 10) });
-        }
-      }
-    }
-  }
-  return configPromise;
-}
-
-
-export default config;