maidr 2.24.0 → 2.25.0

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;
+    });
+  }
 }
 
 /**
@@ -1962,6 +2007,7 @@ class ChatLLM {
    */
   CopyChatHistory(e) {
     let text = '';
+    let notificationText = '';
     if (typeof e == 'undefined') {
       // check for passthrough
       // get html of the full chat history
@@ -1971,9 +2017,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 +2033,7 @@ class ChatLLM {
         );
         if (elem) {
           text = elem.innerHTML;
+          notificationText = 'Copied.';
         }
       } else if (
         e.key == 'A' &&
@@ -1994,6 +2043,7 @@ class ChatLLM {
         e.preventDefault();
         // get html of the full chat history
         text = document.getElementById('chatLLM_chat_history').innerHTML;
+        notificationText = 'Copied All.';
       }
     }
 
@@ -2011,6 +2061,12 @@ 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');
 
+      if (notificationText != '') {
+        if (display) {
+          display.announceText(notificationText);
+        }
+      }
+
       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) {
@@ -2103,7 +2159,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 +2169,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 +2180,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);
@@ -2271,8 +2327,7 @@ class ChatLLM {
       if (data.text()) {
         text = data.text();
         chatLLM.DisplayChatMessage(LLMName, text);
-      }
-      if (data.error) {
+      } else if (data.error) {
         chatLLM.DisplayChatMessage(LLMName, 'Error processing request.', true);
         chatLLM.WaitingSound(false);
       }
@@ -2281,7 +2336,10 @@ class ChatLLM {
     // if we're tracking, log the data
     if (constants.canTrack) {
       let chatHist = chatLLM.CopyChatHistory();
-      tracker.SetData('ChatHistory', chatHist);
+      let data = {};
+      data.chatHistory = chatHist;
+      if (constants.emailAuthKey) data.username = constants.emailAuthKey;
+      tracker.SetData('ChatHistory', data);
     }
   }
 
@@ -2818,52 +2876,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.
@@ -3205,7 +3217,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 = {};
@@ -3214,6 +3226,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 = [];
@@ -3659,9 +3675,20 @@ class LogError {
  */
 class Audio {
   constructor() {
-    this.AudioContext = window['AudioContext'] || window['webkitAudioContext'];
-    this.audioContext = new AudioContext();
-    this.compressor = this.compressorSetup(this.audioContext);
+    this.fixAudioContext();
+  }
+
+  fixAudioContext() {
+    if (!this.audioContext) {
+      this.AudioContext =
+        window['AudioContext'] || window['webkitAudioContext'];
+      this.audioContext = new AudioContext();
+      this.compressor = this.compressorSetup(this.audioContext);
+    } else if (this.audioContext.state === 'suspended') {
+      this.audioContext.resume().then(() => {
+        console.log('AudioContext resumed');
+      });
+    }
   }
 
   /**
@@ -4408,6 +4435,10 @@ class Display {
         this.announceText(resources.GetString('son_off'));
       }
     }
+
+    if (constants.sonifMode != 'off') {
+      audio.fixAudioContext();
+    }
   }
 
   /**
@@ -9019,15 +9050,19 @@ class Control {
           // we lock the selection while we're changing stuff so it doesn't loop
           constants.lockSelection = true;
 
-          // exception: don't let users click the seperator char
+          // exception: don't let users click the seperator char, so make them click just before
           let seperatorPositions = constants.brailleInput.value
             .split('')
             .reduce((positions, char, index) => {
               if (char === '⠳') positions.push(index);
               return positions;
             }, []);
+          console.log('seperatorPositions', seperatorPositions);
+          console.log('pos', pos);
           if (seperatorPositions.includes(pos)) {
-            return;
+            if (pos > 0) {
+              pos += -1;
+            }
           }
 
           // we're using braille cursor, update the selection from what was clicked