@i.un/api-client 0.1.0 → 1.0.0

package/README.md

@@ -1,5 +1,3 @@
-English | [简体中文](./README.zh-CN.md)
-
 # Api Client
 
 A lightweight HTTP client built on top of `ofetch`, with:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@i.un/api-client",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "Universal API client for i.un services",
   "license": "MIT",
   "author": "nova <www.nova@gmail.com>",
@@ -45,6 +45,9 @@
   "engines": {
     "node": ">=18"
   },
+  "files": [
+    "dist"
+  ],
   "publishConfig": {
     "access": "public"
   }

package/.vscode/settings.json

@@ -1,8 +0,0 @@
-{
-  "json.schemas": [
-    {
-      "url": "https://cdn.jsdelivr.net/npm/tsup/schema.json",
-      "fileMatch": ["package.json", "tsup.config.json"]
-    }
-  ]
-}

package/src/client.ts

@@ -1,263 +0,0 @@
-import {
-  ofetch,
-  type FetchOptions,
-  type FetchContext,
-  type $Fetch,
-} from "ofetch";
-
-export interface ApiResult<T> {
-  code: number;
-  data: T;
-  message: string;
-}
-
-export interface ApiError extends Error {
-  code: number; // 业务错误码
-  data?: unknown; // 后端返回的 data 字段（如果有）
-  status?: number; // HTTP 状态码（网络错误时）
-}
-
-// 类型守卫：判断是否是 API 业务错误
-export const isApiError = (error: unknown): error is ApiError => {
-  return error instanceof Error && "code" in error;
-};
-
-export interface TokenStorage {
-  getAccessToken: () => Promise<string> | string;
-  setAccessToken: (token: string) => Promise<void> | void;
-}
-
-export interface CreateApiClientOptions {
-  baseURL: string;
-  tokenStorage: TokenStorage;
-  refreshToken?: (() => Promise<string>) | string | false;
-  isAuthError?: (code: number) => boolean;
-  unwrapResponse?<T>(result: unknown, returnFullResponse: boolean): T;
-  createErrorFromResult?(res: unknown): Error;
-}
-
-type RequestOptions = FetchOptions<"json"> & { returnFullResponse?: boolean };
-
-// 解包后端统一响应格式（默认实现）
-const defaultUnwrapResponse = <T>(
-  result: unknown,
-  returnFullResponse = false
-): T => {
-  if (result && typeof result === "object" && "code" in result) {
-    const body = result as Record<string, unknown>;
-    if (body.code === 0) {
-      return returnFullResponse ? (body as T) : (body.data as T);
-    }
-  }
-  return result as T;
-};
-
-const defaultCreateErrorFromResult = (res: ApiResult<unknown>): ApiError => {
-  const error = new Error(res.message || "Request failed") as ApiError;
-  error.code = res.code;
-  error.data = res.data;
-  return error;
-};
-
-const extractAccessToken = (data: unknown): string => {
-  if (typeof data === "string" && data) {
-    return data;
-  }
-
-  if (!data || typeof data !== "object") {
-    throw new Error("Invalid refresh token response: data is not an object or string");
-  }
-
-  const anyData = data as Record<string, unknown>;
-
-  const accessToken = anyData.access_token ?? anyData.token;
-
-  if (typeof accessToken === "string" && accessToken) {
-    return accessToken;
-  }
-
-  throw new Error(
-    "Invalid refresh token response: no access_token or token field found"
-  );
-};
-
-export function createApiClient(options: CreateApiClientOptions) {
-  const {
-    baseURL,
-    tokenStorage,
-    refreshToken = false,
-    isAuthError = (code: number) => code === 401,
-    unwrapResponse = defaultUnwrapResponse,
-    createErrorFromResult = defaultCreateErrorFromResult,
-  } = options;
-
-  let refreshingPromise: Promise<string> | null = null;
-
-  const refreshTokenFn: (() => Promise<string>) | null = !refreshToken
-    ? null
-    : typeof refreshToken === "string"
-    ? async () => {
-        const res = await ofetch<ApiResult<unknown>>(refreshToken, {
-          baseURL,
-          method: "POST",
-        });
-
-        if (res.code !== 0) {
-          throw createErrorFromResult(res as ApiResult<unknown>);
-        }
-
-        return extractAccessToken(res.data);
-      }
-    : refreshToken;
-
-  const rawRequest = ofetch.create({
-    baseURL,
-
-    async onRequest({ options }: FetchContext) {
-      const token = await tokenStorage.getAccessToken();
-
-      const headers = new Headers(options.headers as HeadersInit | undefined);
-
-      if (token) {
-        headers.set("Authorization", `Bearer ${token}`);
-      }
-
-      options.headers = headers;
-    },
-    onResponse({ response }) {
-      // 不在这里处理 code，统一交给 fetchApi 层处理
-      if (response.status === 204) {
-        response._data = null;
-      }
-    },
-
-    async onResponseError(context: FetchContext) {
-      // 后端统一返回 HTTP 200，此处只处理网络层错误（如超时、断网）
-      const { response } = context;
-      const message =
-        (response?._data as Record<string, unknown>)?.message ||
-        `HTTP ${response?.status || "Network Error"}`;
-
-      const error = new Error(message as string) as ApiError;
-      error.status = response?.status;
-      error.data = response?._data;
-      throw error;
-    },
-  }) as $Fetch;
-
-  async function request<T = unknown>(
-    url: string,
-    options: RequestOptions & { _retry?: boolean } = {}
-  ): Promise<T> {
-    // 提取自定义选项，避免传递给 $fetch
-    const { returnFullResponse, _retry, ...fetchOptions } = options;
-
-    const res = await rawRequest<ApiResult<T>>(url, fetchOptions);
-    // const res = await rawRequest(url, fetchOptions as RequestOptions);
-
-    if (res.code === 0) {
-      return unwrapResponse<T>(res, !!returnFullResponse);
-      //   if (returnFullResponse) {
-      //     return res as unknown as T;
-      //   }
-
-      //   return res.data;
-    }
-
-    if (isAuthError(res.code) && !_retry && refreshTokenFn) {
-      try {
-        if (!refreshingPromise) {
-          refreshingPromise = refreshTokenFn().finally(() => {
-            refreshingPromise = null;
-          });
-        }
-
-        const newToken = await refreshingPromise;
-
-        if (newToken) {
-          await tokenStorage.setAccessToken(newToken);
-        }
-
-        return await request<T>(url, {
-          ...(options || {}),
-          _retry: true,
-        } as any);
-      } catch (e) {
-        await tokenStorage.setAccessToken("");
-        throw createErrorFromResult(res as ApiResult<unknown>);
-      }
-    }
-
-    throw createErrorFromResult(res as ApiResult<unknown>);
-  }
-
-  async function get<T = unknown>(
-    url: string,
-    params: FetchOptions["query"] = {},
-    options?: RequestOptions
-  ) {
-    return request<T>(url, {
-      ...options,
-      method: "GET",
-      query: params,
-    } as any);
-  }
-
-  async function post<T = unknown>(
-    url: string,
-    body: FetchOptions["body"] = {},
-    options?: RequestOptions
-  ) {
-    return request<T>(url, {
-      ...options,
-      method: "POST",
-      body,
-    } as any);
-  }
-
-  async function put<T = unknown>(
-    url: string,
-    body: FetchOptions["body"] = {},
-    options?: RequestOptions
-  ) {
-    return request<T>(url, {
-      ...options,
-      method: "PUT",
-      body,
-    } as any);
-  }
-
-  async function patch<T = unknown>(
-    url: string,
-    body: FetchOptions["body"] = {},
-    options?: RequestOptions
-  ) {
-    return request<T>(url, {
-      ...options,
-      method: "PATCH",
-      body,
-    } as any);
-  }
-
-  async function del<T = unknown>(
-    url: string,
-    params: FetchOptions["query"] = {},
-    options?: RequestOptions
-  ) {
-    return request<T>(url, {
-      ...options,
-      method: "DELETE",
-      query: params,
-    } as any);
-  }
-
-  return {
-    rawRequest,
-    request,
-    get,
-    post,
-    put,
-    patch,
-    del,
-  };
-}

package/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2020",
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "strict": true,
-    "esModuleInterop": true,
-    "skipLibCheck": true,
-    "resolveJsonModule": true,
-    "allowSyntheticDefaultImports": true,
-    "lib": ["ES2020", "DOM"],
-    "noEmit": true
-  },
-  "include": ["src"]
-}

package/tsup.config.ts

@@ -1,10 +0,0 @@
-import { defineConfig } from "tsup";
-
-export default defineConfig({
-  entry: ["src/client.ts"],
-  format: ["cjs", "esm"],
-  dts: true,
-  sourcemap: true,
-  clean: true,
-  external: ["ofetch"],
-});