@soga/baidu-ua 0.1.14 → 0.1.23

package/dist/main.d.ts

@@ -1,6 +1,5 @@
-export declare const getBaiduUA: (host_id: number, is_large_file: boolean) => Promise<{
+export declare const getBaiduUA: (host_id: number, file_size?: number) => Promise<{
     ua: string;
     finishBaiduUA: () => void;
 }>;
 export declare const resetBaiduUA: (app_ua_list: string[], web_ua_list: string[]) => void;
-export declare const removeBaiduUA: (host_id: number) => void;

package/dist/main.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeBaiduUA = exports.resetBaiduUA = exports.getBaiduUA = void 0;
+exports.resetBaiduUA = exports.getBaiduUA = void 0;
 const userAgents = {
     app: [
         'netdisk;4.46.6;PC;PC-Mac',
@@ -27,7 +27,7 @@ class BaiduUA {
                 ua,
                 is_web: false,
                 start_time: 0,
-                order_time: Date.now(),
+                finish_time: Date.now(),
             };
         }
         for (const ua of web_ua_list) {
@@ -35,11 +35,16 @@ class BaiduUA {
                 ua,
                 is_web: true,
                 start_time: 0,
-                order_time: Date.now(),
+                finish_time: Date.now(),
             };
         }
     }
+    getting = false;
     async getBest(is_large_file) {
+        while (this.getting) {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+        }
+        this.getting = true;
         const list = is_large_file
             ? Object.values(this.ua_map).filter((item) => !item.is_web)
             : Object.values(this.ua_map);
@@ -48,36 +53,40 @@ class BaiduUA {
         if (free_list.length > 0) {
             const web_list = free_list.filter((item) => item.is_web);
             if (web_list.length > 0) {
-                const sorted_list = web_list.sort((a, b) => a.order_time - b.order_time);
+                const sorted_list = web_list.sort((a, b) => a.finish_time - b.finish_time);
                 item = sorted_list[0];
             }
             else {
-                const sorted_list = free_list.sort((a, b) => a.order_time - b.order_time);
+                const sorted_list = free_list.sort((a, b) => a.finish_time - b.finish_time);
                 item = sorted_list[0];
             }
         }
         else {
-            const sorted_list = list.sort((a, b) => a.order_time - b.order_time);
-            item = sorted_list[0];
-            await new Promise((resolve) => {
-                let times = 0;
-                const interval = setInterval(() => {
-                    if (item.start_time == 0 || times++ > 80) {
-                        clearInterval(interval);
-                        resolve(null);
-                    }
-                }, 100);
-            });
+            let times = 0;
+            while (list.filter((item) => item.start_time == 0).length < 1 &&
+                times++ < 50) {
+                await new Promise((resolve) => setTimeout(resolve, 400));
+            }
+            const free_list = list
+                .filter((item) => item.start_time == 0)
+                .sort((a, b) => a.finish_time - b.finish_time);
+            if (free_list.length > 0) {
+                item = free_list[0];
+            }
+            else {
+                const sorted_list = list.sort((a, b) => a.finish_time - b.finish_time);
+                item = sorted_list[0];
+            }
         }
         item.start_time = Date.now();
-        console.log('get best ua: ', item.ua.slice(0, 24));
+        this.getting = false;
         return item;
     }
     finishUA(ua) {
         if (!this.ua_map[ua])
             return;
         this.ua_map[ua].start_time = 0;
-        this.ua_map[ua].order_time = Date.now();
+        this.ua_map[ua].finish_time = Date.now();
     }
 }
 const instanceMap = new Map();
@@ -87,8 +96,9 @@ const getInstance = (host_id) => {
     }
     return instanceMap.get(host_id);
 };
-const getBaiduUA = async (host_id, is_large_file) => {
+const getBaiduUA = async (host_id, file_size = Infinity) => {
     const ins = getInstance(host_id);
+    const is_large_file = file_size >= 50 * 1024 * 1024;
     const { ua } = await ins.getBest(is_large_file);
     return {
         ua,
@@ -106,7 +116,3 @@ const resetBaiduUA = (app_ua_list, web_ua_list) => {
     });
 };
 exports.resetBaiduUA = resetBaiduUA;
-const removeBaiduUA = (host_id) => {
-    instanceMap.delete(host_id);
-};
-exports.removeBaiduUA = removeBaiduUA;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@soga/baidu-ua",
-  "version": "0.1.14",
+  "version": "0.1.23",
   "publishConfig": {
     "access": "public"
   },
@@ -31,5 +31,5 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "gitHead": "99f8fe90e0f34b6a645e6b2c6682071f74c9a0dc"
+  "gitHead": "4a8d47620964c62bbbcdb10ed7cc2b177c4a10e6"
 }