fix: issue with re-logging

Author: yaroslav-n

lib/background.js

@@ -19,6 +19,9 @@ class ChatGPTClient {
     async generateTweet(props, repeat = true) {
         const gptToken = await this.getToken();
         if (!gptToken) {
+            if (repeat) { // repeat only once
+                return this.generateTweet(props, false);
+            }
             return undefined;
         }
         let tweet = undefined;
@@ -33,6 +36,7 @@ class ChatGPTClient {
             });
             if (response.status === 403) {
                 console.error(response.body);
+                await chrome.storage.local.remove("gpt_token");
                 this.gptToken = undefined;
                 const newToken = await this.getToken();
                 if (newToken && repeat) { // repeat only once
@@ -91,11 +95,11 @@ class ChatGPTClient {
         if (!this.gptToken) {
             var chatUrl = "https://tweetgpt.app/";
             chrome.windows.create({ url: chatUrl });
-            return Promise.race([
+            await Promise.race([
                 new Promise((resolve) => {
                     this.waitForTokenCallback = resolve;
                 }),
-                wait(15000).then(() => {
+                wait(20000).then(() => {
                     this.waitForTokenCallback = undefined;
                     return undefined;
                 })

lib/inject_main.js

@@ -1,11 +1,11 @@
 {
-    "name": "tweetGPT",
+    "name": "TweetGPT",
     "action": {
       "default_popup": "./src/popup/popup.html"
     },
     "manifest_version": 3,
-    "version": "2.0.1",
-    "description": "Writes tweets with chatGPT",
+    "version": "2.0.2",
+    "description": "Helps writing tweets using chatGPT",
     "permissions": [
       "storage",
       "scripting"

manifest.json

@@ -19,6 +19,9 @@ export class ChatGPTClient {
     async generateTweet(props: TweetProps, repeat: boolean = true): Promise<string | undefined> {
         const gptToken = await this.getToken();
         if (!gptToken) {
+            if (repeat) { // repeat only once
+                return this.generateTweet(props, false);
+            }
             return undefined;
         }
 
@@ -35,6 +38,7 @@ export class ChatGPTClient {
 
             if (response.status === 403) {
                 console.error(response.body);
+                await chrome.storage.local.remove("gpt_token")
                 this.gptToken = undefined;
                 const newToken = await this.getToken();
                 if (newToken && repeat) { // repeat only once
@@ -105,11 +109,11 @@ export class ChatGPTClient {
             var chatUrl = "https://tweetgpt.app/";
             chrome.windows.create({ url: chatUrl });
 
-            return Promise.race([
+            await Promise.race([
                 new Promise<string>((resolve) => {
                     this.waitForTokenCallback = resolve;
                 }),
-                wait(15000).then(() => { // 15s timeout for user to login
+                wait(20000).then(() => { // 20s timeout for user to login
                     this.waitForTokenCallback = undefined;
                     return undefined;
                 })
@@ -118,4 +122,4 @@ export class ChatGPTClient {
 
         return this.gptToken;
     }
-}   
+}

src/background/chat_gpt_client/chat_gpt_client.ts

@@ -4,7 +4,6 @@ module.exports = {
   mode: "production",
   entry: {
     inject: "./src/inject/inject.ts",
-    inject_main: "./src/inject/inject_main.ts",
     inject_tweetgpt_main: './src/inject/inject_tweetgpt_main.ts',
     inject_tweetgpt: './src/inject/inject_tweetgpt.ts',
     background: "./src/background/background.ts",