@iflyrpa/share 0.0.18 → 0.0.19-beta.0

package/dist/index.js

@@ -43,11 +43,12 @@ __webpack_require__.d(__webpack_exports__, {
     pathExists: ()=>pathExists,
     randomString: ()=>randomString,
     ensureFile: ()=>ensureFile,
-    sleep: ()=>sleep,
     fetchJSON: ()=>fetchJSON,
+    sleep: ()=>sleep,
     ElectronCookieSchema: ()=>ElectronCookieSchema,
     getFilenameFromUrl: ()=>getFilenameFromUrl,
     success: ()=>success,
+    LocalStorageBaseSchema: ()=>LocalStorageBaseSchema,
     TaskState: ()=>types_TaskState,
     ensureFileSync: ()=>ensureFileSync,
     isNil: ()=>isNil,
@@ -58,6 +59,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
+const external_node_http_namespaceObject = require("node:http");
+var external_node_http_default = /*#__PURE__*/ __webpack_require__.n(external_node_http_namespaceObject);
 const external_node_https_namespaceObject = require("node:https");
 var external_node_https_default = /*#__PURE__*/ __webpack_require__.n(external_node_https_namespaceObject);
 const external_node_path_namespaceObject = require("node:path");
@@ -166,14 +169,36 @@ function ensureFile(filePath) {
         }
     });
 }
-async function downloadImage(url, savePath) {
+async function downloadImage(url, savePath, retries = 3) {
+    const RETRYABLE_CODES = new Set([
+        "ECONNRESET",
+        "ETIMEDOUT",
+        "EAI_AGAIN",
+        "ENOTFOUND"
+    ]);
+    try {
+        return await downloadImageOnce(url, savePath);
+    } catch (err) {
+        var _err_extra;
+        const errCode = (null == err ? void 0 : err.code) ?? (null == err ? void 0 : null === (_err_extra = err.extra) || void 0 === _err_extra ? void 0 : _err_extra.code);
+        if (retries > 0 && (RETRYABLE_CODES.has(errCode) || (null == err ? void 0 : err.code) === 500)) {
+            console.warn(`downloadImage 失败，剩余重试次数 ${retries}，url: ${url}，原因:`, (null == err ? void 0 : err.message) ?? err);
+            await new Promise((r)=>setTimeout(r, 1000));
+            return downloadImage(url, savePath, retries - 1);
+        }
+        throw err;
+    }
+}
+async function downloadImageOnce(url, savePath) {
     await ensureFile(savePath);
     return new Promise((resolve, reject)=>{
         const handleResponse = (response)=>{
             if (301 === response.statusCode || 302 === response.statusCode) {
                 const redirectUrl = response.headers.location;
-                if (redirectUrl) external_node_https_default().get(redirectUrl, handleResponse).on("error", handleError);
-                else reject({
+                if (redirectUrl) {
+                    const redirectFn = redirectUrl.startsWith("http://") ? external_node_http_default().get : external_node_https_default().get;
+                    redirectFn(redirectUrl, handleResponse).on("error", handleError);
+                } else reject({
                     code: 414,
                     message: `图片下载失败: 跳转地址 Url：${url} 无效`
                 });
@@ -244,12 +269,13 @@ async function downloadImage(url, savePath) {
             };
             reject(customMessage);
         };
-        const req = external_node_https_default().get(url, handleResponse);
+        const requestFn = url.startsWith("http://") ? external_node_http_default().get : external_node_https_default().get;
+        const req = requestFn(url, handleResponse);
         req.setTimeout(10000, ()=>{
             req.destroy();
             reject({
                 code: 500,
-                message: "图片下载超时，请检查网络连接或稍后重试!"
+                message: `图片下载超时 (${url})，请检查网络连接或稍后重试!`
             });
         });
         req.on("error", handleError);
@@ -3623,6 +3649,10 @@ const ElectronCookieSchema = CookieBaseSchema.extend({
         "strict"
     ]).optional()
 });
+const LocalStorageBaseSchema = schemas_object({
+    key: schemas_string(),
+    value: schemas_string()
+}).catchall(unknown());
 var types_TaskState = /*#__PURE__*/ function(TaskState) {
     TaskState["INIT"] = "INIT";
     TaskState["ACTION"] = "ACTION";

package/dist/index.mjs

@@ -1,4 +1,5 @@
 import * as __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__ from "node:fs";
+import * as __WEBPACK_EXTERNAL_MODULE_node_http_2dc67212__ from "node:http";
 import * as __WEBPACK_EXTERNAL_MODULE_node_https_626f33a7__ from "node:https";
 import * as __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__ from "node:path";
 function pathExists(path) {
@@ -105,14 +106,36 @@ function ensureFile(filePath) {
         }
     });
 }
-async function downloadImage(url, savePath) {
+async function downloadImage(url, savePath, retries = 3) {
+    const RETRYABLE_CODES = new Set([
+        "ECONNRESET",
+        "ETIMEDOUT",
+        "EAI_AGAIN",
+        "ENOTFOUND"
+    ]);
+    try {
+        return await downloadImageOnce(url, savePath);
+    } catch (err) {
+        var _err_extra;
+        const errCode = (null == err ? void 0 : err.code) ?? (null == err ? void 0 : null === (_err_extra = err.extra) || void 0 === _err_extra ? void 0 : _err_extra.code);
+        if (retries > 0 && (RETRYABLE_CODES.has(errCode) || (null == err ? void 0 : err.code) === 500)) {
+            console.warn(`downloadImage 失败，剩余重试次数 ${retries}，url: ${url}，原因:`, (null == err ? void 0 : err.message) ?? err);
+            await new Promise((r)=>setTimeout(r, 1000));
+            return downloadImage(url, savePath, retries - 1);
+        }
+        throw err;
+    }
+}
+async function downloadImageOnce(url, savePath) {
     await ensureFile(savePath);
     return new Promise((resolve, reject)=>{
         const handleResponse = (response)=>{
             if (301 === response.statusCode || 302 === response.statusCode) {
                 const redirectUrl = response.headers.location;
-                if (redirectUrl) __WEBPACK_EXTERNAL_MODULE_node_https_626f33a7__["default"].get(redirectUrl, handleResponse).on("error", handleError);
-                else reject({
+                if (redirectUrl) {
+                    const redirectFn = redirectUrl.startsWith("http://") ? __WEBPACK_EXTERNAL_MODULE_node_http_2dc67212__["default"].get : __WEBPACK_EXTERNAL_MODULE_node_https_626f33a7__["default"].get;
+                    redirectFn(redirectUrl, handleResponse).on("error", handleError);
+                } else reject({
                     code: 414,
                     message: `图片下载失败: 跳转地址 Url：${url} 无效`
                 });
@@ -183,12 +206,13 @@ async function downloadImage(url, savePath) {
             };
             reject(customMessage);
         };
-        const req = __WEBPACK_EXTERNAL_MODULE_node_https_626f33a7__["default"].get(url, handleResponse);
+        const requestFn = url.startsWith("http://") ? __WEBPACK_EXTERNAL_MODULE_node_http_2dc67212__["default"].get : __WEBPACK_EXTERNAL_MODULE_node_https_626f33a7__["default"].get;
+        const req = requestFn(url, handleResponse);
         req.setTimeout(10000, ()=>{
             req.destroy();
             reject({
                 code: 500,
-                message: "图片下载超时，请检查网络连接或稍后重试!"
+                message: `图片下载超时 (${url})，请检查网络连接或稍后重试!`
             });
         });
         req.on("error", handleError);
@@ -3562,6 +3586,10 @@ const ElectronCookieSchema = CookieBaseSchema.extend({
         "strict"
     ]).optional()
 });
+const LocalStorageBaseSchema = schemas_object({
+    key: schemas_string(),
+    value: schemas_string()
+}).catchall(unknown());
 var types_TaskState = /*#__PURE__*/ function(TaskState) {
     TaskState["INIT"] = "INIT";
     TaskState["ACTION"] = "ACTION";
@@ -3573,4 +3601,4 @@ var types_TaskState = /*#__PURE__*/ function(TaskState) {
     TaskState["TIMEOUT"] = "TIMEOUT";
     return TaskState;
 }({});
-export { CookieBaseSchema, ElectronCookieSchema, types_TaskState as TaskState, downloadImage, ensureFile, ensureFileSync, fetchJSON, getFilenameFromUrl, isNil, pathExists, randomString, utils_response as response, semver, sleep, success, writeFile };
+export { CookieBaseSchema, ElectronCookieSchema, LocalStorageBaseSchema, types_TaskState as TaskState, downloadImage, ensureFile, ensureFileSync, fetchJSON, getFilenameFromUrl, isNil, pathExists, randomString, utils_response as response, semver, sleep, success, writeFile };

package/dist/types.d.ts

@@ -32,9 +32,16 @@ export declare const ElectronCookieSchema: z.ZodObject<{
 }, z.core.$catchall<z.ZodUnknown>>;
 export type ElectronCookiesSetDetails = z.infer<typeof ElectronCookieSchema>;
 export type CookieMap = ElectronCookiesSetDetails[];
+export declare const LocalStorageBaseSchema: z.ZodObject<{
+    key: z.ZodString;
+    value: z.ZodString;
+}, z.core.$catchall<z.ZodUnknown>>;
+export type LocalStorageBase = z.infer<typeof LocalStorageBaseSchema>;
+export type LocalStorageBaseMap = LocalStorageBase[];
 export interface PageParams {
     url: string;
     cookies?: CookieBaseMap;
+    localStorage?: LocalStorageBaseMap;
     userAgent?: string;
     viewport?: {
         width: number;
@@ -99,9 +106,11 @@ export interface PodImagesData {
 }
 export interface SteelConnector {
     getProxyUrl(sessionId: string, path: string): string;
+    getLive(sessionId: string): Promise<string>;
 }
 export interface AutomateTask {
     debug?: boolean;
+    enverionment?: "development" | "production";
     cachePath: string;
     forceUpdate?: boolean;
     logger: LoggerImplement;

package/dist/utils.d.ts

@@ -8,7 +8,7 @@ export declare const semver: {
 export declare function fetchJSON<T>(url: string): Promise<T>;
 export declare function isNil(value: unknown): value is null | undefined;
 export declare function ensureFile(filePath: string): Promise<void>;
-export declare function downloadImage(url: string, savePath: string): Promise<string>;
+export declare function downloadImage(url: string, savePath: string, retries?: number): Promise<string>;
 export declare function getFilenameFromUrl(imageUrl: string): string;
 export declare const sleep: (ms: number) => Promise<unknown>;
 export declare const success: <T>(data: T, message?: string) => ResponseData<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iflyrpa/share",
-  "version": "0.0.18",
+  "version": "0.0.19-beta.0",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",