@kudoai/chatgpt.js 2.7.1 → 2.9.0

package/starters/chrome/extension/lib/chatgpt.js

@@ -8,11 +8,11 @@ const endpoints = {
     assets: 'https://cdn.jsdelivr.net/gh/KudoAI/chatgpt.js',
     openAI: {
         session: 'https://chatgpt.com/api/auth/session',
-        chats: 'https://chat.openai.com/backend-api/conversations',
-        chat: 'https://chat.openai.com/backend-api/conversation',
-        share_create: 'https://chat.openai.com/backend-api/share/create',
-        share: 'https://chat.openai.com/backend-api/share',
-        instructions: 'https://chat.openai.com/backend-api/user_system_messages'
+        chats: 'https://chatgpt.com/backend-api/conversations',
+        chat: 'https://chatgpt.com/backend-api/conversation',
+        share_create: 'https://chatgpt.com/backend-api/share/create',
+        share: 'https://chatgpt.com/backend-api/share',
+        instructions: 'https://chatgpt.com/backend-api/user_system_messages'
     }
 };
 
@@ -383,21 +383,25 @@ const chatgpt = { // eslint-disable-line no-redeclare
         const validMethods = ['api', 'dom'];
         method = (method || 'dom').trim().toLowerCase(); // set to 'dom' by default
         if (method && !validMethods.includes(method))
-            return console.log(`Method argument must be one of: [${ validMethods }]`);
+            return console.error(`Method argument must be one of: [${validMethods}]`);
 
         if (method == 'dom') {
-            try { await chatgpt.getChatData(); } catch { return; } // check if chat history exists
-            chatgpt.menu.open(); setTimeout(() => { // open settings
+            const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
+            try {
+                chatgpt.menu.open(); await delay(10);
                 const settingsBtn = document.querySelector(
-                    'a[role="menuitem"] svg path[d*="M12.003 10.5a1.5"]')?.parentNode.parentNode;
-                if (settingsBtn) settingsBtn.click();
-                setTimeout(() => { // clear chats
-                    const settingsBtns = document.querySelectorAll('[id*=radix] button'),
-                          deleteBtn = settingsBtns[settingsBtns.length - 1];
-                    if (deleteBtn) deleteBtn.click();
-                    setTimeout(() => { // confirm clear
-                        document.querySelector('button[class*="danger"').click();
-            }, 10); }, 333); }, 10);
+                    'a[role="menuitem"] svg path[d*="M12.003 10.5a1.5"]').parentNode.parentNode;
+                settingsBtn.click(); await delay(333);
+                const settingsBtns = document.querySelectorAll('[id*=radix] button'),
+                      deleteBtn = settingsBtns[settingsBtns.length - 1];
+                deleteBtn.click(); await delay(10);
+                document.querySelector('button[class*="danger"').click(); // confirm clear
+                return console.info('Chats successfully cleared.');
+            } catch (err) {
+                console.error(err.message);
+                if (arguments.length == 0) {
+                    console.info('Using backend API method instead.'); this.clearChats('api'); }
+            }
 
         } else { // API method
         // NOTE: DOM is not updated to reflect new empty chat list (until session refresh)
@@ -413,7 +417,7 @@ const chatgpt = { // eslint-disable-line no-redeclare
                         console.info('Chats successfully cleared'); resolve();
                     };
                     xhr.send(JSON.stringify({ is_visible: false }));
-                }).catch(reject);
+                }).catch(err => reject(new Error(err.message)));
             });
         }
     },
@@ -493,6 +497,8 @@ const chatgpt = { // eslint-disable-line no-redeclare
         }
     },
 
+    continue: function() { this.response.continue(); },
+
     detectLanguage: async function(text) {
         if (!text) return console.error('Text argument not supplied. Pass some text!');
         if (typeof text !== 'string') return console.error('Text argument must be a string!');
@@ -842,20 +848,18 @@ const chatgpt = { // eslint-disable-line no-redeclare
         });});};
 
         // Return chat data
-        return new Promise(resolve => { chatgpt.getAccessToken().then(token => {
-            if (!detailsToGet.includes('msg')) getChatDetails(token, detailsToGet).then(data => {
-                return resolve(data); // get just the chat details
-            });
-            else getChatMsgs(token).then(messages => { return resolve(messages); }); // otherwise get specific msg's
-        });});
+        return new Promise(resolve => chatgpt.getAccessToken().then(token => {
+            return resolve(detailsToGet.includes('msg') ? getChatMsgs(token)
+                         : getChatDetails(token, detailsToGet));
+        }));
     },
 
     getChatInput: function() { return chatgpt.getChatBox().value; },
 
     getContinueGeneratingButton: function() {
-        for (const svg of document.querySelectorAll('form button svg')) {
-            if (svg.querySelector('polygon[points*="11 19 2 12 11 5 11 19"]'))
-                return svg.parentNode.parentNode;
+        for (const formBtnSVG of document.querySelectorAll('form button svg')) {
+            if (formBtnSVG.querySelector('path[d*="M4.472 2.5a1"]'))
+                return formBtnSVG.parentNode.parentNode;
     }},
 
     getFooterDiv: function() { return document.querySelector('main form').parentNode.parentNode.nextElementSibling; },
@@ -863,11 +867,13 @@ const chatgpt = { // eslint-disable-line no-redeclare
     getLastPrompt: function() { return chatgpt.getChatData('active', 'msg', 'user', 'latest'); },
     getLastResponse: function() { return chatgpt.getChatData('active', 'msg', 'chatgpt', 'latest'); },
 
-    getNewChatLink: function() {
-        for (const navLink of document.querySelectorAll('nav a')) {
-            if (/(new|clear) chat/i.test(navLink.text)) {
-                return navLink;
-    }}},
+    getNewChatButton: function() {
+        for (const navBtnSVG of document.querySelectorAll('nav button svg'))
+            if (navBtnSVG.querySelector('path[d*="M15.673 3.913a3.121"]')) // new chat icon found
+                return navBtnSVG.parentNode;
+    },
+
+    getNewChatLink: function() { return document.querySelector('nav a[href="/"]'); },
 
     getRegenerateButton: function() {   
         for (const mainSVG of document.querySelectorAll('main svg')) {
@@ -881,19 +887,21 @@ const chatgpt = { // eslint-disable-line no-redeclare
     // responseToGet = index of response to get (defaults to latest if '' unpassed)
     // regenResponseToGet = index of regenerated response to get (defaults to latest if '' unpassed)
 
-        if (window.location.href.startsWith('https://chat.openai.com/c/'))
-            return chatgpt.getResponseFromDOM.apply(null, arguments);
-        else return chatgpt.getResponseFromAPI.apply(null, arguments);
+        return chatgpt.response.get(...arguments);
     },
 
     getResponseFromAPI: function(chatToGet, responseToGet) { return chatgpt.response.getFromAPI(chatToGet, responseToGet); },
     getResponseFromDOM: function(pos) { return chatgpt.response.getFromDOM(pos); },
     getScrollToBottomButton: function() { return document.querySelector('button[class*="cursor"][class*="bottom"]'); },
-    getSendButton: function() { return document.querySelector('form button[class*="bottom"]'); },
+
+    getSendButton: function() {
+        return document.querySelector('[data-testid="send-button"]') // pre-GPT-4o
+            || document.querySelector('path[d*="M15.192 8.906a1.143"]')?.parentNode.parentNode; // post-GPT-4o
+    },
 
     getStopGeneratingButton: function() {
         for (const svg of document.querySelectorAll('form button svg')) {
-            if (svg.querySelector('path[d*="2 0 0 1 2"]'))
+            if (svg.querySelector('path[d*="2 0 0 1 2"], rect'))
                 return svg.parentNode;
     }},
 
@@ -907,11 +915,10 @@ const chatgpt = { // eslint-disable-line no-redeclare
     history: {
         isLoaded: function() {
             return new Promise(resolve => {
-                const checkChatHistory = () => {
+                (function checkChatHistory() {
                     if (document.querySelector('nav')) resolve(true);
                     else setTimeout(checkChatHistory, 100);
-                };
-                checkChatHistory();
+                })();
         });}
     },
 
@@ -1047,17 +1054,19 @@ const chatgpt = { // eslint-disable-line no-redeclare
 
     isIdle: function() {
         return new Promise(resolve => {
-            const intervalId = setInterval(() => {
-                if (chatgpt.getRegenerateButton()) {
-                    clearInterval(intervalId); resolve(true);
-    }}, 100);});},
+            (function checkIsIdle() {
+                if (chatgpt.getRegenerateButton()) resolve(true);
+                else setTimeout(checkIsIdle, 100);
+            })();
+    });},
 
     isLoaded: function() {
         return new Promise(resolve => {
-            const intervalId = setInterval(() => {
-                if (document.querySelector('nav button[id*="menu"]')) {
-                    clearInterval(intervalId); setTimeout(() => { resolve(true); }, 500);
-    }}, 100);});},
+            (function checkIsLoaded() {
+                if (chatgpt.getNewChatButton()) resolve(true);
+                else setTimeout(checkIsLoaded, 100);
+            })();
+    });},
 
     isLightMode: function() { return document.documentElement.classList.toString().includes('light'); },
     isMobileDevice: function() { return chatgpt.browser.isMobile(); },
@@ -1153,15 +1162,13 @@ const chatgpt = { // eslint-disable-line no-redeclare
         },
 
         close: function() {
-            const menuBtn = document.querySelector('nav [id*="menu-button"][aria-expanded="true"]');
-            if (menuBtn) try { menuBtn.click(); } catch (err) { return console.error(err.message); }
-            else { console.info('Menu already hidden!'); }
+            try { document.querySelector('nav [id*="menu-button"][aria-expanded="true"]').click(); }
+            catch (err) { console.error(err.message); }
         },
 
         open: function() {
-            const menuBtn = document.querySelector('nav [id*="menu-button"][aria-expanded="false"]');
-            if (menuBtn) try { menuBtn.click(); } catch (err) { return console.error(err.message); }
-            else { console.info('Menu already open!'); }
+            try { document.querySelector('nav [id*="menu-button"][aria-expanded="false"]').click(); }
+            catch (err) { console.error(err.message); }
         }
     },
 
@@ -1408,13 +1415,15 @@ const chatgpt = { // eslint-disable-line no-redeclare
     resend: async function() { chatgpt.send(await chatgpt.getChatData('latest', 'msg', 'user', 'latest')); },
 
     response: {
+        continue: function() { try { chatgpt.getContinueBtn().click(); } catch (err) { console.error(err.message); }},
+
         get: function() {
             // * Returns response via DOM by index arg if OpenAI chat page is active, otherwise uses API w/ following args:        
             // chatToGet = index|title|id of chat to get (defaults to latest if '' unpassed)
             // responseToGet = index of response to get (defaults to latest if '' unpassed)
             // regenResponseToGet = index of regenerated response to get (defaults to latest if '' unpassed)
 
-                if (window.location.href.startsWith('https://chat.openai.com/c/'))
+                if (window.location.href.startsWith('https://chatgpt.com/c/'))
                     return this.getFromDOM.apply(null, arguments);
                 else return this.getFromAPI.apply(null, arguments);
         },
@@ -1459,47 +1468,32 @@ const chatgpt = { // eslint-disable-line no-redeclare
                     );
                     response = responseDivs[nthOfResponse - 1].textContent;
                 }
-                response = response.replace(/^ChatGPTChatGPT/, ''); // strip sender name
+                response = response.replace(/^ChatGPT(?:ChatGPT)?/, ''); // strip sender name
             }
             return response;
         },
 
         getLast: function() { return chatgpt.getChatData('active', 'msg', 'chatgpt', 'latest'); },
-
-        regenerate: function() {
-            const regenBtn = chatgpt.getRegenerateButton();
-            if (regenBtn) regenBtn.click();
-            else console.error('Regenerate button not found!');
-        },
-
-        stopGenerating: function() {
-            for (const svg of document.querySelectorAll('form button svg')) {
-                if (svg.querySelector('path[d*="2 0 0 1 2"]')) {
-                    svg.parentNode.click(); return;
-        }}}
+        regenerate: function() { try { chatgpt.getRegenerateBtn().click(); } catch (err) { console.error(err.message); }},
+        stopGenerating: function() { try { chatgpt.getStopBtn().click(); } catch (err) { console.error(err.message); }}
     },
 
     reviewCode: function() { chatgpt.code.review(); },
-
-    scrollToBottom: function() {
-        const scrollBtn = chatgpt.getScrollToBottomButton();
-        if (scrollBtn) scrollBtn.click();
-        else console.error('Scroll button not found!');
-    },
+    scrollToBottom: function() { try { chatgpt.getScrollBtn().click(); } catch (err) { console.error(err.message); }},
 
     send: function(msg, method='') {
         for (let i = 0; i < arguments.length; i++) if (typeof arguments[i] !== 'string')
             return console.error(`Argument ${ i + 1 } must be a string!`);
         const textArea = document.querySelector('form textarea'),
-              sendButton = document.querySelector('form button[class*="bottom"]');
+              sendBtn = this.getSendButton();
         textArea.value = msg;
         textArea.dispatchEvent(new Event('input', { bubbles: true })); // enable send button
-        const delaySend = setInterval(() => {
-            if (!sendButton?.hasAttribute('disabled')) { // send msg
-                method.toLowerCase() == 'click' || chatgpt.browser.isMobile() ? sendButton.click()
+
+        setTimeout(function delaySend() {
+            if (!sendBtn?.hasAttribute('disabled')) { // send msg
+                method.toLowerCase() == 'click' || chatgpt.browser.isMobile() ? sendBtn.click()
                     : textArea.dispatchEvent(new KeyboardEvent('keydown', { keyCode: 13, bubbles: true }));
-                clearInterval(delaySend);
-            }
+            } else setTimeout(delaySend, 25);
         }, 25);
     },
 
@@ -1639,10 +1633,6 @@ const chatgpt = { // eslint-disable-line no-redeclare
         elements: [], observer: {},
 
         activateObserver: function() {
-            const chatHistoryNav = document.querySelector('nav'),
-                firstButton = chatHistoryNav.querySelector('a');
-            if (chatgpt.history.isOff()) // Hide enable history spam div
-                try { firstButton.parentNode.nextElementSibling.style.display = 'none'; } catch (err) {}
 
             // Stop the previous observer to preserve resources
             if (this.observer instanceof MutationObserver)
@@ -1753,28 +1743,34 @@ const chatgpt = { // eslint-disable-line no-redeclare
         show: function() { this.isOff() ? this.toggle() : console.info('Sidebar already shown!'); },
         isOff: function() { return !this.isOn(); },
         isOn: function() {
+            const sidebar = document.querySelector('#__next > div > div');
             return chatgpt.browser.isMobile() ?
                 document.documentElement.style.overflow == 'hidden'
-              : document.querySelector('#__next > div > div').style.visibility != 'hidden';
+              : sidebar.style.visibility != 'hidden' && sidebar.style.width != '0px';
         },
 
         toggle: function() {
             const isMobileDevice = chatgpt.browser.isMobile(),
-                  navBtnSelector = isMobileDevice ? '#__next button' : 'main button' ,
+                  isGPT4oUI = !!document.documentElement.className.includes(' '),
+                  navBtnSelector = isMobileDevice ? '#__next button' : isGPT4oUI ? 'nav button' : 'main button',
                   isToggleBtn = isMobileDevice ? () => true // since 1st one is toggle
-                              : btn => Array.from(btn.querySelectorAll('*'))
-                                            .some(child => child.style.transform.includes('translateY'));
+                              : isGPT4oUI ? btn => btn.querySelectorAll('svg path[d*="M8.857 3h6.286c1.084"]').length > 0
+                              : /* post-GPT-4o desktop */ btn => [...btn.querySelectorAll('*')]
+                                    .some(child => child.style.transform.includes('translateY'));
             for (const btn of document.querySelectorAll(navBtnSelector))
                 if (isToggleBtn(btn)) { btn.click(); return; }
-        }
-    },
+        },
 
-    startNewChat: function() {
-        for (const navLink of document.querySelectorAll('nav a')) {
-            if (/(new|clear) chat/i.test(navLink.text)) {
-                navLink.click(); return;
-    }}},
+        isloaded: function() {
+            return new Promise(resolve => {
+                (function checkIsLoaded() {
+                    if (document.querySelector('nav a[href="/"]')) resolve(true);
+                    else setTimeout(checkIsLoaded, 100);
+                })();
+        });}
+    },
 
+    startNewChat: function() { try { this.getNewChatBtn().click(); } catch (err) { console.error(err.message); }},
     stop: function() { this.response.stopGenerating(); },
 
     suggest: async function(ideaType, details) {
@@ -1879,6 +1875,7 @@ const funcAliases = [
     ['actAs', 'actas', 'act', 'become', 'persona', 'premadePrompt', 'preMadePrompt', 'prePrompt', 'preprompt', 'roleplay', 'rolePlay', 'rp'],
     ['activateAutoRefresh', 'activateAutoRefresher', 'activateRefresher', 'activateSessionRefresher',
         'autoRefresh', 'autoRefresher', 'autoRefreshSession', 'refresher', 'sessionRefresher'],
+    ['continue', 'continueChat', 'continueGenerating', 'continueResponse'],
     ['deactivateAutoRefresh', 'deactivateAutoRefresher', 'deactivateRefresher', 'deactivateSessionRefresher'],
     ['detectLanguage', 'getLanguage'],
     ['executeCode', 'codeExecute'],
@@ -1886,7 +1883,9 @@ const funcAliases = [
     ['getFooterDiv', 'getFooter'],
     ['getHeaderDiv', 'getHeader'],
     ['getLastPrompt', 'getLastQuery', 'getMyLastMsg', 'getMyLastQuery'],
+    ['getContinueGeneratingButton', 'getContinueButton'],
     ['getScrollToBottomButton', 'getScrollButton'],
+    ['getStopGeneratingButton', 'getStopButton'],
     ['getTextarea', 'getTextArea', 'getChatbox', 'getChatBox'],
     ['isFullScreen', 'isFullscreen'],
     ['logOut', 'logout', 'logOff', 'logoff', 'signOut', 'signout', 'signOff', 'signoff'],
@@ -1902,7 +1901,8 @@ const funcAliases = [
     ['send', 'sendChat', 'sendMsg'],
     ['sendInNewChat', 'sendNewChat'],
     ['sentiment', 'analyzeSentiment', 'sentimentAnalysis'],
-    ['stop', 'stopGenerating'],
+    ['startNewChat', 'new', 'newChat'],
+    ['stop', 'stopChat', 'stopGenerating', 'stopResponse'],
     ['suggest', 'suggestion', 'recommend'],
     ['toggleAutoRefresh', 'toggleAutoRefresher', 'toggleRefresher', 'toggleSessionRefresher'],
     ['toggleScheme', 'toggleMode'],
@@ -1916,7 +1916,10 @@ const synonyms = [
     ['analyze', 'check', 'evaluate', 'review'],
     ['ask', 'send', 'submit'],
     ['button', 'btn'],
+    ['continue', 'resume'],
+    ['chats', 'history'],
     ['chat', 'conversation', 'convo'],
+    ['clear', 'delete', 'remove'],
     ['data', 'details'],
     ['deactivate', 'deActivate', 'turnOff'],
     ['execute', 'interpret', 'interpreter', 'run'],

package/starters/chrome/extension/manifest.json

@@ -2,7 +2,7 @@
     "manifest_version": 3,
     "name": "ChatGPT Extension",
     "description": "A Chrome template to start using chatgpt.js like a boss!",
-    "version": "2024.5.11",
+    "version": "2024.5.17",
     "author": "chatgpt.js",
     "icons": {
         "16": "icons/icon16.png",
@@ -17,7 +17,7 @@
         "resources": ["lib/settings-utils.js", "lib/chatgpt.js"]
     }],
     "content_scripts": [{
-        "matches": ["https://chat.openai.com/*"],
+        "matches": ["https://chatgpt.com/*", "https://chat.openai.com/*"],
         "js": ["content.js"]
     }],
     "background": { "service_worker": "background.js" }

package/starters/greasemonkey/chatgpt.js-greasemonkey-starter.user.js

@@ -3,12 +3,13 @@
 // @description   A Greasemonkey template to start using chatgpt.js like a boss
 // @author        chatgpt.js
 // @namespace     https://chatgpt.js.org
-// @version       2024.5.11
+// @version       2024.5.17
 // @license       MIT
-// @match         https://chat.openai.com/*
+// @match         *://chatgpt.com/*
+// @match         *://chat.openai.com/*
 // @icon          https://raw.githubusercontent.com/KudoAI/chatgpt.js-greasemonkey-starter/main/media/images/icons/robot/icon48.png
 // @icon64        https://raw.githubusercontent.com/KudoAI/chatgpt.js-greasemonkey-starter/main/media/images/icons/robot/icon64.png
-// @require       https://cdn.jsdelivr.net/npm/@kudoai/chatgpt.js@2.7.1/dist/chatgpt.min.js
+// @require       https://cdn.jsdelivr.net/npm/@kudoai/chatgpt.js@2.9.0/dist/chatgpt.min.js
 // @grant         GM_getValue
 // @grant         GM_setValue
 // @noframes