@kudoai/chatgpt.js 3.2.1 → 3.3.0

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

@@ -410,36 +410,42 @@ const chatgpt = { // eslint-disable-line no-redeclare
             return codeBlocks ? codeBlocks[codeBlocks.length - 1] : msg;
         },
 
-        async isIdle() {
+        async isIdle(timeout = null) {
             const obsConfig = { childList: true, subtree: true },
                   selectors = { msgDiv: 'div[data-message-author-role]',
                                 replyDiv: 'div[data-message-author-role="assistant"]' };
 
-            await new Promise(resolve => { // when in conversation page
-                if (document.querySelector(selectors.msgDiv)) resolve();
-                else new MutationObserver((_, obs) => {
-                    if (document.querySelector(selectors.msgDiv)) { obs.disconnect(); resolve(); }
-                }).observe(document.body, obsConfig);
-            });
-            await new Promise(resolve => { // when reply starts generating
-                new MutationObserver((_, obs) => {
-                    if (!chatgpt.getRegenerateBtn()) { obs.disconnect(); resolve(); }
-                }).observe(document.body, obsConfig);
-            });
-            const lastReplyDiv = await new Promise(resolve => { // when code starts generating
-                new MutationObserver((_, obs) => {
-                    const replyDivs = document.querySelectorAll(selectors.replyDiv),
-                          lastReplyDiv = replyDivs[replyDivs.length - 1];
-                    if (lastReplyDiv?.querySelector('pre')) { obs.disconnect(); resolve(lastReplyDiv); }
-                }).observe(document.body, obsConfig);
-            });
-            await new Promise(resolve => { // when code stops generating
-                new MutationObserver((_, obs) => {
-                    if (lastReplyDiv?.querySelector('pre').nextElementSibling // code block not last child of reply div
-                        || chatgpt.getRegenerateBtn() // ...or reply outright stopped generating
-                    ) { obs.disconnect(); resolve(); }
-                }).observe(document.body, obsConfig);
-            });
+            // Create promises
+            const timeoutPromise = timeout ? new Promise(resolve => setTimeout(() => resolve(false), timeout)) : null;
+            const isIdlePromise = (async () => {
+                await new Promise(resolve => { // when on convo page
+                    if (document.querySelector(selectors.msgDiv)) resolve();
+                    else new MutationObserver((_, obs) => {
+                        if (document.querySelector(selectors.msgDiv)) { obs.disconnect(); resolve(); }
+                    }).observe(document.body, obsConfig);
+                });
+                await new Promise(resolve => { // when reply starts generating
+                    new MutationObserver((_, obs) => {
+                        if (chatgpt.getStopBtn()) { obs.disconnect(); resolve(); }
+                    }).observe(document.body, { childList: true, subtree: true });
+                });
+                const replyDivs = document.querySelectorAll(selectors.replyDiv),
+                      lastReplyDiv = replyDivs[replyDivs.length - 1];
+                await new Promise(resolve => { // when code starts generating
+                    new MutationObserver((_, obs) => {
+                        if (lastReplyDiv?.querySelector('pre')) { obs.disconnect(); resolve(); }
+                    }).observe(document.body, obsConfig);
+                });
+                return new Promise(resolve => { // when code stops generating
+                    new MutationObserver((_, obs) => {
+                        if (lastReplyDiv?.querySelector('pre')?.nextElementSibling // code block not last child of reply div
+                            || !chatgpt.getStopBtn() // ...or reply outright stopped generating
+                        ) { obs.disconnect(); resolve(true); }
+                    }).observe(document.body, obsConfig);
+                });
+            })();
+
+            return await (timeoutPromise ? Promise.race([isIdlePromise, timeoutPromise]) : isIdlePromise);
         },
 
         async minify(code) {
@@ -614,6 +620,24 @@ const chatgpt = { // eslint-disable-line no-redeclare
     extractCode() { chatgpt.code.extract(); },
     focusChatbar() { chatgpt.getChatBox()?.focus(); },
 
+    footer: {
+        get() { return document.querySelector('main form')?.parentNode.parentNode.nextElementSibling; },
+
+        hide() { 
+            const footer = chatgpt.footer.get();
+            if (!footer) return console.error('Footer element not found!');
+            if (footer.style.visibility == 'hidden') return console.info('Footer already hidden!');
+            footer.style.visibility = 'hidden'; footer.style.height = '3px';
+        },
+
+        show() {
+            const footer = chatgpt.footer.get();
+            if (!footer) return console.error('Footer element not found!');
+            if (footer.style.visibility != 'hidden') return console.info('Footer already shown!');
+            footer.style.visibility = footer.style.height = 'inherit';            
+        }
+    },
+
     generateRandomIP() {
         const ip = Array.from({length: 4}, () => Math.floor(chatgpt.randomFloat() * 256)).join('.');
         console.info('IP generated: ' + ip);
@@ -866,16 +890,14 @@ const chatgpt = { // eslint-disable-line no-redeclare
                 return formBtnSVG.parentNode.parentNode;
     }},
 
-    getFooterDiv() { return document.querySelector('main form')?.parentNode.parentNode.nextElementSibling; },
-    getHeaderDiv() { return document.querySelector('main .sticky'); },
+    getFooterDiv() { return chatgpt.footer.get(); },
+    getHeaderDiv() { return chatgpt.header.get(); },
     getLastPrompt() { return chatgpt.getChatData('active', 'msg', 'user', 'latest'); },
     getLastResponse() { return chatgpt.getChatData('active', 'msg', 'chatgpt', 'latest'); },
 
     getNewChatButton() {
-        for (const navBtnSVG of document.querySelectorAll('nav button svg'))
-            if (navBtnSVG.querySelector('path[d^="M15.6729"], '  // pencil-on-pad icon
-                                      + 'path[d^="M3.06957"]'))  // refresh icon if temp chat
-                return navBtnSVG.parentNode;
+        return document.querySelector('button:has([d*="M15.6729"],' // pencil-on-pad icon
+                                    + '[d^="M3.06957"])'); // refresh icon if temp chat
     },
 
     getNewChatLink() { return document.querySelector('nav a[href="/"]'); },
@@ -912,25 +934,28 @@ const chatgpt = { // eslint-disable-line no-redeclare
 
     getUserLanguage() {
         return navigator.languages[0] || navigator.language || navigator.browserLanguage ||
-            navigator.systemLanguage || navigator.userLanguage || ''; },
+            navigator.systemLanguage || navigator.userLanguage || '';
+    },
 
-    hideFooter() { 
-        const footer = chatgpt.getFooterDiv();
-        if (!footer) return console.error('Footer element not found!');
-        if (footer.style.visibility == 'hidden') return console.info('Footer already hidden!');
-        footer.style.visibility = 'hidden'; footer.style.height = '3px';
+    header: {
+        get() { return document.querySelector('main .sticky'); },
+        hide() { chatgpt.header.get().style.display = 'none'; },
+        show() { chatgpt.header.get().style.display = 'flex'; }
     },
 
-    hideHeader() { chatgpt.getHeaderDiv().style.display = 'none'; },
+    hideFooter() { chatgpt.footer.hide(); },
+    hideHeader() { chatgpt.header.hide(); },
 
     history: {
-        isLoaded() {
-            return new Promise(resolve => {
+        async isLoaded(timeout = null) {
+            const timeoutPromise = timeout ? new Promise(resolve => setTimeout(() => resolve(false), timeout)) : null;
+            const isLoadedPromise = new Promise(resolve => {
                 if (document.querySelector('nav')) resolve(true);
                 else new MutationObserver((_, obs) => {
                     if (document.querySelector('nav')) { obs.disconnect(); resolve(true); }
                 }).observe(document.body, { childList: true, subtree: true });
             });
+            return await ( timeoutPromise ? Promise.race([isLoadedPromise, timeoutPromise]) : isLoadedPromise );
         }
     },
 
@@ -1062,22 +1087,43 @@ const chatgpt = { // eslint-disable-line no-redeclare
     isDarkMode() { return document.documentElement.classList.toString().includes('dark'); },
     isFullScreen() { return chatgpt.browser.isFullScreen(); },
 
-    isIdle() {
-        return new Promise(resolve => {
-            if (chatgpt.getRegenerateBtn()) resolve(true);
-            else new MutationObserver((_, obs) => {
-                if (chatgpt.getRegenerateBtn()) { obs.disconnect(); resolve(true); }
-            }).observe(document.body, { childList: true, subtree: true });
-        });
+    async isIdle(timeout = null) {
+        const obsConfig = { childList: true, subtree: true },
+              msgDivSelector = 'div[data-message-author-role]';
+
+        // Create promises
+        const timeoutPromise = timeout ? new Promise(resolve => setTimeout(() => resolve(false), timeout)) : null;
+        const isIdlePromise = (async () => {
+            await new Promise(resolve => { // when on convo page
+                if (document.querySelector(msgDivSelector)) resolve();
+                else new MutationObserver((_, obs) => {
+                    if (document.querySelector(msgDivSelector)) { obs.disconnect(); resolve(); }
+                }).observe(document.body, obsConfig);
+            });
+            await new Promise(resolve => { // when reply starts generating
+                new MutationObserver((_, obs) => {
+                    if (chatgpt.getStopBtn()) { obs.disconnect(); resolve(); }
+                }).observe(document.body, obsConfig);
+            });
+            return new Promise(resolve => { // when reply stops generating
+                new MutationObserver((_, obs) => {
+                    if (!chatgpt.getStopBtn()) { obs.disconnect(); resolve(true); }
+                }).observe(document.body, obsConfig);
+            });
+        })();
+
+        return await (timeoutPromise ? Promise.race([isIdlePromise, timeoutPromise]) : isIdlePromise);
     },
 
-    isLoaded() {
-        return new Promise(resolve => {
+    async isLoaded(timeout = null) {
+        const timeoutPromise = timeout ? new Promise(resolve => setTimeout(() => resolve(false), timeout)) : null;
+        const isLoadedPromise = new Promise(resolve => {
             if (chatgpt.getNewChatBtn()) resolve(true);
             else new MutationObserver((_, obs) => {
                 if (chatgpt.getNewChatBtn()) { obs.disconnect(); resolve(true); }
             }).observe(document.body, { childList: true, subtree: true });
         });
+        return await ( timeoutPromise ? Promise.race([isLoadedPromise, timeoutPromise]) : isLoadedPromise );
     },
 
     isLightMode() { return document.documentElement.classList.toString().includes('light'); },
@@ -1499,7 +1545,8 @@ const chatgpt = { // eslint-disable-line no-redeclare
             return console.error(`Argument ${ i + 1 } must be a string!`);
         const textArea = chatgpt.getChatBox();
         if (!textArea) return console.error('Chatbar element not found!');
-        textArea.value = msg;
+        const msgP = document.createElement('p'); msgP.textContent = msg;
+        textArea.replaceChild(msgP, textArea.querySelector('p'));
         textArea.dispatchEvent(new Event('input', { bubbles: true })); // enable send button
         setTimeout(function delaySend() {
             const sendBtn = chatgpt.getSendButton();
@@ -1512,10 +1559,8 @@ const chatgpt = { // eslint-disable-line no-redeclare
 
     sendInNewChat(msg) {
         if (typeof msg !== 'string') return console.error('Message must be a string!');
-        for (const navLink of document.querySelectorAll('nav a')) {
-            if (/(new|clear) chat/i.test(navLink.text)) {
-                navLink.click(); break;
-        }} setTimeout(() => { chatgpt.send(msg); }, 500);
+        try { chatgpt.getNewChatBtn().click(); } catch (err) { return console.error(err.message); }
+        setTimeout(() => { chatgpt.send(msg); }, 500);
     },
 
     settings: {
@@ -1639,14 +1684,8 @@ const chatgpt = { // eslint-disable-line no-redeclare
         });});});});});
     },
 
-    showFooter() {
-        const footer = chatgpt.getFooterDiv();
-        if (!footer) return console.error('Footer element not found!');
-        if (footer.style.visibility != 'hidden') return console.info('Footer already shown!');
-        footer.style.visibility = footer.style.height = 'inherit';
-    },
-
-    showHeader() { chatgpt.getHeaderDiv().style.display = 'flex'; },
+    showFooter() { chatgpt.footer.show(); },
+    showHeader() { chatgpt.header.show(); },
 
     sidebar: {
         elements: [], observer: {},
@@ -1759,13 +1798,15 @@ const chatgpt = { // eslint-disable-line no-redeclare
             return newElement.id; // Return the element id
         },
 
+        exists() { return !!chatgpt.getNewChatLink(); },
         hide() { this.isOn() ? this.toggle() : console.info('Sidebar already hidden!'); },
         show() { this.isOff() ? this.toggle() : console.info('Sidebar already shown!'); },
         isOff() { return !this.isOn(); },
         isOn() {
-            const sidebar = document.querySelector('body script + div > div');
-            if (!sidebar) return console.error('Sidebar element not found!');
-            return chatgpt.browser.isMobile() ?
+            const sidebar = (() => {
+                return chatgpt.sidebar.exists() ? document.querySelector('body script + div > div') : null; })();
+            if (!sidebar) { console.error('Sidebar element not found!'); return false; }
+            else return chatgpt.browser.isMobile() ?
                 document.documentElement.style.overflow == 'hidden'
               : sidebar.style.visibility != 'hidden' && sidebar.style.width != '0px';
         },
@@ -1777,19 +1818,19 @@ const chatgpt = { // eslint-disable-line no-redeclare
                               : btn => btn.querySelector('svg path[d^="M8.857"]');
             for (const btn of document.querySelectorAll(navBtnSelector))
                 if (isToggleBtn(btn)) { btn.click(); return; }
+            console.error('Sidebar toggle not found!');
         },
 
-        async isLoaded() {
+        async isLoaded(timeout = 5000) {
             await chatgpt.isLoaded();
-            return Promise.race([
-                new Promise(resolve => {
-                    if (chatgpt.getNewChatLink()) resolve(true);
-                    else new MutationObserver((_, obs) => {
-                        if (chatgpt.getNewChatLink()) { obs.disconnect(); resolve(true); }
-                    }).observe(document.body, { childList: true, subtree: true });
-                }),
-                new Promise(resolve => setTimeout(resolve, 5000)) // since New Chat link not always present
-            ]);
+            const timeoutPromise = new Promise(resolve => setTimeout(() => { resolve(false); }, timeout));
+            const isLoadedPromise = new Promise(resolve => {
+                if (chatgpt.getNewChatLink()) resolve(true);
+                else new MutationObserver((_, obs) => {
+                    if (chatgpt.getNewChatLink()) { obs.disconnect(); resolve(true); }
+                }).observe(document.body, { childList: true, subtree: true });
+            });
+            return await Promise.race([isLoadedPromise, timeoutPromise]);
         }
     },
 
@@ -1902,6 +1943,7 @@ const cjsFuncAliases = [
     ['deactivateAutoRefresh', 'deactivateAutoRefresher', 'deactivateRefresher', 'deactivateSessionRefresher'],
     ['detectLanguage', 'getLanguage'],
     ['executeCode', 'codeExecute'],
+    ['exists', 'isAvailable', 'isExistent', 'isPresent'],
     ['exportChat', 'chatExport', 'export'],
     ['getFooterDiv', 'getFooter'],
     ['getHeaderDiv', 'getHeader'],

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.9.10",
+    "version": "2024.9.12",
     "author": "chatgpt.js",
     "icons": {
         "16": "icons/icon16.png",

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

@@ -3,13 +3,13 @@
 // @description   A Greasemonkey template to start using chatgpt.js like a boss
 // @author        chatgpt.js
 // @namespace     https://chatgpt.js.org
-// @version       2024.9.10
+// @version       2024.9.12
 // @license       MIT
 // @match         *://chatgpt.com/*
 // @match         *://chat.openai.com/*
-// @icon          https://cdn.jsdelivr.net/gh/KudoAI/chatgpt.js@3.2.1/starters/greasemonkey/media/images/icons/robot/icon48.png
-// @icon64        https://cdn.jsdelivr.net/gh/KudoAI/chatgpt.js@3.2.1/starters/greasemonkey/media/images/icons/robot/icon64.png
-// @require       https://cdn.jsdelivr.net/npm/@kudoai/chatgpt.js@3.2.1/dist/chatgpt.min.js
+// @icon          https://cdn.jsdelivr.net/gh/KudoAI/chatgpt.js@3.3.0/starters/greasemonkey/media/images/icons/robot/icon48.png
+// @icon64        https://cdn.jsdelivr.net/gh/KudoAI/chatgpt.js@3.3.0/starters/greasemonkey/media/images/icons/robot/icon64.png
+// @require       https://cdn.jsdelivr.net/npm/@kudoai/chatgpt.js@3.3.0/dist/chatgpt.min.js
 // @grant         GM_getValue
 // @grant         GM_setValue
 // @noframes