Added caller.status check to api.tryNew() to reduce checks pre-ca…

…lls ↞ [auto-sync from `adamlui/chatgpt-apps`]
KudoAI · Sep 6, 2024 · db63fb4 · db63fb4
1 parent 4b64e2a
commit db63fb4
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/greasemonkey/googlegpt.user.js b/greasemonkey/googlegpt.user.js
@@ -149,7 +149,7 @@
 // @description:zu           Yengeza izimpendulo ze-AI ku-Google Search (inikwa amandla yi-Google Gemma + GPT-4o!)
 // @author                   KudoAI
 // @namespace                https://kudoai.com
-// @version                  2024.9.5.11
+// @version                  2024.9.6
 // @license                  MIT
 // @icon                     https://media.googlegpt.io/images/icons/googlegpt/black/icon48.png?8652a6e
 // @icon64                   https://media.googlegpt.io/images/icons/googlegpt/black/icon64.png?8652a6e
@@ -2657,7 +2657,7 @@
             update.rqVisibility()
             if (!config.rqDisabled && !appDiv.querySelector('.related-queries')) // get related queries for 1st time
                 get.related(stripQueryAugments(msgChain)[msgChain.length - 1].content).then(queries => show.related(queries))
-                    .catch(err => { log.err(err.message) ; if (get.related.status != 'done') api.tryNew(get.related) })
+                    .catch(err => { log.err(err.message) ; api.tryNew(get.related) })
             update.tweaksStyle() // toggle <pre> max-height
             notify(( msgs.menuLabel_relatedQueries || 'Related Queries' ) + ' ' + menuState.word[+!config.rqDisabled])
         },
@@ -2820,6 +2820,7 @@
         },
 
         tryNew(caller, reason = 'err') {
+            if (caller.status == 'done') return
             log.err(`Error using ${ apis[caller.api].endpoints?.completions || apis[caller.api].endpoint } due to ${reason}`)
             caller.triedAPIs.push({ [caller.api]: reason })
             if (caller.attemptCnt < Object.keys(apis).length -+(caller == get.reply)) {
@@ -2946,7 +2947,7 @@
             // Get/show related queries if enabled on 1st get.reply()
             if (!config.rqDisabled && get.reply.attemptCnt == 1)
                 get.related(stripQueryAugments(msgChain)[msgChain.length - 1].content).then(queries => show.related(queries))
-                    .catch(err => { log.err(err.message) ; if (get.related.status != 'done') api.tryNew(get.related) })
+                    .catch(err => { log.err(err.message) ; api.tryNew(get.related) })
 
             update.footerContent()
         },
@@ -3011,7 +3012,7 @@
                 responseType: 'text', headers: api.createHeaders(get.related.api),
                 data: api.createPayload(get.related.api, [{ role: 'user', content: rqPrompt }]),
                 onload: resp => dataProcess.text(get.related, resp).then(resolve),
-                onerror: err => { log.err(err) ; if (get.related.status != 'done') api.tryNew(get.related) }
+                onerror: err => { log.err(err) ; api.tryNew(get.related) }
             }))
         }
     }
@@ -3088,7 +3089,7 @@
                                : resp.status == 403 ? 'checkCloudflare'
                                : resp.status == 429 ? ['tooManyRequests', 'suggestProxy']
                                                     : ['openAInotWorking', 'suggestProxy'] )
-                    else if (caller.status != 'done') api.tryNew(caller)
+                    else api.tryNew(caller)
                 } else if (caller.api == 'OpenAI') {
                     if (resp.response && !failFlagsAndURLs.test(resp.response)) {
                         try { // to show response or return related queries
@@ -3097,7 +3098,7 @@
                         } catch (err) { handleProcessError(err) }
                     } else { // suggest proxy or try diff API
                         if (caller == get.reply) appAlert('openAInotWorking', 'suggestProxy')
-                        else if (caller.status != 'done') api.tryNew(caller)
+                        else api.tryNew(caller)
                     }
                 } else if (resp.responseText) {
                     if (caller.api == 'AIchatOS') {
@@ -3146,7 +3147,7 @@
                     log.info('Response text', resp.response)
                     log.err(appAlerts.parseFailed, err)
                     if (caller.api == 'OpenAI' && caller == get.reply) appAlert('openAInotWorking', 'suggestProxy')
-                    else if (caller.status != 'done') api.tryNew(caller)
+                    else api.tryNew(caller)
                 }
 
                 function arrayify(strList) { // for get.related() calls
@@ -3438,7 +3439,7 @@
             if (show.reply.src != 'shuffle' && !get.related.replyIsQuestion && /[?？]/.test(currentReply)) {
                 get.related.replyIsQuestion = true
                 get.related(currentReply).then(queries => show.related(queries))
-                    .catch(err => { log.err(err.message) ; if (get.related.status != 'done') api.tryNew(get.related) })
+                    .catch(err => { log.err(err.message) ; api.tryNew(get.related) })
             }
 
             // Show the queries
@@ -3620,7 +3621,7 @@
             show.reply('standby', footerContent)
             if (!config.rqDisabled)
                 get.related(stripQueryAugments(msgChain)[msgChain.length - 1].content).then(queries => show.related(queries))
-                    .catch(err => { log.err(err.message) ; if (get.related.status != 'done') api.tryNew(get.related) })
+                    .catch(err => { log.err(err.message) ; api.tryNew(get.related) })
     } else { appAlert('waitingResponse') ; get.reply(msgChain) }
 
     // Add key listener to DISMISS modals