@snail-js/api 0.1.19 → 0.1.21

package/README.md

@@ -171,6 +171,13 @@ const data = await send();
     <td>Get</td>
     <td>要启用缓存的方法，默认仅开启Get缓存</td>
   </tr>
+  <tr>
+    <td>serverStatusCodeRule</td>
+    <td><a href="#SnailServerStatusCodeRuleOptions">SnailServerStatusCodeRuleOptions</a></td>
+    <td>否</td>
+    <td>undefined</td>
+    <td>服务端状态码规则，若配置此项，rule函数返回false时会触发错误</td>
+  </tr>
   <tr>
     <td>enableLog</td>
     <td>boolean</td>
@@ -426,6 +433,19 @@ export type VersioningOption =
   | VersioningCustomOption;
 ```
 
+### <a id="SnailServerStatusCodeRuleOptions">SnailServerStatusCodeRuleOptions</a> 类型
+
+```typescript
+export class SnailServerStatusCodeRuleOptions {
+  // 通常服务端会返回一个状态码，当状态码不符合预期时，会抛出错误
+  // 可以使用此选项来定义服务端状态码的规则
+  // 当rule函数返回false时，会触发错误
+  rule: (statusCode: number) => boolean;
+  // response.data中服务端状态码的key，默认为code
+  key?: string;
+}
+```
+
 ### 临时版本修改器`@Version`
 
 - 临时改变方法请求的版本

package/dist/core/snailServer.d.ts

@@ -1,6 +1,6 @@
 import "reflect-metadata";
 import { AxiosInstance } from "axios";
-import { Strategy, ApiInstanceOptions, VersioningOption, CacheStorage, ApiProxy, ResponseData, StandardResponseData, CacheForType } from "../typings";
+import { Strategy, ApiInstanceOptions, VersioningOption, CacheStorage, ApiProxy, ResponseData, StandardResponseData, CacheForType, SnailServerStatusCodeRuleOptions } from "../typings";
 import { SnailApi } from "./snailApi";
 import { SnailSse } from "./snailSse";
 export declare const CacheStorageMap: Map<string, CacheStorage>;
@@ -10,6 +10,7 @@ export declare const ExpireSourceMap: Map<string, Set<string>>;
 export declare const AxiosInstanceMap: Map<string, AxiosInstance>;
 export declare const StrategyMap: Map<string, (new () => Strategy)[]>;
 export declare const VersioningMap: Map<string, VersioningOption>;
+export declare const ServerStatusCodeRuleMap: Map<string, SnailServerStatusCodeRuleOptions>;
 export declare class SnailServer<RT extends ResponseData = Omit<StandardResponseData, "data">, DK extends string = "data"> {
     private Name;
     private BaseURL;
@@ -17,6 +18,7 @@ export declare class SnailServer<RT extends ResponseData = Omit<StandardResponse
     private EnableLog;
     constructor();
     private init;
+    private initServerStatusCodeRule;
     private initLog;
     private initStrategy;
     private initVersioning;

package/dist/core/snailSse.d.ts

@@ -9,12 +9,12 @@ export declare class SnailSse {
     constructor(server: SnailServer);
     private getSseOptions;
     private initVersion;
-    open(): void;
-    close(): void;
+    open: () => void;
+    close: () => void;
     private registerSseEvent;
     private setEvent;
-    on(eventName: string, callback: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
-    off(eventName: string, callback: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
+    on: (eventName: string, callback: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions) => void;
+    off: (eventName: string, callback: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions) => void;
     get url(): string;
     get eventSource(): EventSource | null;
 }

package/dist/snail-api.js

@@ -3727,6 +3727,12 @@ var RequestMethodEnum = /* @__PURE__ */ ((RequestMethodEnum2) => {
   RequestMethodEnum2["OPTIONS"] = "Options";
   return RequestMethodEnum2;
 })(RequestMethodEnum || {});
+class SnailServerStatusCodeRuleOptions {
+  constructor() {
+    __publicField(this, "key");
+    __publicField(this, "rule");
+  }
+}
 var VersioningType = /* @__PURE__ */ ((VersioningType2) => {
   VersioningType2[VersioningType2["Uri"] = 0] = "Uri";
   VersioningType2[VersioningType2["Header"] = 1] = "Header";
@@ -4036,6 +4042,7 @@ class SnailMethod {
       const [serverName] = this.apiInstance.name.split(".");
       const axios2 = AxiosInstanceMap.get(serverName);
       if (!axios2) throw new Error("AxiosInstance not created");
+      const serverStatusCodeRule = ServerStatusCodeRuleMap.get(serverName);
       const strategies = this.getStrategies();
       this.Request = await applyStrategies(this.Request, strategies, "request");
       this.Request = this.applyProgress(this.Request);
@@ -4044,7 +4051,7 @@ class SnailMethod {
         this.propertyKey,
         this.Args
       );
-      console.log("apiurl:", this.apiInstance.url);
+      this.enableLog() && console.log("methodUrl:", this.Request.baseURL, this.Request.url);
       const newUrl = replacePlaceholders(this.Url, params);
       this.Request = {
         ...this.Request,
@@ -4083,11 +4090,23 @@ class SnailMethod {
         }
         this.Response = response;
         this.applyHitSource(serverName);
-        this.emit("success", response.data);
-        this.emit("finish", response.data);
         isSpecial && console.log("isSpecial:", isSpecial);
-        if (isSpecial) return response;
+        if (isSpecial) {
+          this.emit("success", response.data);
+          this.emit("finish", response.data);
+          return response;
+        }
         !isSpecial && console.log("isSpecial:", isSpecial);
+        if (serverStatusCodeRule) {
+          const { key, rule } = serverStatusCodeRule;
+          const statuCodeKey = key ?? "code";
+          const data2 = response.data;
+          if (rule(data2[statuCodeKey])) {
+            this.emit("success", response.data);
+          } else {
+            this.emit("error", response.data);
+          }
+        }
         return response.data;
       } catch (error) {
         this.emit("error", error);
@@ -4157,7 +4176,7 @@ class SnailMethod {
     this.propertyKey = propertyKey.toString();
     this.Args = args ?? [];
     this.init();
-    console.log("url:", this.Url);
+    this.enableLog() && console.log("url:", this.Url);
     this.eventMap = /* @__PURE__ */ new Map();
     this.onceWrapperMap = /* @__PURE__ */ new Map();
     this.eventMap.set("success", /* @__PURE__ */ new Set());
@@ -4179,8 +4198,11 @@ class SnailMethod {
     this.initVersion();
   }
   initUrl() {
-    const url = this.Path == "" ? this.apiInstance.url || "" : `${this.apiInstance.url || ""}${resolveUrl(this.Path)}`;
-    this.Url = url;
+    if (this.Path === "") {
+      this.Url = this.apiInstance.url || "";
+      return;
+    }
+    this.Url = `${this.apiInstance.url || ""}${resolveUrl(this.Path)}`;
   }
   initVersion() {
     const version = Reflect.getMetadata(
@@ -4326,7 +4348,10 @@ class SnailMethod {
       this.propertyKey
     );
     const isApiNoCache = this.apiInstance.noCache;
+    this.enableLog() && console.log("isApiNoCache:", isApiNoCache);
+    this.enableLog() && console.log("isMethodNoCache:", isMethodNoCache);
     const noCacheFlag = isMethodNoCache ? true : isApiNoCache ? true : false;
+    this.enableLog() && console.log("noCacheFlag:", noCacheFlag);
     return flag ? noCacheFlag : true;
   }
   enableLog() {
@@ -4372,6 +4397,7 @@ const ExpireSourceMap = /* @__PURE__ */ new Map();
 const AxiosInstanceMap = /* @__PURE__ */ new Map();
 const StrategyMap = /* @__PURE__ */ new Map();
 const VersioningMap = /* @__PURE__ */ new Map();
+const ServerStatusCodeRuleMap = /* @__PURE__ */ new Map();
 const defaultCacheManageOptions = {
   type: CacheType.Memory,
   ttl: 500
@@ -4400,9 +4426,19 @@ class SnailServer {
   }
   init() {
     const options = this.getServerOptions();
-    const { baseURL, timeout, cacheManage, enableLog, cacheFor } = options;
+    const {
+      baseURL,
+      timeout,
+      cacheManage,
+      enableLog,
+      cacheFor,
+      serverStatusCodeRule
+    } = options;
     this.BaseURL = baseURL ?? resolveUrl("");
     this.initAxios({ baseURL, timeout });
+    if (serverStatusCodeRule) {
+      this.initServerStatusCodeRule(serverStatusCodeRule);
+    }
     this.initStrategy();
     this.initCacheManage(cacheManage, cacheFor);
     this.initVersioning();
@@ -4410,6 +4446,9 @@ class SnailServer {
     this.EnableLog = enableLog ?? false;
     this.initLog(enableLog);
   }
+  initServerStatusCodeRule(ruleOptions) {
+    ServerStatusCodeRuleMap.set(this.name, ruleOptions);
+  }
   initLog(enableLog) {
     if (enableLog) {
       const axiosInstance = AxiosInstanceMap.get(this.Name);
@@ -4681,6 +4720,26 @@ class SnailSse {
     __publicField(this, "_version");
     __publicField(this, "_withCredentials");
     __publicField(this, "_eventSource");
+    __publicField(this, "open", () => {
+      const url = `${this._baseUrl}${this._url}`;
+      const eventSource = new EventSource(url, {
+        withCredentials: this._withCredentials
+      });
+      this._eventSource = eventSource;
+      this.setEvent();
+      this.registerSseEvent();
+    });
+    __publicField(this, "close", () => {
+      const eventSource = this.eventSource;
+      if (!eventSource) return;
+      eventSource.close();
+    });
+    __publicField(this, "on", (eventName, callback, options) => {
+      this._eventSource && this._eventSource.addEventListener(eventName, callback, options);
+    });
+    __publicField(this, "off", (eventName, callback, options) => {
+      this._eventSource && this._eventSource.removeEventListener(eventName, callback, options);
+    });
     this._serverInstance = server;
     this._baseUrl = server.baseUrl;
     const options = this.getSseOptions();
@@ -4721,20 +4780,6 @@ class SnailSse {
       return;
     }
   }
-  open() {
-    const url = `${this._baseUrl}${this._url}`;
-    const eventSource = new EventSource(url, {
-      withCredentials: this._withCredentials
-    });
-    this._eventSource = eventSource;
-    this.setEvent();
-    this.registerSseEvent();
-  }
-  close() {
-    const eventSource = this.eventSource;
-    if (!eventSource) return;
-    eventSource.close();
-  }
   registerSseEvent() {
     const eventSource = this._eventSource;
     if (!eventSource) return;
@@ -4762,12 +4807,6 @@ class SnailSse {
       this._eventSource && (this._eventSource.onerror = onErrorFunc);
     }
   }
-  on(eventName, callback, options) {
-    this._eventSource && this._eventSource.addEventListener(eventName, callback, options);
-  }
-  off(eventName, callback, options) {
-    this._eventSource && this._eventSource.removeEventListener(eventName, callback, options);
-  }
   get url() {
     return this._url;
   }
@@ -4800,6 +4839,7 @@ export {
   SnailMethod,
   SnailPass,
   SnailServer,
+  SnailServerStatusCodeRuleOptions,
   SnailSse,
   Sse,
   SseEvent,

package/dist/snail-api.umd.cjs

@@ -3731,6 +3731,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     RequestMethodEnum2["OPTIONS"] = "Options";
     return RequestMethodEnum2;
   })(RequestMethodEnum || {});
+  class SnailServerStatusCodeRuleOptions {
+    constructor() {
+      __publicField(this, "key");
+      __publicField(this, "rule");
+    }
+  }
   var VersioningType = /* @__PURE__ */ ((VersioningType2) => {
     VersioningType2[VersioningType2["Uri"] = 0] = "Uri";
     VersioningType2[VersioningType2["Header"] = 1] = "Header";
@@ -4040,6 +4046,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         const [serverName] = this.apiInstance.name.split(".");
         const axios2 = AxiosInstanceMap.get(serverName);
         if (!axios2) throw new Error("AxiosInstance not created");
+        const serverStatusCodeRule = ServerStatusCodeRuleMap.get(serverName);
         const strategies = this.getStrategies();
         this.Request = await applyStrategies(this.Request, strategies, "request");
         this.Request = this.applyProgress(this.Request);
@@ -4048,7 +4055,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           this.propertyKey,
           this.Args
         );
-        console.log("apiurl:", this.apiInstance.url);
+        this.enableLog() && console.log("methodUrl:", this.Request.baseURL, this.Request.url);
         const newUrl = replacePlaceholders(this.Url, params);
         this.Request = {
           ...this.Request,
@@ -4087,11 +4094,23 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           }
           this.Response = response;
           this.applyHitSource(serverName);
-          this.emit("success", response.data);
-          this.emit("finish", response.data);
           isSpecial && console.log("isSpecial:", isSpecial);
-          if (isSpecial) return response;
+          if (isSpecial) {
+            this.emit("success", response.data);
+            this.emit("finish", response.data);
+            return response;
+          }
           !isSpecial && console.log("isSpecial:", isSpecial);
+          if (serverStatusCodeRule) {
+            const { key, rule } = serverStatusCodeRule;
+            const statuCodeKey = key ?? "code";
+            const data2 = response.data;
+            if (rule(data2[statuCodeKey])) {
+              this.emit("success", response.data);
+            } else {
+              this.emit("error", response.data);
+            }
+          }
           return response.data;
         } catch (error) {
           this.emit("error", error);
@@ -4161,7 +4180,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.propertyKey = propertyKey.toString();
       this.Args = args ?? [];
       this.init();
-      console.log("url:", this.Url);
+      this.enableLog() && console.log("url:", this.Url);
       this.eventMap = /* @__PURE__ */ new Map();
       this.onceWrapperMap = /* @__PURE__ */ new Map();
       this.eventMap.set("success", /* @__PURE__ */ new Set());
@@ -4183,8 +4202,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.initVersion();
     }
     initUrl() {
-      const url = this.Path == "" ? this.apiInstance.url || "" : `${this.apiInstance.url || ""}${resolveUrl(this.Path)}`;
-      this.Url = url;
+      if (this.Path === "") {
+        this.Url = this.apiInstance.url || "";
+        return;
+      }
+      this.Url = `${this.apiInstance.url || ""}${resolveUrl(this.Path)}`;
     }
     initVersion() {
       const version = Reflect.getMetadata(
@@ -4330,7 +4352,10 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         this.propertyKey
       );
       const isApiNoCache = this.apiInstance.noCache;
+      this.enableLog() && console.log("isApiNoCache:", isApiNoCache);
+      this.enableLog() && console.log("isMethodNoCache:", isMethodNoCache);
       const noCacheFlag = isMethodNoCache ? true : isApiNoCache ? true : false;
+      this.enableLog() && console.log("noCacheFlag:", noCacheFlag);
       return flag ? noCacheFlag : true;
     }
     enableLog() {
@@ -4376,6 +4401,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   const AxiosInstanceMap = /* @__PURE__ */ new Map();
   const StrategyMap = /* @__PURE__ */ new Map();
   const VersioningMap = /* @__PURE__ */ new Map();
+  const ServerStatusCodeRuleMap = /* @__PURE__ */ new Map();
   const defaultCacheManageOptions = {
     type: CacheType.Memory,
     ttl: 500
@@ -4404,9 +4430,19 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
     }
     init() {
       const options = this.getServerOptions();
-      const { baseURL, timeout, cacheManage, enableLog, cacheFor } = options;
+      const {
+        baseURL,
+        timeout,
+        cacheManage,
+        enableLog,
+        cacheFor,
+        serverStatusCodeRule
+      } = options;
       this.BaseURL = baseURL ?? resolveUrl("");
       this.initAxios({ baseURL, timeout });
+      if (serverStatusCodeRule) {
+        this.initServerStatusCodeRule(serverStatusCodeRule);
+      }
       this.initStrategy();
       this.initCacheManage(cacheManage, cacheFor);
       this.initVersioning();
@@ -4414,6 +4450,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.EnableLog = enableLog ?? false;
       this.initLog(enableLog);
     }
+    initServerStatusCodeRule(ruleOptions) {
+      ServerStatusCodeRuleMap.set(this.name, ruleOptions);
+    }
     initLog(enableLog) {
       if (enableLog) {
         const axiosInstance = AxiosInstanceMap.get(this.Name);
@@ -4685,6 +4724,26 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "_version");
       __publicField(this, "_withCredentials");
       __publicField(this, "_eventSource");
+      __publicField(this, "open", () => {
+        const url = `${this._baseUrl}${this._url}`;
+        const eventSource = new EventSource(url, {
+          withCredentials: this._withCredentials
+        });
+        this._eventSource = eventSource;
+        this.setEvent();
+        this.registerSseEvent();
+      });
+      __publicField(this, "close", () => {
+        const eventSource = this.eventSource;
+        if (!eventSource) return;
+        eventSource.close();
+      });
+      __publicField(this, "on", (eventName, callback, options) => {
+        this._eventSource && this._eventSource.addEventListener(eventName, callback, options);
+      });
+      __publicField(this, "off", (eventName, callback, options) => {
+        this._eventSource && this._eventSource.removeEventListener(eventName, callback, options);
+      });
       this._serverInstance = server;
       this._baseUrl = server.baseUrl;
       const options = this.getSseOptions();
@@ -4725,20 +4784,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         return;
       }
     }
-    open() {
-      const url = `${this._baseUrl}${this._url}`;
-      const eventSource = new EventSource(url, {
-        withCredentials: this._withCredentials
-      });
-      this._eventSource = eventSource;
-      this.setEvent();
-      this.registerSseEvent();
-    }
-    close() {
-      const eventSource = this.eventSource;
-      if (!eventSource) return;
-      eventSource.close();
-    }
     registerSseEvent() {
       const eventSource = this._eventSource;
       if (!eventSource) return;
@@ -4766,12 +4811,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         this._eventSource && (this._eventSource.onerror = onErrorFunc);
       }
     }
-    on(eventName, callback, options) {
-      this._eventSource && this._eventSource.addEventListener(eventName, callback, options);
-    }
-    off(eventName, callback, options) {
-      this._eventSource && this._eventSource.removeEventListener(eventName, callback, options);
-    }
     get url() {
       return this._url;
     }
@@ -4803,6 +4842,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   exports2.SnailMethod = SnailMethod;
   exports2.SnailPass = SnailPass;
   exports2.SnailServer = SnailServer;
+  exports2.SnailServerStatusCodeRuleOptions = SnailServerStatusCodeRuleOptions;
   exports2.SnailSse = SnailSse;
   exports2.Sse = Sse;
   exports2.SseEvent = SseEvent;

package/dist/typings/snail.option.d.ts

@@ -1,6 +1,10 @@
 import { CacheManagementOption } from "./cache.management.option";
 import { RequestMethod } from "./request.method";
 export type CacheForType = "All" | "all" | RequestMethod | RequestMethod[];
+export declare class SnailServerStatusCodeRuleOptions {
+    key?: string;
+    rule: (status: number) => boolean;
+}
 export interface SnailOption {
     name?: string;
     baseURL?: string;
@@ -8,4 +12,5 @@ export interface SnailOption {
     cacheFor?: CacheForType;
     enableLog?: boolean;
     timeout?: number;
+    serverStatusCodeRule?: SnailServerStatusCodeRuleOptions;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snail-js/api",
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "Http Request with Decorators Api, build on axios",
   "type": "module",
   "main": "./src/index.ts",