@akc42/app-utils 3.1.5 → 3.2.2

package/README.md

@@ -134,11 +134,9 @@ The purpose of this module is to provide a debugable capability which can be
   config-promise) is set to a string which is a comma separated list of topics
   and that list has the topic for this debug call in it.
 
-  **Note**: the debug function checks with the server (via a debugconf api call)
-  to see if the topic is enabled.  This is then cached for a minute, so any
-  calls around the same time will use the reply.  This allows the server to
-  change what topics are available and for the client side to quickly find if it
-  should now start sending message
+  **Note**: the debug function checks with the sessionStorage.getItem('debug) (via an await for the Config Promise)
+  to see if the topic is enabled (assumes the result is a ':' separated string of topics).  This allows the server to
+  change what topics are available via the config api call.
 
 # dom-host
 

package/debug.js

@@ -53,10 +53,11 @@
   would dynamically pick up the changes
 
 */
+import config from './config-promise.js';
 
 const topicMap = new Map();
 
-import api from './post-api.js';
+
 
 function Debug (t) {
   if (typeof t !== 'string' || t.length === 0 || !/^[a-zA-Z]+$/.test(t)) {
@@ -64,7 +65,6 @@ function Debug (t) {
     throw new Error('Invalid Debug Topic');
   }
   const tl = t.toLowerCase(); 
-
   if (topicMap.has(tl) ) {
     const topic = topicMap.get(tl);
     return topic.debug;
@@ -73,21 +73,25 @@ function Debug (t) {
   const topicHandler = {
     topic: tl,
     timestamp: new Date().getTime(),
-    expires: 0, //when our knowledge of enabled expires
-    enabled: false, //is this topic enabled
+    defined: false, //has the config been defined yet
     debug: async function (...args) {
       //do time calc before potential delay to see if we are enabled
       const now = new Date().getTime();
       const gap = now - this.timestamp;
       this.timestamp = now;
-      if (now > this.expires) {
-        //do this first so following requests don't try to find out again whilst I am checking, wasting calls
-        this.expires = now + 60000; 
-        //expired so find out if topic is enabled
-        this.enabled = await api(`debugconf/${this.topic}`);
-
+      if (!this.defined) {
+        //just await the config the first time through.  Thereafter we can assume its done
+        await config(); 
+        this.defined = true;
+      }
+      let enabled = false;
+      const debugConf = sessionStorage.getItem('debug');
+      if (debugConf) {
+        const topics = debugConf.split(':');
+        if (topics.includes(this.topic)) enabled = true;
       }
-      if (this.enabled) {
+    
+      if (enabled) {
         const message = args.reduce((cum, arg) => {
           return `${cum} ${arg}`.trim();
         }, '');

package/package.json

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

package/post-api.js

@@ -47,8 +47,10 @@ export default async function api(url, params, blob, signal) {
       return {};
     }
   } catch (err) {
-    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---').substr(-6, 3), 10) });
+    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) });
+    }
   }
 }