Update GPT-4 API from: xiangsx/gpt4free-ts/

apiGPT4/.github/workflows/docker-image.yml

@@ -1,37 +0,0 @@
-# docker-image.yml
-name: Publish Docker image   # workflow名称，可以在Github项目主页的【Actions】中看到所有的workflow
-
-on:   # 配置触发workflow的事件
-  push:
-    tags:       # tag更新时触发此workflow
-      - '*'
-
-jobs:  # workflow中的job
-
-  push_to_registry:  # job的名字
-    name: Push Docker image to Docker Hub
-    runs-on: ubuntu-latest   # job运行的基础环境
-
-    steps:  # 一个job由一个或多个step组成
-      - name: Check out the repo
-        uses: actions/checkout@v2   # 官方的action，获取代码
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v1  # 三方的action操作， 执行docker login
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}  # 配置dockerhub的认证，在Github项目主页 【Settings】 -> 【Secrets】 添加对应变量
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v3  # 抽取项目信息，主要是镜像的tag
-        with:
-          images: xiangsx/gpt4free-ts
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v2 # docker build & push
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

apiGPT4/model/forefront/index.ts

@@ -1,6 +1,6 @@
 import {Chat, ChatOptions, Request, Response, ResponseStream} from "../base";
 import {Browser, Page} from "puppeteer";
-import {BrowserPool} from "../../pool/puppeteer";
+import {BrowserPool, BrowserUser} from "../../pool/puppeteer";
 import {CreateEmail, TempEmailType, TempMailMessage} from "../../utils/emailFactory";
 import {CreateTlsProxy} from "../../utils/proxyAgent";
 import * as fs from "fs";
@@ -87,7 +87,7 @@ class AccountPool {
 }
 
 
-export class Forefrontnew extends Chat {
+export class Forefrontnew extends Chat implements BrowserUser<Account>{
     private pagePool: BrowserPool<Account>;
     private accountPool: AccountPool;
 
@@ -95,8 +95,7 @@ export class Forefrontnew extends Chat {
         super(options);
         this.accountPool = new AccountPool();
         const maxSize = +(process.env.POOL_SIZE || 2);
-        const initialAccounts = this.accountPool.multiGet(maxSize);
-        this.pagePool = new BrowserPool<Account>(maxSize, initialAccounts.map(item => item.id), this.init.bind(this));
+        this.pagePool = new BrowserPool<Account>(maxSize, this);
     }
 
     public async ask(req: Request): Promise<Response> {
@@ -139,8 +138,30 @@ export class Forefrontnew extends Chat {
     }
 
     private static async closeVIPPop(page: Page) {
-        await page.waitForSelector('.flex > .w-full:nth-child(1) > .grid:nth-child(2) > .flex > .text-sm')
-        await page.click('.flex > .w-full:nth-child(1) > .grid:nth-child(2) > .flex > .text-sm')
+        try {
+            await page.waitForSelector('.flex > .w-full:nth-child(1) > .grid:nth-child(2) > .flex > .text-sm', {timeout: 15 * 1000})
+            await page.click('.flex > .w-full:nth-child(1) > .grid:nth-child(2) > .flex > .text-sm')
+        } catch (e) {
+            console.log('not need close vip');
+        }
+    }
+
+    private static async closeWelcomePop(page: Page) {
+        try {
+            await page.waitForSelector('.flex > .modal > .modal-box > .flex > .px-3:nth-child(1)', {timeout: 120 * 1000})
+            await page.click('.flex > .modal > .modal-box > .flex > .px-3:nth-child(1)')
+        } catch (e) {
+            console.log('not need close welcome pop');
+        }
+    }
+
+    deleteID(id: string): void {
+        this.accountPool.delete(id);
+    }
+
+    newID(): string {
+        const account = this.accountPool.get();
+        return account.id;
     }
 
     private static async selectAssistant(page: Page) {
@@ -209,7 +230,7 @@ export class Forefrontnew extends Chat {
         }));
     }
 
-    private async init(id: string, browser: Browser): Promise<[Page | undefined, Account, string]> {
+    async init(id: string, browser: Browser): Promise<[Page | undefined, Account]> {
         const account = this.accountPool.getByID(id);
         try {
             if (!account) {
@@ -223,7 +244,7 @@ export class Forefrontnew extends Chat {
                 await Forefrontnew.closeVIPPop(page);
                 await Forefrontnew.switchToGpt4(page);
                 await this.allowClipboard(browser, page);
-                return [page, account, account.id];
+                return [page, account];
             }
             await page.goto("https://accounts.forefront.ai/sign-up");
             await page.setViewport({width: 1920, height: 1080});
@@ -256,18 +277,15 @@ export class Forefrontnew extends Chat {
             console.log('register successfully');
             account.login_time = moment().format(TimeFormat);
             this.accountPool.syncfile();
-            await page.waitForSelector('.flex > .modal > .modal-box > .flex > .px-3:nth-child(1)', {timeout: 120000})
-            await page.click('.flex > .modal > .modal-box > .flex > .px-3:nth-child(1)')
+            await Forefrontnew.closeWelcomePop(page);
             await Forefrontnew.closeVIPPop(page);
             await page.waitForSelector('.relative > .flex > .w-full > .text-th-primary-dark > div', {timeout: 120000})
             await Forefrontnew.switchToGpt4(page);
             await this.allowClipboard(browser, page);
-            return [page, account, account.id];
+            return [page, account];
         } catch (e) {
             console.warn('something error happened,err:', e);
-            this.accountPool.delete(account?.id || "")
-            const newAccount = this.accountPool.get();
-            return [undefined, this.accountPool.get(), newAccount.id] as any;
+            return [] as any;
         }
     }
 
@@ -301,8 +319,7 @@ export class Forefrontnew extends Chat {
             const md = mdList;
         } catch (e) {
             console.error(e);
-            const newAccount = this.accountPool.get();
-            destroy(newAccount.id);
+            destroy();
             pt.write("error", 'some thing error, try again later');
             pt.end();
             return {text: pt.stream}
@@ -346,8 +363,7 @@ export class Forefrontnew extends Chat {
                     account.gpt4times = 0;
                     account.last_use_time = moment().format(TimeFormat);
                     this.accountPool.syncfile();
-                    const newAccount = this.accountPool.get();
-                    destroy(newAccount.id);
+                    destroy();
                 } else {
                     done(account);
                 }

apiGPT4/pool/puppeteer.ts

@@ -17,63 +17,88 @@ export interface PageInfo<T> {
     data?: T;
 }
 
-type PrepareFunc<T> = (id: string, browser: Browser) => Promise<[Page | undefined, T, string]>
+type PrepareFunc<T> = (id: string, browser: Browser) => Promise<[Page | undefined, T]>
+
+export interface BrowserUser<T> {
+    init: PrepareFunc<T>;
+    newID: () => string
+    deleteID: (id: string) => void
+}
 
 export class BrowserPool<T> {
     private readonly pool: PageInfo<T>[] = [];
     private readonly size: number;
-    private readonly prepare: PrepareFunc<T>
+    private readonly user: BrowserUser<T>
 
-    constructor(size: number, initialIDs: string[], prepare: PrepareFunc<T>) {
+    constructor(size: number, user: BrowserUser<T>) {
         this.size = size
-        this.prepare = prepare;
-        this.init(initialIDs);
+        this.user = user;
+        this.init();
     }
 
-    init(initialIDs: string[]) {
+    init() {
         for (let i = 0; i < this.size; i++) {
-            const id = initialIDs[i];
+            const id = this.user.newID();
             const info: PageInfo<T> = {
                 id,
                 ready: false,
             }
-            this.initOne(id).then(([page, data, newID]) => {
-                if (!page) {
-                    return;
-                }
-                info.id = newID;
-                info.page = page;
-                info.data = data;
-                info.ready = true;
-            }).catch(e => {
-                console.error(e);
-            })
             this.pool.push(info)
+            this.initOne(id).then()
+        }
+    }
+
+    find(id: string): PageInfo<T> | undefined {
+        for (const info of this.pool) {
+            if (info.id === id) {
+                return info;
+            }
         }
     }
 
-    async initOne(id: string): Promise<[Page, T, string]> {
+    async initOne(id: string): Promise<void> {
+        const info = this.find(id);
+        if (!info) {
+            console.error('init one failed, not found info');
+            return;
+        }
         const options: PuppeteerLaunchOptions = {
             headless: process.env.DEBUG === "1" ? false : 'new',
             args: ['--no-sandbox', '--disable-setuid-sandbox'],
-            userDataDir: `run/${id}`,
+            userDataDir: `run/${info.id}`,
         };
-        const browser = await puppeteer.launch(options);
-        const [page, data, newID] = await this.prepare(id, browser)
-        if (!page) {
-            console.log(`init ${id} failed, delete! init new ${newID}`);
-            await browser.close();
+        try {
+            const browser = await puppeteer.launch(options);
+            const [page, data] = await this.user.init(info.id, browser);
+            if (!page) {
+                const newID = this.user.newID();
+                console.warn(`init ${info.id} failed, delete! init new ${newID}`);
+                await browser.close();
+                if (options.userDataDir) {
+                    fs.rmdirSync(options.userDataDir, {recursive: true});
+                }
+                await sleep(5000);
+                info.id = newID;
+                return await this.initOne(info.id);
+            }
+            info.page = page;
+            info.data = data
+            info.ready = true;
+        } catch (e) {
+            console.error('init one failed, err:', e);
+            const newID = this.user.newID();
+            console.warn(`init ${info.id} failed, delete! init new ${newID}`);
             if (options.userDataDir) {
                 fs.rmdirSync(options.userDataDir, {recursive: true});
             }
             await sleep(5000);
-            return this.initOne(newID);
+            info.id = newID;
+            return await this.initOne(info.id);
         }
-        return [page, data, newID];
     }
 
     //@ts-ignore
-    get(): [page: Page | undefined, data: T | undefined, done: (data: T) => void, destroy: (newID: string) => void] {
+    get(): [page: Page | undefined, data: T | undefined, done: (data: T) => void, destroy: () => void] {
         for (const item of shuffleArray(this.pool)) {
             if (item.ready) {
                 item.ready = false;
@@ -84,14 +109,11 @@ export class BrowserPool<T> {
                         item.ready = true
                         item.data = data;
                     },
-                    (newID: string) => {
+                    () => {
                         item.page?.close();
-                        this.initOne(newID).then(([page, data, newID]) => {
-                            item.id = newID;
-                            item.page = page
-                            item.data = data;
-                            item.ready = true;
-                        })
+                        this.user.deleteID(item.id);
+                        item.id = this.user.newID();
+                        this.initOne(item.id).then();
                     }
                 ]
             }