@solar-taro/http 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 1.0.1 (2025-01-22)
+
+This was a version bump only for http to align it with other projects, there were no code changes.

package/api.interceptor.d.ts

@@ -0,0 +1,9 @@
+import { HttpContextToken, HttpInterceptorFn } from '@ngify/http';
+/** HTTP 令牌：允许拦截器处理 `Result#code` 不为 `0` 的错误 */
+export declare const CATCH_RESULT_ERROR_TOKEN: HttpContextToken<boolean>;
+/**
+ * 负责业务接口的拦截
+ * - 添加 `Api` 请求头
+ * - 捕获响应异常并提示
+ */
+export declare function useApiInterceptor(): HttpInterceptorFn;

package/api.interceptor.js

@@ -0,0 +1,35 @@
+import { HttpContextToken, HttpResponse } from '@ngify/http';
+import { WX_REQUSET_TOKEN } from '@ngify/http-wx';
+import { overlay } from '@solar-taro/core';
+import { tap } from 'rxjs';
+/** HTTP 令牌：允许拦截器处理 `Result#code` 不为 `0` 的错误 */
+export const CATCH_RESULT_ERROR_TOKEN = new HttpContextToken(() => true);
+/**
+ * 负责业务接口的拦截
+ * - 添加 `Api` 请求头
+ * - 捕获响应异常并提示
+ */
+export function useApiInterceptor() {
+    return (request, next) => {
+        request = request.clone({
+            headers: request.headers.set('Api', 'v1')
+        });
+        request.context.set(WX_REQUSET_TOKEN, {
+            ...request.context.get(WX_REQUSET_TOKEN),
+            enableHttp2: true,
+            // forceCellularNetwork: true
+        });
+        return next(request).pipe(tap((event) => {
+            if (event instanceof HttpResponse) {
+                const { body } = event;
+                if ((body === null || body === void 0 ? void 0 : body.code) !== 0 && request.context.get(CATCH_RESULT_ERROR_TOKEN)) {
+                    // 延迟一下，确保不会被后面的 dismiss loading 给关掉 tips
+                    setTimeout(() => {
+                        overlay.tips('操作失败，原因：' + ((body === null || body === void 0 ? void 0 : body.msg) || '未知错误'));
+                    });
+                }
+            }
+        }));
+    };
+}
+//# sourceMappingURL=api.interceptor.js.map

package/api.interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"api.interceptor.js","sourceRoot":"","sources":["../../../packages/http/src/api.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA4D,YAAY,EAAE,MAAM,aAAa,CAAC;AACvH,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAc,GAAG,EAAE,MAAM,MAAM,CAAC;AAEvC,+CAA+C;AAC/C,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AAEzE;;;;GAIG;AACH,MAAM,UAAU,iBAAiB;IAC/B,OAAO,CAAC,OAA6B,EAAE,IAAmB,EAAkC,EAAE;QAC5F,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC;SAC1C,CAAC,CAAC;QAEH,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE;YACpC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;YACxC,WAAW,EAAE,IAAI;YACjB,6BAA6B;SAC9B,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CACvB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;gBAClC,MAAM,EAAE,IAAI,EAAE,GAAG,KAA6B,CAAC;gBAC/C,IAAI,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,MAAK,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE,CAAC;oBACtE,yCAAyC;oBACzC,UAAU,CAAC,GAAG,EAAE;wBACd,OAAO,CAAC,IAAI,CAAC,UAAU,GAAG,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,KAAI,MAAM,CAAC,CAAC,CAAC;oBACnD,CAAC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAA;AACH,CAAC"}

package/auto-host.interceptor.d.ts

@@ -0,0 +1,9 @@
+import { HttpContextToken, HttpInterceptorFn } from '@ngify/http';
+export declare const AUTO_HOST_TOEKN: HttpContextToken<boolean>;
+/**
+ * 自动为 / 开头的 URL 添加 host
+ * 可以使用 {@link AUTO_HOST_TOEKN} 来跳过该拦截器
+ * @param host
+ * @returns
+ */
+export declare function useAutoHostInterceptor(host: string): HttpInterceptorFn;

package/auto-host.interceptor.js

@@ -0,0 +1,20 @@
+import { HttpContextToken } from '@ngify/http';
+export const AUTO_HOST_TOEKN = new HttpContextToken(() => true);
+/**
+ * 自动为 / 开头的 URL 添加 host
+ * 可以使用 {@link AUTO_HOST_TOEKN} 来跳过该拦截器
+ * @param host
+ * @returns
+ */
+export function useAutoHostInterceptor(host) {
+    return (request, next) => {
+        if (request.context.get(AUTO_HOST_TOEKN) &&
+            request.url.startsWith('/')) {
+            return next(request.clone({
+                url: host + request.url
+            }));
+        }
+        return next(request);
+    };
+}
+//# sourceMappingURL=auto-host.interceptor.js.map

package/auto-host.interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auto-host.interceptor.js","sourceRoot":"","sources":["../../../packages/http/src/auto-host.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,aAAa,CAAC;AAElE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACvB,IACE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAC3B,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;gBACxB,GAAG,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG;aACxB,CAAC,CAAC,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC,CAAC;AACJ,CAAC"}

package/caching/cache-manager.d.ts

@@ -0,0 +1,42 @@
+import { HttpContextToken, HttpRequest, HttpResponse } from '@ngify/http';
+/**
+ * 缓存令牌,值可以为:
+ * - 布尔值，为 true 时，表示在一次会话中缓存永不过期，默认值为 false
+ * - 缓存时间，单位毫秒
+ */
+export declare const CACHEABLE_TOKEN: HttpContextToken<number | boolean>;
+/** 缓存条目 */
+export interface CacheEntry {
+    url: string;
+    response: HttpResponse<unknown>;
+    expire: number;
+}
+export declare class CacheManager {
+    private readonly cacheMap;
+    /**
+     * 获取缓存
+     * @param request
+     */
+    get(request: HttpRequest<unknown>): HttpResponse<unknown> | null;
+    /**
+     * 缓存
+     * @param request
+     * @param response
+     */
+    put(request: HttpRequest<unknown>, response: HttpResponse<unknown>): void;
+    /**
+     * 清扫过期缓存
+     */
+    clear(): void;
+    /**
+     * 通过标记（字符串、正则）模糊查询以撤销缓存
+     * @param mark
+     * @param once 只撤销一个
+     */
+    revoke(mark: string | RegExp, once?: boolean): void;
+    /**
+     * 撤销所有缓存
+     */
+    revokeAll(): void;
+}
+export declare const cacheManager: CacheManager;

package/caching/cache-manager.js

@@ -0,0 +1,72 @@
+import { HttpContextToken } from '@ngify/http';
+/**
+ * 缓存令牌,值可以为:
+ * - 布尔值，为 true 时，表示在一次会话中缓存永不过期，默认值为 false
+ * - 缓存时间，单位毫秒
+ */
+export const CACHEABLE_TOKEN = new HttpContextToken(() => false);
+export class CacheManager {
+    constructor() {
+        this.cacheMap = new Map();
+    }
+    /**
+     * 获取缓存
+     * @param request
+     */
+    get(request) {
+        // 判断当前请求是否已被缓存，若未缓存则返回null
+        const entry = this.cacheMap.get(request.urlWithParams);
+        if (!entry) {
+            return null;
+        }
+        // 若缓存命中，则判断缓存是否过期，若已过期则返回null。否则返回请求对应的响应对象
+        return Date.now() > entry.expire ? null : entry.response;
+    }
+    /**
+     * 缓存
+     * @param request
+     * @param response
+     */
+    put(request, response) {
+        const token = request.context.get(CACHEABLE_TOKEN);
+        const entry = {
+            url: request.urlWithParams,
+            response: response,
+            expire: Date.now() + (token === true ? Infinity : token)
+        };
+        this.cacheMap.set(request.urlWithParams, entry);
+    }
+    /**
+     * 清扫过期缓存
+     */
+    clear() {
+        for (const [key, entry] of this.cacheMap) {
+            if (Date.now() > entry.expire) {
+                this.cacheMap.delete(key);
+            }
+        }
+    }
+    /**
+     * 通过标记（字符串、正则）模糊查询以撤销缓存
+     * @param mark
+     * @param once 只撤销一个
+     */
+    revoke(mark, once) {
+        for (const key of this.cacheMap.keys()) {
+            if (mark instanceof RegExp ? mark.test(key) : key.includes(mark)) {
+                this.cacheMap.delete(key);
+                if (once) {
+                    return;
+                }
+            }
+        }
+    }
+    /**
+     * 撤销所有缓存
+     */
+    revokeAll() {
+        this.cacheMap.clear();
+    }
+}
+export const cacheManager = new CacheManager();
+//# sourceMappingURL=cache-manager.js.map

package/caching/cache-manager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cache-manager.js","sourceRoot":"","sources":["../../../../packages/http/src/caching/cache-manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6B,MAAM,aAAa,CAAC;AAE1E;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,gBAAgB,CAAmB,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AASnF,MAAM,OAAO,YAAY;IAAzB;QACmB,aAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;IA+D5D,CAAC;IA7DC;;;OAGG;IACH,GAAG,CAAC,OAA6B;QAC/B,2BAA2B;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAEvD,IAAI,CAAC,KAAK,EAAE,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QAC5B,4CAA4C;QAC5C,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;IAC3D,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,OAA6B,EAAE,QAA+B;QAChE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAkB,CAAC;QACpE,MAAM,KAAK,GAAe;YACxB,GAAG,EAAE,OAAO,CAAC,aAAa;YAC1B,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC;SACzD,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,KAAK;QACH,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC9B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,IAAqB,EAAE,IAAc;QAC1C,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YACvC,IAAI,IAAI,YAAY,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC1B,IAAI,IAAI,EAAE,CAAC;oBAAC,OAAO;gBAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACH,SAAS;QACP,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CAEF;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}

package/caching/caching.interceptor.d.ts

@@ -0,0 +1,6 @@
+import { HttpInterceptorFn } from '@ngify/http';
+/**
+ * 负责接口的缓存拦截
+ * - 请求需要携带 {@link CACHEABLE_TOKEN}
+ */
+export declare function useCacheInterceptor(): HttpInterceptorFn;

package/caching/caching.interceptor.js

@@ -0,0 +1,46 @@
+import { HttpResponse } from '@ngify/http';
+import { finalize, of, share, tap } from 'rxjs';
+import { CACHEABLE_TOKEN, cacheManager } from './cache-manager.js';
+/**
+ * 判断请求是否可缓存
+ * 一般只有 GET 请求才需要缓存
+ * @param request
+ */
+function isCachable(request) {
+    const value = request.context.get(CACHEABLE_TOKEN);
+    return value === true || typeof value === 'number';
+}
+/**
+ * 负责接口的缓存拦截
+ * - 请求需要携带 {@link CACHEABLE_TOKEN}
+ */
+export function useCacheInterceptor() {
+    const requestingMap = new Map();
+    return (request, next) => {
+        // 判断当前请求是否可缓存
+        if (!isCachable(request)) {
+            return next(request);
+        }
+        // 缓存命中则直接返回
+        const response = cacheManager.get(request);
+        if (response) {
+            return of(response);
+        }
+        // 如果可缓存的请求已经有正在请求的，就不重复发了
+        const requesting = requestingMap.get(request.urlWithParams);
+        if (requesting) {
+            return requesting;
+        }
+        // 发送请求，成功后缓存
+        const obs = next(request).pipe(tap(event => {
+            cacheManager.clear();
+            if (event instanceof HttpResponse) {
+                cacheManager.put(request, event);
+            }
+        }), finalize(() => requestingMap.delete(request.urlWithParams)), share());
+        // 存入请求中
+        requestingMap.set(request.urlWithParams, obs);
+        return obs;
+    };
+}
+//# sourceMappingURL=caching.interceptor.js.map

package/caching/caching.interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"caching.interceptor.js","sourceRoot":"","sources":["../../../../packages/http/src/caching/caching.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4D,YAAY,EAAE,MAAM,aAAa,CAAC;AACrG,OAAO,EAAc,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEhE;;;;GAIG;AACH,SAAS,UAAU,CAAC,OAA6B;IAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACnD,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AACrD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB;IACjC,MAAM,aAAa,GAAG,IAAI,GAAG,EAA0C,CAAC;IACxE,OAAO,CAAC,OAA6B,EAAE,IAAmB,EAAkC,EAAE;QAC5F,cAAc;QACd,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC;QAED,YAAY;QACZ,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;QACtB,CAAC;QAED,0BAA0B;QAC1B,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5D,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,aAAa;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAC5B,GAAG,CAAC,KAAK,CAAC,EAAE;YACV,YAAY,CAAC,KAAK,EAAE,CAAC;YACrB,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;gBAClC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACnC,CAAC;QACH,CAAC,CAAC,EACF,QAAQ,CAAC,GAAG,EAAE,CACZ,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAC5C,EACD,KAAK,EAAE,CACR,CAAC;QAEF,QAAQ;QACR,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QAE9C,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC"}

package/caching/index.js

@@ -0,0 +1,3 @@
+export * from './cache-manager.js';
+export * from './caching.interceptor.js';
+//# sourceMappingURL=index.js.map

package/caching/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/http/src/caching/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,uBAAuB,CAAC"}

package/common.interceptor.d.ts

@@ -0,0 +1,10 @@
+import { HttpContextToken, HttpInterceptorFn } from '@ngify/http';
+/** 是否捕获 HTTP 请求错误（!2XX），默认为 true */
+export declare const CATCH_HTTP_ERROR_TOKEN: HttpContextToken<boolean>;
+/**
+ * 一个公共拦截器
+ * - 捕获非 200 的 HTTP 请求错误并提示（除了 401）
+ * - 使用 {@link CATCH_HTTP_ERROR_TOKEN} 跳过该拦截器
+ * @returns
+ */
+export declare function useCommonInterceptor(): HttpInterceptorFn;

package/common.interceptor.js

@@ -0,0 +1,35 @@
+import { HttpContextToken, HttpStatusCode } from '@ngify/http';
+import { overlay, vibrator } from '@solar-taro/core';
+import { catchError } from 'rxjs';
+/** 是否捕获 HTTP 请求错误（!2XX），默认为 true */
+export const CATCH_HTTP_ERROR_TOKEN = new HttpContextToken(() => true);
+/**
+ * 一个公共拦截器
+ * - 捕获非 200 的 HTTP 请求错误并提示（除了 401）
+ * - 使用 {@link CATCH_HTTP_ERROR_TOKEN} 跳过该拦截器
+ * @returns
+ */
+export function useCommonInterceptor() {
+    return (request, next) => {
+        return next(request).pipe(catchError((error) => {
+            if (request.context.get(CATCH_HTTP_ERROR_TOKEN) && error.status !== HttpStatusCode.Unauthorized) {
+                vibrator.short();
+                setTimeout(() => {
+                    var _a;
+                    const message = (_a = error.error) === null || _a === void 0 ? void 0 : _a.msg;
+                    if (message) {
+                        overlay.tips('请求失败，原因：' + message);
+                    }
+                    else if (error.status >= 0) {
+                        overlay.tips('请求失败，状态码：' + error.status);
+                    }
+                    else {
+                        overlay.tips('请求失败，原因：未知错误');
+                    }
+                });
+            }
+            throw error;
+        }));
+    };
+}
+//# sourceMappingURL=common.interceptor.js.map

package/common.interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.interceptor.js","sourceRoot":"","sources":["../../../packages/http/src/common.interceptor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA+E,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5I,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAc,MAAM,MAAM,CAAC;AAE9C,oCAAoC;AACpC,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;AAEvE;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO,CAAC,OAA6B,EAAE,IAAmB,EAAkC,EAAE;QAC5F,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CACvB,UAAU,CAAC,CAAC,KAAwB,EAAE,EAAE;YACtC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,cAAc,CAAC,YAAY,EAAE,CAAC;gBAChG,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjB,UAAU,CAAC,GAAG,EAAE;;oBACd,MAAM,OAAO,GAAG,MAAA,KAAK,CAAC,KAAK,0CAAE,GAAG,CAAC;oBAEjC,IAAI,OAAO,EAAE,CAAC;wBACZ,OAAO,CAAC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC;oBACrC,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;wBAC7B,OAAO,CAAC,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC3C,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC,CAAC,CAAA;YACJ,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC"}

package/headers.d.ts

@@ -0,0 +1,8 @@
+export declare const enum WxHeader {
+    App = "X-WX-APP",
+    Code = "X-WX-Code",
+    EncryptedData = "X-WX-Encrypted-Data",
+    Iv = "X-WX-IV",
+    OpenId = "X-WX-OPEN-ID",
+    UnionId = "X-WX-UNION-ID"
+}

package/headers.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=headers.js.map

package/headers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../../packages/http/src/headers.ts"],"names":[],"mappings":""}

package/index.js

@@ -0,0 +1,6 @@
+export * from './api.interceptor.js';
+export * from './auto-host.interceptor.js';
+export * from './caching/index.js';
+export * from './common.interceptor.js';
+export * from './headers.js';
+//# sourceMappingURL=index.js.map

package/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/http/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,WAAW,CAAC;AAC1B,cAAc,sBAAsB,CAAC;AACrC,cAAc,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solar-taro/http",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -12,5 +12,9 @@
     "@ngify/http": "^2.0.0",
     "@ngify/http-wx": "^2.0.0",
     "rxjs": "^7.8.0"
-  }
+  },
+  "types": "./index.d.ts",
+  "module": "./index.js",
+  "type": "module",
+  "main": "./index.js"
 }

package/eslint.config.cjs

@@ -1,22 +0,0 @@
-const baseConfig = require('../../eslint.config.cjs');
-
-module.exports = [
-  ...baseConfig,
-  {
-    files: ['**/*.json'],
-    rules: {
-      '@nx/dependency-checks': [
-        'error',
-        {
-          ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs}',
-            '{projectRoot}/vite.config.{js,ts,mjs,mts}',
-          ],
-        },
-      ],
-    },
-    languageOptions: {
-      parser: require('jsonc-eslint-parser'),
-    },
-  },
-];

package/project.json

@@ -1,42 +0,0 @@
-{
-  "name": "http",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "packages/http/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "executor": "@nx/js:tsc",
-      "outputs": [
-        "{options.outputPath}"
-      ],
-      "options": {
-        "outputPath": "dist/http",
-        "main": "packages/http/src/index.ts",
-        "tsConfig": "packages/http/tsconfig.lib.json",
-        "assets": [
-          "packages/http/*.md"
-        ]
-      }
-    },
-    "postbuild": {
-      "executor": "nx:run-commands",
-      "dependsOn": [
-        "build"
-      ],
-      "options": {
-        "commands": [
-          "node scripts/postbuild.js http"
-        ]
-      }
-    },
-    "release:dev": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          "yalc publish dist/http"
-        ]
-      }
-    }
-  }
-}

package/src/api.interceptor.ts

@@ -1,41 +0,0 @@
-import { HttpContextToken, HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest, HttpResponse } from '@ngify/http';
-import { WX_REQUSET_TOKEN } from '@ngify/http-wx';
-import { Result } from '@solar-kit/planets/sun';
-import { overlay } from '@solar-taro/core';
-import { Observable, tap } from 'rxjs';
-
-/** HTTP 令牌：允许拦截器处理 `Result#code` 不为 `0` 的错误 */
-export const CATCH_RESULT_ERROR_TOKEN = new HttpContextToken(() => true);
-
-/**
- * 负责业务接口的拦截
- * - 添加 `Api` 请求头
- * - 捕获响应异常并提示
- */
-export function useApiInterceptor(): HttpInterceptorFn {
-  return (request: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<unknown>> => {
-    request = request.clone({
-      headers: request.headers.set('Api', 'v1')
-    });
-
-    request.context.set(WX_REQUSET_TOKEN, {
-      ...request.context.get(WX_REQUSET_TOKEN),
-      enableHttp2: true,
-      // forceCellularNetwork: true
-    });
-
-    return next(request).pipe(
-      tap((event) => {
-        if (event instanceof HttpResponse) {
-          const { body } = event as HttpResponse<Result>;
-          if (body?.code !== 0 && request.context.get(CATCH_RESULT_ERROR_TOKEN)) {
-            // 延迟一下，确保不会被后面的 dismiss loading 给关掉 tips
-            setTimeout(() => {
-              overlay.tips('操作失败，原因：' + (body?.msg || '未知错误'));
-            });
-          }
-        }
-      })
-    );
-  }
-}

package/src/auto-host.interceptor.ts

@@ -1,23 +0,0 @@
-import { HttpContextToken, HttpInterceptorFn } from '@ngify/http';
-
-export const AUTO_HOST_TOEKN = new HttpContextToken(() => true);
-
-/**
- * 自动为 / 开头的 URL 添加 host
- * 可以使用 {@link AUTO_HOST_TOEKN} 来跳过该拦截器
- * @param host
- * @returns
- */
-export function useAutoHostInterceptor(host: string): HttpInterceptorFn {
-  return (request, next) => {
-    if (
-      request.context.get(AUTO_HOST_TOEKN) &&
-      request.url.startsWith('/')
-    ) {
-      return next(request.clone({
-        url: host + request.url
-      }));
-    }
-    return next(request);
-  };
-}

package/src/caching/cache-manager.ts

@@ -1,83 +0,0 @@
-import { HttpContextToken, HttpRequest, HttpResponse } from '@ngify/http';
-
-/**
- * 缓存令牌,值可以为:
- * - 布尔值，为 true 时，表示在一次会话中缓存永不过期，默认值为 false
- * - 缓存时间，单位毫秒
- */
-export const CACHEABLE_TOKEN = new HttpContextToken<boolean | number>(() => false);
-
-/** 缓存条目 */
-export interface CacheEntry {
-  url: string;
-  response: HttpResponse<unknown>;
-  expire: number;
-}
-
-export class CacheManager {
-  private readonly cacheMap = new Map<string, CacheEntry>();
-
-  /**
-   * 获取缓存
-   * @param request
-   */
-  get(request: HttpRequest<unknown>): HttpResponse<unknown> | null {
-    // 判断当前请求是否已被缓存，若未缓存则返回null
-    const entry = this.cacheMap.get(request.urlWithParams);
-
-    if (!entry) { return null; }
-    // 若缓存命中，则判断缓存是否过期，若已过期则返回null。否则返回请求对应的响应对象
-    return Date.now() > entry.expire ? null : entry.response;
-  }
-
-  /**
-   * 缓存
-   * @param request
-   * @param response
-   */
-  put(request: HttpRequest<unknown>, response: HttpResponse<unknown>): void {
-    const token = request.context.get(CACHEABLE_TOKEN) as true | number;
-    const entry: CacheEntry = {
-      url: request.urlWithParams,
-      response: response,
-      expire: Date.now() + (token === true ? Infinity : token)
-    };
-
-    this.cacheMap.set(request.urlWithParams, entry);
-  }
-
-  /**
-   * 清扫过期缓存
-   */
-  clear() {
-    for (const [key, entry] of this.cacheMap) {
-      if (Date.now() > entry.expire) {
-        this.cacheMap.delete(key);
-      }
-    }
-  }
-
-  /**
-   * 通过标记（字符串、正则）模糊查询以撤销缓存
-   * @param mark
-   * @param once 只撤销一个
-   */
-  revoke(mark: string | RegExp, once?: boolean) {
-    for (const key of this.cacheMap.keys()) {
-      if (mark instanceof RegExp ? mark.test(key) : key.includes(mark)) {
-        this.cacheMap.delete(key);
-        if (once) { return; }
-      }
-    }
-  }
-
-  /**
-   * 撤销所有缓存
-   */
-  revokeAll() {
-    this.cacheMap.clear();
-  }
-
-}
-
-export const cacheManager = new CacheManager();

package/src/caching/caching.interceptor.ts

@@ -1,58 +0,0 @@
-import { HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest, HttpResponse } from '@ngify/http';
-import { Observable, finalize, of, share, tap } from 'rxjs';
-import { CACHEABLE_TOKEN, cacheManager } from './cache-manager';
-
-/**
- * 判断请求是否可缓存
- * 一般只有 GET 请求才需要缓存
- * @param request
- */
-function isCachable(request: HttpRequest<unknown>): boolean {
-  const value = request.context.get(CACHEABLE_TOKEN);
-  return value === true || typeof value === 'number';
-}
-
-/**
- * 负责接口的缓存拦截
- * - 请求需要携带 {@link CACHEABLE_TOKEN}
- */
-export function useCacheInterceptor(): HttpInterceptorFn {
-  const requestingMap = new Map<string, Observable<HttpEvent<unknown>>>();
-  return (request: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<unknown>> => {
-    // 判断当前请求是否可缓存
-    if (!isCachable(request)) {
-      return next(request);
-    }
-
-    // 缓存命中则直接返回
-    const response = cacheManager.get(request);
-    if (response) {
-      return of(response);
-    }
-
-    // 如果可缓存的请求已经有正在请求的，就不重复发了
-    const requesting = requestingMap.get(request.urlWithParams);
-    if (requesting) {
-      return requesting;
-    }
-
-    // 发送请求，成功后缓存
-    const obs = next(request).pipe(
-      tap(event => {
-        cacheManager.clear();
-        if (event instanceof HttpResponse) {
-          cacheManager.put(request, event);
-        }
-      }),
-      finalize(() =>
-        requestingMap.delete(request.urlWithParams)
-      ),
-      share()
-    );
-
-    // 存入请求中
-    requestingMap.set(request.urlWithParams, obs);
-
-    return obs;
-  };
-}

package/src/common.interceptor.ts

@@ -1,37 +0,0 @@
-import { HttpContextToken, HttpErrorResponse, HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest, HttpStatusCode } from '@ngify/http';
-import { overlay, vibrator } from '@solar-taro/core';
-import { catchError, Observable } from 'rxjs';
-
-/** 是否捕获 HTTP 请求错误（!2XX），默认为 true */
-export const CATCH_HTTP_ERROR_TOKEN = new HttpContextToken(() => true);
-
-/**
- * 一个公共拦截器
- * - 捕获非 200 的 HTTP 请求错误并提示（除了 401）
- * - 使用 {@link CATCH_HTTP_ERROR_TOKEN} 跳过该拦截器
- * @returns
- */
-export function useCommonInterceptor(): HttpInterceptorFn {
-  return (request: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<unknown>> => {
-    return next(request).pipe(
-      catchError((error: HttpErrorResponse) => {
-        if (request.context.get(CATCH_HTTP_ERROR_TOKEN) && error.status !== HttpStatusCode.Unauthorized) {
-          vibrator.short();
-          setTimeout(() => {
-            const message = error.error?.msg;
-
-            if (message) {
-              overlay.tips('请求失败，原因：' + message);
-            } else if (error.status >= 0) {
-              overlay.tips('请求失败，状态码：' + error.status);
-            } else {
-              overlay.tips('请求失败，原因：未知错误');
-            }
-          })
-        }
-
-        throw error;
-      })
-    );
-  };
-}

package/src/headers.ts

@@ -1,8 +0,0 @@
-export const enum WxHeader {
-  App = 'X-WX-APP',
-  Code = 'X-WX-Code',
-  EncryptedData = 'X-WX-Encrypted-Data',
-  Iv = 'X-WX-IV',
-  OpenId = 'X-WX-OPEN-ID',
-  UnionId = 'X-WX-UNION-ID',
-}

package/tsconfig.json

@@ -1,21 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "noPropertyAccessFromIndexSignature": true
-  },
-  "files": [],
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}

package/tsconfig.lib.json

@@ -1,24 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "declaration": true
-  },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx"
-  ]
-}

package/tsconfig.spec.json

@@ -1,28 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "types": [
-      "vitest/globals",
-      "vitest/importMeta",
-      "vite/client",
-      "node",
-      "vitest"
-    ]
-  },
-  "include": [
-    "vite.config.ts",
-    "vite.config.mts",
-    "vitest.config.ts",
-    "vitest.config.mts",
-    "src/**/*.test.ts",
-    "src/**/*.spec.ts",
-    "src/**/*.test.tsx",
-    "src/**/*.spec.tsx",
-    "src/**/*.test.js",
-    "src/**/*.spec.js",
-    "src/**/*.test.jsx",
-    "src/**/*.spec.jsx",
-    "src/**/*.d.ts"
-  ]
-}

package/typedoc.json

@@ -1,6 +0,0 @@
-{
-  "$schema": "https://typedoc.org/schema.json",
-  "entryPoints": [
-    "src/index.ts"
-  ]
-}

package/vite.config.ts

@@ -1,24 +0,0 @@
-import { nxCopyAssetsPlugin } from '@nx/vite/plugins/nx-copy-assets.plugin';
-import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  root: __dirname,
-  cacheDir: '../../node_modules/.vite/http',
-  plugins: [nxViteTsPaths(), nxCopyAssetsPlugin(['*.md'])],
-  // Uncomment this if you are using workers.
-  // worker: {
-  //  plugins: [ nxViteTsPaths() ],
-  // },
-  test: {
-    watch: false,
-    globals: true,
-    environment: 'node',
-    include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
-    reporters: ['default'],
-    coverage: {
-      reportsDirectory: '../../coverage/http',
-      provider: 'v8',
-    },
-  },
-});