@rpcbase/client 0.438.0 → 0.440.0

package/dist/{getServerApiClient-BzqOKL0g.js → getServerApiClient-DnG8591C.js}

@@ -1,4 +1,13 @@
 const getServerApiClient = async (app) => {
+  const isCtx = (value) => {
+    if (!value || typeof value !== "object") return false;
+    return "req" in value && "res" in value;
+  };
+  const createAbortError = () => {
+    const error = new Error("The operation was aborted.");
+    error.name = "AbortError";
+    return error;
+  };
   const callRoute = async (app2, method, matchPath, requestUrl, req, res) => {
     return new Promise((resolve, reject) => {
       let isEnded = false;
@@ -135,10 +144,15 @@ const getServerApiClient = async (app) => {
     };
   };
   const createMethod = (method) => {
-    return async (path, payload, ctx) => {
+    return async (path, payload, ctxOrOptions, options) => {
+      const ctx = isCtx(ctxOrOptions) ? ctxOrOptions : void 0;
+      const requestOptions = isCtx(ctxOrOptions) ? options : ctxOrOptions;
       if (!ctx) {
         throw new Error("Context must be provided in SSR mode");
       }
+      if (requestOptions?.signal?.aborted) {
+        throw createAbortError();
+      }
       const normalizedMethod = method.toLowerCase();
       if (normalizedMethod === "get") {
         const {
@@ -175,4 +189,4 @@ const getServerApiClient = async (app) => {
 export {
   getServerApiClient
 };
-//# sourceMappingURL=getServerApiClient-BzqOKL0g.js.map
+//# sourceMappingURL=getServerApiClient-DnG8591C.js.map

package/dist/getServerApiClient-DnG8591C.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getServerApiClient-DnG8591C.js","sources":["../src/apiClient/getServerApiClient.ts"],"sourcesContent":["import { Application, IRouter, Request, Response } from \"express\"\nimport type { Ctx } from \"@rpcbase/api\"\n\n\ntype NextMiddleware = (err?: unknown) => void\ntype LayerHandler = (req: Request, res: Response, next: NextMiddleware) => void\ntype ApiClientRequestOptions = {\n  signal?: AbortSignal\n}\n\ntype RouterLayer = {\n  name: string\n  match: (path: string) => boolean\n  handle: LayerHandler\n  route?: {\n    methods: Record<string, boolean | undefined>\n    path: string\n    stack: Array<{ handle: LayerHandler }>\n  }\n}\n\n\nexport const getServerApiClient = async(app: Application) => {\n  const isCtx = (value: unknown): value is Ctx => {\n    if (!value || typeof value !== \"object\") return false\n    return \"req\" in value && \"res\" in value\n  }\n\n  const createAbortError = () => {\n    const error = new Error(\"The operation was aborted.\")\n    error.name = \"AbortError\"\n    return error\n  }\n\n  const callRoute = async <TResponse = Record<string, unknown>>(\n    app: Application,\n    method: string,\n    matchPath: string,\n    requestUrl: string,\n    req: Partial<Request>,\n    res: Partial<Response>\n  ): Promise<TResponse> => {\n    return new Promise((resolve, reject) => {\n      let isEnded = false\n      let timeoutId: ReturnType<typeof setTimeout> | null = null\n\n      const resolveRequest = (data: TResponse) => {\n        if (isEnded) return\n        isEnded = true\n        if (timeoutId) clearTimeout(timeoutId)\n        resolve(data)\n      }\n\n      const rejectRequest = (error: unknown) => {\n        if (isEnded) return\n        isEnded = true\n        if (timeoutId) clearTimeout(timeoutId)\n        reject(error)\n      }\n\n      const mockReq = {\n        ...req,\n        method: method.toUpperCase(),\n        url: requestUrl\n      } as Request\n\n      const mockRes = {\n        ...res,\n        json: (data: unknown) => {\n          resolveRequest(data as TResponse)\n        },\n        status: (statusCode: number) => {\n          console.log(\"Status:\", statusCode, mockReq.method, mockReq.url)\n          return mockRes\n        },\n      } as Response\n\n      const routerStack = (app.router as unknown as IRouter).stack as unknown as RouterLayer[]\n\n      const firstApiMiddlewareIndex = routerStack.findIndex((layer) => layer.name === \"__FIRST_API_MIDDLEWARE__\")\n      if (!(firstApiMiddlewareIndex > -1)) {\n        throw new Error(\"middleware: __FIRST_API_MIDDLEWARE__ was not found in stack\")\n      }\n\n      const apiStack = routerStack.slice(firstApiMiddlewareIndex + 1)\n\n      const processLayer = async (index: number) => {\n        if (index >= apiStack.length || isEnded) return\n\n        const layer = apiStack[index]\n\n        const isNonMatchingLayer = !layer.match(matchPath)\n        if (isNonMatchingLayer) {\n          // console.log(\"not machthing route:\", matchPath, \"to layer:\", index, layer.name, layer, \"reason: \", {isNonMatchingLayer})\n          await processLayer(index + 1)\n          return\n        }\n\n        const runHandler = async(handler: LayerHandler) => new Promise<void>((resolveMiddleware, rejectMiddleware) => {\n          handler(mockReq, mockRes, (err?: unknown) => {\n            if (err) {\n              console.error(\"Middleware error:\", err)\n              rejectMiddleware(err)\n              return\n            }\n            resolveMiddleware()\n          })\n        })\n\n        if (layer.route) {\n          if (!layer.route.methods[method.toLowerCase()]) {\n            // console.log(\"not machthing route:\", matchPath, \"to route layer:\", index, layer.name, layer, \"reason: method not matching\")\n            await processLayer(index + 1)\n            return\n          }\n\n          if (layer.route.stack.length !== 1) {\n            throw new Error(`expected only one handler per route for route: ${layer.route.path}`)\n          }\n\n          await runHandler(layer.route.stack[0].handle)\n\n        } else {\n          await runHandler(layer.handle)\n        }\n\n        if (!isEnded) {\n          await processLayer(index + 1)\n        }\n      }\n\n      void processLayer(0).catch((err) => {\n        rejectRequest(err)\n      })\n\n      // Set a timeout to prevent hanging\n      timeoutId = setTimeout(() => {\n        rejectRequest(new Error(\"Route handler timed out\"))\n      }, 30000)\n    })\n  }\n\n  const mergeQueryValues = (target: Record<string, string | string[]>, key: string, value: string) => {\n    const existing = target[key]\n    if (Array.isArray(existing)) {\n      existing.push(value)\n      return\n    }\n\n    if (typeof existing === \"string\") {\n      target[key] = [existing, value]\n      return\n    }\n\n    target[key] = value\n  }\n\n  const toQueryValue = (value: unknown): string | null => {\n    if (typeof value === \"string\") return value\n    if (typeof value === \"number\") return Number.isFinite(value) ? String(value) : null\n    if (typeof value === \"boolean\") return value ? \"true\" : \"false\"\n    if (typeof value === \"bigint\") return String(value)\n    if (value instanceof Date) return value.toISOString()\n    return null\n  }\n\n  const buildQuery = (path: string, payload: Record<string, unknown>) => {\n    const url = new URL(path, \"http://localhost\")\n\n    const query: Record<string, string | string[]> = {}\n    for (const [key, value] of url.searchParams) {\n      mergeQueryValues(query, key, value)\n    }\n\n    for (const [key, rawValue] of Object.entries(payload)) {\n      if (!key) continue\n\n      if (Array.isArray(rawValue)) {\n        for (const item of rawValue) {\n          const converted = toQueryValue(item)\n          if (converted !== null) mergeQueryValues(query, key, converted)\n        }\n        continue\n      }\n\n      const converted = toQueryValue(rawValue)\n      if (converted !== null) mergeQueryValues(query, key, converted)\n    }\n\n    const searchParams = new URLSearchParams()\n    for (const [key, rawValue] of Object.entries(query)) {\n      if (Array.isArray(rawValue)) {\n        for (const value of rawValue) {\n          searchParams.append(key, value)\n        }\n        continue\n      }\n\n      searchParams.append(key, rawValue)\n    }\n\n    const matchPath = url.pathname\n    const requestUrl = `${matchPath}${searchParams.toString() ? `?${searchParams.toString()}` : \"\"}`\n\n    return { matchPath, requestUrl, query }\n  }\n\n  const createMethod = (method: string) => {\n    return async <TResponse = Record<string, unknown>>(\n      path: string,\n      payload: Record<string, unknown>,\n      ctxOrOptions?: Ctx | ApiClientRequestOptions,\n      options?: ApiClientRequestOptions,\n    ): Promise<TResponse> => {\n      const ctx = isCtx(ctxOrOptions) ? ctxOrOptions : undefined\n      const requestOptions = isCtx(ctxOrOptions) ? options : ctxOrOptions\n      if (!ctx) {\n        throw new Error(\"Context must be provided in SSR mode\")\n      }\n      if (requestOptions?.signal?.aborted) {\n        throw createAbortError()\n      }\n\n      const normalizedMethod = method.toLowerCase()\n\n      if (normalizedMethod === \"get\") {\n        const { matchPath, requestUrl, query } = buildQuery(path, payload)\n        return callRoute<TResponse>(app, method, matchPath, requestUrl, { ...ctx.req, body: {}, query }, ctx.res)\n      }\n\n      const { matchPath, requestUrl, query } = buildQuery(path, {})\n      return callRoute<TResponse>(app, method, matchPath, requestUrl, { ...ctx.req, body: payload, query }, ctx.res)\n    }\n  }\n\n  const apiClient = {\n    get: createMethod(\"get\"),\n    post: createMethod(\"post\"),\n    put: createMethod(\"put\"),\n    delete: createMethod(\"delete\")\n  }\n\n  return apiClient\n}\n\nexport default getServerApiClient\n"],"names":["getServerApiClient","app","isCtx","value","createAbortError","error","Error","name","callRoute","method","matchPath","requestUrl","req","res","Promise","resolve","reject","isEnded","timeoutId","resolveRequest","data","rejectRequest","mockReq","toUpperCase","url","mockRes","json","status","statusCode","console","log","routerStack","router","stack","firstApiMiddlewareIndex","findIndex","layer","apiStack","slice","processLayer","index","length","isNonMatchingLayer","match","runHandler","handler","resolveMiddleware","rejectMiddleware","err","route","methods","toLowerCase","path","handle","catch","setTimeout","mergeQueryValues","target","key","existing","Array","isArray","push","toQueryValue","Number","isFinite","String","Date","toISOString","buildQuery","payload","URL","query","searchParams","rawValue","Object","entries","item","converted","URLSearchParams","append","pathname","toString","createMethod","ctxOrOptions","options","ctx","undefined","requestOptions","signal","aborted","normalizedMethod","body","apiClient","get","post","put","delete"],"mappings":"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"}

package/dist/index.js

@@ -434,6 +434,10 @@ function _temp8() {
   };
 }
 let apiClient;
+const isApiClientRequestOptions = (value) => {
+  if (!value || typeof value !== "object") return false;
+  return "signal" in value;
+};
 const initApiClient = async (args) => {
   if (env.SSR) {
     if (!args) {
@@ -441,7 +445,7 @@ const initApiClient = async (args) => {
     }
     const {
       getServerApiClient
-    } = await import("./getServerApiClient-BzqOKL0g.js");
+    } = await import("./getServerApiClient-DnG8591C.js");
     apiClient = await getServerApiClient(args.app);
   } else {
     const axios = (await import("axios/dist/browser/axios.cjs")).default;
@@ -453,7 +457,8 @@ const initApiClient = async (args) => {
       }
     });
     const createMethod = (method) => {
-      return async (path, payload, _ctx) => {
+      return async (path, payload, ctxOrOptions, options) => {
+        const requestOptions = isApiClientRequestOptions(ctxOrOptions) ? ctxOrOptions : options;
         const config = {
           method,
           url: path,
@@ -462,6 +467,9 @@ const initApiClient = async (args) => {
           } : {
             data: payload
           },
+          ...requestOptions?.signal ? {
+            signal: requestOptions.signal
+          } : {},
           headers: {
             // ...(typeof ctxOrPath !== 'string' && {
             //   // 'X-Custom-Header': ctxOrPath.someHeaderValue,