maidr 2.24.1 → 2.25.1

package/dist/maidr.js

@@ -810,6 +810,51 @@ class Constants {
     }
     return styleString;
   }
+  /**
+   * Converts the active chart to a jpg image.
+   * @id {string} - The html ID of the chart to convert.
+   */
+  async ConvertSVGtoJPG(id, model) {
+    let svgElement = document.getElementById(id);
+    return new Promise((resolve, reject) => {
+      var canvas = document.createElement('canvas');
+      var ctx = canvas.getContext('2d');
+
+      var svgData = new XMLSerializer().serializeToString(svgElement);
+      if (!svgData.startsWith('<svg xmlns')) {
+        svgData = `<svg xmlns="http://www.w3.org/2000/svg" ${svgData.slice(4)}`;
+      }
+
+      var svgSize =
+        svgElement.viewBox.baseVal || svgElement.getBoundingClientRect();
+      canvas.width = svgSize.width;
+      canvas.height = svgSize.height;
+
+      var img = new Image();
+      img.onload = function () {
+        ctx.drawImage(img, 0, 0, svgSize.width, svgSize.height);
+        var jpegData = canvas.toDataURL('image/jpeg', 0.9); // 0.9 is the quality parameter
+        if (model == 'openai') {
+          resolve(jpegData);
+        } else if (model == 'gemini' || model == 'claude') {
+          let base64Data = jpegData.split(',')[1];
+          resolve(base64Data);
+          //resolve(jpegData);
+        }
+        URL.revokeObjectURL(url);
+      };
+
+      img.onerror = function () {
+        reject(new Error('Error loading SVG'));
+      };
+
+      var svgBlob = new Blob([svgData], {
+        type: 'image/svg+xml;charset=utf-8',
+      });
+      var url = URL.createObjectURL(svgBlob);
+      img.src = url;
+    });
+  }
 }
 
 /**
@@ -1177,7 +1222,7 @@ class Menu {
           document
             .getElementById('gemini_multi_container')
             .classList.add('hidden');
-          document.getElementById('openai_multi').checked = true;
+          document.getElementById('openai_multi').checked = true; // refactor note: this hidden checkbox stuff is stupid and should be removed. We're sorta replacing with the visible checkboxes.
           document.getElementById('gemini_multi').checked = false;
         } else if (e.target.value == 'gemini') {
           document
@@ -1521,8 +1566,12 @@ class Menu {
     });
 
     constants.LLMPreferences = document.getElementById('LLM_preferences').value;
-    constants.LLMOpenAiMulti = document.getElementById('openai_multi').checked;
-    constants.LLMGeminiMulti = document.getElementById('gemini_multi').checked;
+    constants.LLMOpenAiMulti =
+      document.getElementById('LLM_model_openai').checked;
+    constants.LLMGeminiMulti =
+      document.getElementById('LLM_model_gemini').checked;
+    constants.LLMClaudeMulti =
+      document.getElementById('LLM_model_claude').checked;
     constants.autoInitLLM = document.getElementById('init_llm_on_load').checked;
 
     // aria
@@ -1752,6 +1801,7 @@ class ChatLLM {
     this.firstMulti = true;
     this.firstOpen = true;
     this.shown = false;
+    this.awaitingNumChats = 0;
     this.CreateComponent();
     this.SetEvents();
     if (constants.autoInitLLM) {
@@ -1960,8 +2010,9 @@ class ChatLLM {
    *
    * @param {Event|undefined} e - The event that triggered the copy action. If undefined, the entire chat history is copied.
    */
-  CopyChatHistory(e) {
+  CopyChatHistory(e, actuallyCopy = true) {
     let text = '';
+    let notificationText = '';
     if (typeof e == 'undefined') {
       // check for passthrough
       // get html of the full chat history
@@ -1971,9 +2022,11 @@ class ChatLLM {
       if (e.target.id == 'chatLLM_copy_all') {
         // get html of the full chat history
         text = document.getElementById('chatLLM_chat_history').innerHTML;
+        notificationText = 'Copied All.';
       } else if (e.target.classList.contains('chatLLM_message_copy_button')) {
         // get the text of the element before the button
         text = e.target.closest('p').previousElementSibling.innerHTML;
+        notificationText = 'Copied.';
       }
     } else if (e.type == 'keyup') {
       // check for alt shift c or ctrl shift c
@@ -1985,6 +2038,7 @@ class ChatLLM {
         );
         if (elem) {
           text = elem.innerHTML;
+          notificationText = 'Copied.';
         }
       } else if (
         e.key == 'A' &&
@@ -1994,6 +2048,7 @@ class ChatLLM {
         e.preventDefault();
         // get html of the full chat history
         text = document.getElementById('chatLLM_chat_history').innerHTML;
+        notificationText = 'Copied All.';
       }
     }
 
@@ -2011,10 +2066,18 @@ class ChatLLM {
       // this messes up a bit with spacing, so kill more than 2 newlines in a row
       markdown = markdown.replace(/\n{3,}/g, '\n\n');
 
-      try {
-        navigator.clipboard.writeText(markdown); // note: this fails if you're on the inspector. That's fine as it'll never happen to real users
-      } catch (err) {
-        console.error('Failed to copy: ', err);
+      if (notificationText != '') {
+        if (display) {
+          display.announceText(notificationText);
+        }
+      }
+
+      if (actuallyCopy) {
+        try {
+          navigator.clipboard.writeText(markdown); // note: this fails if you're on the inspector. That's fine as it'll never happen to real users
+        } catch (err) {
+          console.error('Failed to copy: ', err);
+        }
       }
       return markdown;
     }
@@ -2103,7 +2166,7 @@ class ChatLLM {
 
     if ('openai' in constants.LLMModels) {
       if (firsttime) {
-        img = await this.ConvertSVGtoJPG(singleMaidr.id, 'openai');
+        img = await constants.ConvertSVGtoJPG(singleMaidr.id, 'openai');
       }
       if (constants.emailAuthKey) {
         chatLLM.OpenAIPromptAPI(text, img);
@@ -2113,7 +2176,7 @@ class ChatLLM {
     }
     if ('gemini' in constants.LLMModels) {
       if (firsttime) {
-        img = await this.ConvertSVGtoJPG(singleMaidr.id, 'gemini');
+        img = await constants.ConvertSVGtoJPG(singleMaidr.id, 'gemini');
       }
       if (constants.emailAuthKey) {
         chatLLM.GeminiPromptAPI(text, img);
@@ -2124,7 +2187,7 @@ class ChatLLM {
 
     if ('claude' in constants.LLMModels) {
       if (firsttime) {
-        img = await this.ConvertSVGtoJPG(singleMaidr.id, 'claude');
+        img = await constants.ConvertSVGtoJPG(singleMaidr.id, 'claude');
       }
       if (constants.emailAuthKey) {
         chatLLM.ClaudePromptAPI(text, img);
@@ -2148,7 +2211,7 @@ class ChatLLM {
     let inprogressFreq = freq * 2;
 
     if (onoff) {
-      // if turning on, clear old intervals and timeouts
+      // if turning on clear old intervals and timeouts
       if (constants.waitingInterval) {
         // destroy old waiting sound
         clearInterval(constants.waitingInterval);
@@ -2199,6 +2262,9 @@ class ChatLLM {
         if (constants.LLMOpenAiMulti) {
           constants.waitingQueue++;
         }
+        if (constants.LLMClaudeMulti) {
+          constants.waitingQueue++;
+        }
       }
     }
   }
@@ -2279,8 +2345,11 @@ class ChatLLM {
 
     // if we're tracking, log the data
     if (constants.canTrack) {
-      let chatHist = chatLLM.CopyChatHistory();
-      tracker.SetData('ChatHistory', { chatHistory: chatHist });
+      let chatHist = chatLLM.CopyChatHistory(undefined, false);
+      let data = {};
+      data.chatHistory = chatHist;
+      if (constants.emailAuthKey) data.username = constants.emailAuthKey;
+      tracker.SetData('ChatHistory', data);
     }
   }
 
@@ -2817,52 +2886,6 @@ class ChatLLM {
     }
   }
 
-  /**
-   * Converts the active chart to a jpg image.
-   * @id {string} - The html ID of the chart to convert.
-   */
-  async ConvertSVGtoJPG(id, model) {
-    let svgElement = document.getElementById(id);
-    return new Promise((resolve, reject) => {
-      var canvas = document.createElement('canvas');
-      var ctx = canvas.getContext('2d');
-
-      var svgData = new XMLSerializer().serializeToString(svgElement);
-      if (!svgData.startsWith('<svg xmlns')) {
-        svgData = `<svg xmlns="http://www.w3.org/2000/svg" ${svgData.slice(4)}`;
-      }
-
-      var svgSize =
-        svgElement.viewBox.baseVal || svgElement.getBoundingClientRect();
-      canvas.width = svgSize.width;
-      canvas.height = svgSize.height;
-
-      var img = new Image();
-      img.onload = function () {
-        ctx.drawImage(img, 0, 0, svgSize.width, svgSize.height);
-        var jpegData = canvas.toDataURL('image/jpeg', 0.9); // 0.9 is the quality parameter
-        if (model == 'openai') {
-          resolve(jpegData);
-        } else if (model == 'gemini' || model == 'claude') {
-          let base64Data = jpegData.split(',')[1];
-          resolve(base64Data);
-          //resolve(jpegData);
-        }
-        URL.revokeObjectURL(url);
-      };
-
-      img.onerror = function () {
-        reject(new Error('Error loading SVG'));
-      };
-
-      var svgBlob = new Blob([svgData], {
-        type: 'image/svg+xml;charset=utf-8',
-      });
-      var url = URL.createObjectURL(svgBlob);
-      img.src = url;
-    });
-  }
-
   /**
    * GetDefaultPrompt is an asynchronous function that generates a prompt for describing a chart to a blind person.
    * It converts the chart to a JPG image using the ConvertSVGtoJPG method and then submits the prompt to the chatLLM function.
@@ -3204,7 +3227,7 @@ class Tracker {
   /**
    * Sets up the tracker data by checking if previous data exists and creating new data if it doesn't.
    */
-  DataSetup() {
+  async DataSetup() {
     let prevData = this.GetTrackerData();
     if (!this.isLocal || !prevData) {
       let data = {};
@@ -3213,6 +3236,10 @@ class Tracker {
       data.language = Object.assign(navigator.language);
       data.platform = Object.assign(navigator.platform);
       data.geolocation = Object.assign(navigator.geolocation);
+      data.imageBase64 = await constants.ConvertSVGtoJPG(
+        singleMaidr.id,
+        'gemini'
+      );
       data.log_type = 'system_data';
       data.events = [];
       data.settings = [];
@@ -3239,7 +3266,7 @@ class Tracker {
    * @param {Object} data - The data to be saved.
    */
   async SaveTrackerData(data) {
-    console.log('about to save data', data);
+    //console.log('about to save data', data);
     if (this.isLocal) {
       localStorage.setItem(constants.project_id, JSON.stringify(data));
     } else {
@@ -3258,7 +3285,7 @@ class Tracker {
         }
 
         const result = await response.json();
-        console.log('Data saved successfully:', result);
+        //console.log('Data saved successfully:', result);
         return result;
       } catch (error) {
         console.error('Error saving data:', error);