@pisell/pisellos 2.2.282 → 2.2.284

package/lib/plugins/request.js

@@ -1,98 +1,101 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/plugins/request.ts
-var request_exports = {};
-__export(request_exports, {
-  RequestError: () => RequestError,
-  RequestModeENUM: () => RequestModeENUM,
-  default: () => request_default
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(request_exports);
-var RequestModeENUM = /* @__PURE__ */ ((RequestModeENUM2) => {
-  RequestModeENUM2["LOCAL"] = "local";
-  RequestModeENUM2["REMOTE"] = "remote";
-  RequestModeENUM2["LOCAL_REMOTE"] = "local_remote";
-  RequestModeENUM2["REMOTE_LOCAL"] = "remote_local";
-  RequestModeENUM2["OS_SERVER"] = "os_server";
-  return RequestModeENUM2;
-})(RequestModeENUM || {});
-var RequestError = class extends Error {
+exports.default = exports.RequestModeENUM = exports.RequestError = void 0;
+/**
+ * RequestPlugin 接口定义
+ */
+let RequestModeENUM = exports.RequestModeENUM = /*#__PURE__*/function (RequestModeENUM) {
+  RequestModeENUM["LOCAL"] = "local";
+  RequestModeENUM["REMOTE"] = "remote";
+  RequestModeENUM["LOCAL_REMOTE"] = "local_remote";
+  RequestModeENUM["REMOTE_LOCAL"] = "remote_local";
+  RequestModeENUM["OS_SERVER"] = "os_server";
+  return RequestModeENUM;
+}({}); // 请求模式
+/**
+ * 请求配置
+ */
+/**
+ * 响应接口
+ */
+/**
+ * 请求错误
+ */
+class RequestError extends Error {
+  response;
+  request;
+  config;
   constructor(message, config, request, response) {
     super(message);
-    this.name = "RequestError";
+    this.name = 'RequestError';
     this.config = config;
     this.request = request;
     this.response = response;
   }
-};
-var RequestPluginImpl = class {
-  constructor() {
-    this.name = "request";
-    this.version = "1.0.0";
-    this.core = null;
-    /**
-     * 默认请求选项
-     */
-    this.defaultOptions = {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json"
-      },
-      timeout: 3e4,
-      responseType: "json"
-    };
-    /**
-     * 全局拦截器
-     */
-    this.interceptors = {
-      request: [],
-      response: [],
-      error: []
-    };
-  }
+}
+
+/**
+ * RequestPlugin 实现
+ */
+exports.RequestError = RequestError;
+class RequestPluginImpl {
+  name = 'request';
+  version = '1.0.0';
+  core = null;
+
+  /**
+   * 默认请求选项
+   */
+  defaultOptions = {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    timeout: 30000,
+    responseType: 'json'
+  };
+
+  /**
+   * 全局拦截器
+   */
+  interceptors = {
+    request: [],
+    response: [],
+    error: []
+  };
+
   // 初始化方法
   initialize() {
     this.core = globalThis.pisellOS;
-    console.log("[RequestPlugin] 初始化完成");
   }
+
   // 销毁方法
-  destroy() {
-    console.log("[RequestPlugin] 已销毁");
-  }
+  destroy() {}
+
   /**
    * 添加请求拦截器
    */
   addRequestInterceptor(interceptor) {
     this.interceptors.request.push(interceptor);
   }
+
   /**
    * 添加响应拦截器
    */
   addResponseInterceptor(interceptor) {
     this.interceptors.response.push(interceptor);
   }
+
   /**
    * 添加错误拦截器
    */
   addErrorInterceptor(interceptor) {
     this.interceptors.error.push(interceptor);
   }
+
   /**
    * GET 请求
    */
@@ -100,9 +103,10 @@ var RequestPluginImpl = class {
     return this.request({
       ...options,
       url,
-      method: "GET"
+      method: 'GET'
     });
   }
+
   /**
    * POST 请求
    */
@@ -110,10 +114,11 @@ var RequestPluginImpl = class {
     return this.request({
       ...options,
       url,
-      method: "POST",
+      method: 'POST',
       data
     });
   }
+
   /**
    * PUT 请求
    */
@@ -121,10 +126,11 @@ var RequestPluginImpl = class {
     return this.request({
       ...options,
       url,
-      method: "PUT",
+      method: 'PUT',
       data
     });
   }
+
   /**
    * DELETE 请求
    */
@@ -132,13 +138,15 @@ var RequestPluginImpl = class {
     return this.request({
       ...options,
       url,
-      method: "DELETE"
+      method: 'DELETE'
     });
   }
+
   /**
    * 通用请求方法
    */
   async request(options) {
+    // 合并默认选项
     let config = {
       ...this.defaultOptions,
       ...options,
@@ -147,54 +155,52 @@ var RequestPluginImpl = class {
         ...options.headers
       }
     };
-    if (!config.headers["authorization"] && this.core) {
-      const windowPlugin = this.core.getPlugin("window");
+    if (!config.headers['authorization'] && this.core) {
+      const windowPlugin = this.core.getPlugin('window');
       if (windowPlugin) {
-        config.headers["authorization"] = windowPlugin.localStorage.getItem("token") || "";
+        config.headers['authorization'] = windowPlugin.localStorage.getItem('token') || '';
       }
     }
+
+    // 应用请求拦截器
     for (const interceptor of this.interceptors.request) {
       try {
         config = await Promise.resolve(interceptor(config));
       } catch (error) {
-        const requestError = error instanceof RequestError ? error : new RequestError(
-          error instanceof Error ? error.message : "请求拦截器错误",
-          config
-        );
+        const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : '请求拦截器错误', config);
+
+        // 应用错误拦截器
         let processedError = requestError;
         for (const errorInterceptor of this.interceptors.error) {
           try {
-            processedError = await Promise.resolve(
-              errorInterceptor(processedError)
-            );
+            processedError = await Promise.resolve(errorInterceptor(processedError));
           } catch (e) {
+            // 忽略错误拦截器中的错误
           }
         }
         throw processedError;
       }
     }
+
+    // 执行请求
     try {
       const response = await this.performRequest(config);
+
+      // 应用响应拦截器
       let processedResponse = response;
       for (const interceptor of this.interceptors.response) {
         try {
-          processedResponse = await Promise.resolve(
-            interceptor(processedResponse)
-          );
+          processedResponse = await Promise.resolve(interceptor(processedResponse));
         } catch (error) {
-          const requestError = error instanceof RequestError ? error : new RequestError(
-            error instanceof Error ? error.message : "响应拦截器错误",
-            config,
-            null,
-            response
-          );
+          const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : '响应拦截器错误', config, null, response);
+
+          // 应用错误拦截器
           let processedError = requestError;
           for (const errorInterceptor of this.interceptors.error) {
             try {
-              processedError = await Promise.resolve(
-                errorInterceptor(processedError)
-              );
+              processedError = await Promise.resolve(errorInterceptor(processedError));
             } catch (e) {
+              // 忽略错误拦截器中的错误
             }
           }
           throw processedError;
@@ -202,22 +208,21 @@ var RequestPluginImpl = class {
       }
       return processedResponse.data;
     } catch (error) {
-      const requestError = error instanceof RequestError ? error : new RequestError(
-        error instanceof Error ? error.message : "请求错误",
-        config
-      );
+      const requestError = error instanceof RequestError ? error : new RequestError(error instanceof Error ? error.message : '请求错误', config);
+
+      // 应用错误拦截器
       let processedError = requestError;
       for (const errorInterceptor of this.interceptors.error) {
         try {
-          processedError = await Promise.resolve(
-            errorInterceptor(processedError)
-          );
+          processedError = await Promise.resolve(errorInterceptor(processedError));
         } catch (e) {
+          // 忽略错误拦截器中的错误
         }
       }
       throw processedError;
     }
   }
+
   /**
    * 执行实际的请求
    * 这里实现了一个基于 fetch API 的请求
@@ -234,32 +239,39 @@ var RequestPluginImpl = class {
       withCredentials
     } = config;
     if (!url) {
-      throw new RequestError("URL不能为空", config);
+      throw new RequestError('URL不能为空', config);
     }
+
+    // 处理 URL 参数
     let fullUrl = url;
     if (params && Object.keys(params).length > 0) {
-      const queryString = Object.entries(params).map(
-        ([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`
-      ).join("&");
-      fullUrl += (url.includes("?") ? "&" : "?") + queryString;
+      const queryString = Object.entries(params).map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`).join('&');
+      fullUrl += (url.includes('?') ? '&' : '?') + queryString;
     }
+
+    // 准备请求选项
     const fetchOptions = {
       method,
       headers: {
         ...headers
       },
-      credentials: withCredentials ? "include" : "same-origin"
+      credentials: withCredentials ? 'include' : 'same-origin'
     };
-    if (data !== void 0 && method !== "GET" && method !== "HEAD") {
+
+    // 处理请求体
+    if (data !== undefined && method !== 'GET' && method !== 'HEAD') {
       if (data instanceof FormData) {
         fetchOptions.body = data;
-        delete fetchOptions.headers["Content-Type"];
-      } else if (typeof data === "object") {
+        // 当使用 FormData 时，删除 Content-Type，让浏览器自动设置
+        delete fetchOptions.headers['Content-Type'];
+      } else if (typeof data === 'object') {
         fetchOptions.body = JSON.stringify(data);
       } else {
         fetchOptions.body = data;
       }
     }
+
+    // 处理超时
     let timeoutId;
     const timeoutPromise = new Promise((_, reject) => {
       if (timeout) {
@@ -269,34 +281,40 @@ var RequestPluginImpl = class {
       }
     });
     try {
-      const fetchPromise = typeof fetch !== "undefined" ? fetch(fullUrl, fetchOptions) : Promise.reject(
-        new RequestError("当前环境不支持 fetch API", config)
-      );
+      // 发起请求，并竞争超时
+      const fetchPromise = typeof fetch !== 'undefined' ? fetch(fullUrl, fetchOptions) : Promise.reject(new RequestError('当前环境不支持 fetch API', config));
       const response = await Promise.race([fetchPromise, timeoutPromise]);
+
+      // 解析响应头
       const responseHeaders = {};
       response.headers.forEach((value, key) => {
         responseHeaders[key] = value;
       });
+
+      // 解析响应内容
       let responseData;
-      if (responseType === "json") {
+      if (responseType === 'json') {
         try {
           responseData = await response.json();
         } catch (e) {
           responseData = await response.text();
         }
-      } else if (responseType === "text") {
+      } else if (responseType === 'text') {
         responseData = await response.text();
-      } else if (responseType === "arraybuffer") {
+      } else if (responseType === 'arraybuffer') {
         responseData = await response.arrayBuffer();
-      } else if (responseType === "blob") {
+      } else if (responseType === 'blob') {
         responseData = await response.blob();
       } else {
+        // 默认尝试 JSON
         try {
           responseData = await response.json();
         } catch (e) {
           responseData = await response.text();
         }
       }
+
+      // 构建响应对象
       const result = {
         data: responseData,
         status: response.status,
@@ -304,25 +322,18 @@ var RequestPluginImpl = class {
         headers: responseHeaders,
         config
       };
+
+      // 处理非成功状态码
       if (!response.ok) {
-        throw new RequestError(
-          `请求失败，状态码: ${response.status}`,
-          config,
-          fetchOptions,
-          result
-        );
+        throw new RequestError(`请求失败，状态码: ${response.status}`, config, fetchOptions, result);
       }
       return result;
     } finally {
+      // 清除超时计时器
       if (timeoutId) {
         clearTimeout(timeoutId);
       }
     }
   }
-};
-var request_default = new RequestPluginImpl();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  RequestError,
-  RequestModeENUM
-});
+}
+var _default = exports.default = new RequestPluginImpl();

package/lib/plugins/shopStore.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/plugins/shopStore.ts
-var shopStore_exports = {};
-module.exports = __toCommonJS(shopStore_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/plugins/user.js

@@ -1,17 +1,5 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/plugins/user.ts
-var user_exports = {};
-module.exports = __toCommonJS(user_exports);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});