vovk 3.0.0-draft.41 → 3.0.0-draft.411

package/LICENSE

@@ -16,7 +16,7 @@
     "nextjs",
     "router"
   ],
-  "author": "Andrii Gubanov",
+  "author": "Andrey Gubanov",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/finom/vovk/issues"

package/README.md

@@ -4,109 +4,21 @@
     <source width="300" media="(prefers-color-scheme: light)" srcset="https://vovk.dev/vovk-logo.svg">
     <img width="300" alt="vovk" src="https://vovk.dev/vovk-logo.svg">
   </picture><br>
-  <strong>RESTful RPC for Next.js</strong>
-  
+  <strong>RESTful + RPC = ♥️</strong>
 </p>
 
 <p align="center">
-  Transforms <a href="https://nextjs.org/docs/app">Next.js</a> into a powerful REST API platform with RPC capabilities. 
-  <br><br>
-  ℹ️ Improved syntax for Zod and DTO validation is coming soon. Stay tuned!
+  Back-end meta-framework for <a href="https://nextjs.org/docs/app">Next.js</a>
 </p>
 
-<p align="center">
-  <a href="https://vovk.dev/">Documentation</a>&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://discord.gg/qdT8WEHUuP">Discord</a>&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://github.com/finom/vovk-examples">Code Examples</a>&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://github.com/finom/vovk-zod">vovk-zod</a>&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://github.com/finom/vovk-hello-world">vovk-hello-world</a>&nbsp;&nbsp;&nbsp;&nbsp;
-  <a href="https://github.com/finom/vovk-react-native-example">vovk-react-native-example</a>
-</p>
-<p align="center">
-  <a href="https://www.npmjs.com/package/vovk"><img src="https://badge.fury.io/js/vovk.svg" alt="npm version" /></a>&nbsp;
-  <a href="https://www.typescriptlang.org/"><img src="https://img.shields.io/badge/%3C%2F%3E-TypeScript-%230074c1.svg" alt="TypeScript" /></a>&nbsp;
-  <a href="https://github.com/finom/vovk/actions/workflows/main.yml"><img src="https://github.com/finom/vovk/actions/workflows/main.yml/badge.svg" alt="Build status" /></a>
-</p>
+---
 
- <br />
+## vovk [![npm version](https://badge.fury.io/js/vovk.svg)](https://www.npmjs.com/package/vovk)
 
-Example back-end Controller Class:
+The main library with [zero dependencies](https://bundlephobia.com/result?p=vovk) that's going to be used in production. It provides a wrapper for Next.js API routes, internal RPC API, utilities and types.
 
-```ts
-// /src/modules/post/PostController.ts
-import { get, prefix, type VovkRequest } from 'vovk';
-import PostService from './PostService';
-
-@prefix('posts')
-export default class PostController {
-  /**
-   * Create a comment on a post
-   * POST /api/posts/:postId/comments
-   */
-  @post(':postId/comments')
-  static async createComment(
-    // decorate NextRequest type with body and query types
-    req: VovkRequest<{ content: string; userId: string }, { notificationType: 'push' | 'email' }>,
-    { postId }: { postId: string } // params
-  ) {
-    // use standard Next.js API to get body and query
-    const { content, userId } = await req.json();
-    const notificationType = req.nextUrl.searchParams.get('notificationType');
-
-    // perform the request to the database in a custom service
-    return PostService.createComment({
-      postId,
-      content,
-      userId,
-      notificationType,
-    });
-  }
-}
+```sh
+npm install vovk
 ```
 
-Example component that uses the auto-generated client library:
-
-```tsx
-'use client';
-import { useState } from 'react';
-import { PostController } from 'vovk-client';
-import type { VovkReturnType } from 'vovk';
-
-export default function Example() {
-  const [response, setResponse] = useState<VovkReturnType<typeof PostController.createComment>>();
-
-  return (
-    <>
-      <button
-        onClick={async () =>
-          setResponse(
-            await PostController.createComment({
-              body: {
-                content: 'Hello, World!',
-                userId: '1',
-              },
-              params: { postId: '69' },
-              query: { notificationType: 'push' },
-            })
-          )
-        }
-      >
-        Post a comment
-      </button>
-      <div>{JSON.stringify(response)}</div>
-    </>
-  );
-}
-```
-
-Alternatively, the resource can be fetched wit the regular `fetch` function:
-
-```ts
-fetch('/api/posts/69?notificationType=push', {
-  method: 'POST',
-  body: JSON.stringify({
-    content: 'Hello, World!',
-    userId: '1',
-  }),
-});
-```
+For more information, please visit the [getting started guide](https://vovk.dev/getting-started) or check out the [Vovk.ts examples](https://vovk-examples.vercel.app/).

package/bin/index.mjs

@@ -0,0 +1,8 @@
+#!/usr/bin/env node
+import { spawn } from 'child_process';
+
+console.warn(`Vovk CLI requires vovk-cli package. Running "npx vovk-cli ${process.argv.slice(2).join(' ')}" instead.`);
+
+spawn('npx', ['vovk-cli', ...process.argv.slice(2)], { stdio: 'inherit' }).on('exit', (code) => {
+  process.exit(code);
+});

package/cjs/JSONLinesResponse.d.ts

@@ -0,0 +1,19 @@
+import type { KnownAny, StreamAbortMessage } from './types';
+import './utils/shim';
+export declare class JSONLinesResponse<T> extends Response {
+    isClosed: boolean;
+    controller?: ReadableStreamDefaultController | null;
+    readonly encoder: TextEncoder | null;
+    readonly readableStream: ReadableStream | null;
+    private iteratorQueue;
+    private iteratorResolvers;
+    constructor(request?: Request, init?: ResponseInit);
+    send: (data: T | StreamAbortMessage) => void;
+    close: () => void;
+    throw: (e: KnownAny) => void;
+    [Symbol.dispose]: () => void;
+    [Symbol.asyncDispose]: () => void;
+    [Symbol.asyncIterator]: () => {
+        next: () => Promise<IteratorResult<T | StreamAbortMessage>>;
+    };
+}

package/cjs/JSONLinesResponse.js

@@ -0,0 +1,93 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JSONLinesResponse = void 0;
+require("./utils/shim");
+class JSONLinesResponse extends Response {
+    isClosed = false;
+    controller;
+    encoder;
+    readableStream;
+    iteratorQueue = [];
+    iteratorResolvers = [];
+    constructor(request, init) {
+        const encoder = new TextEncoder();
+        let readableController;
+        const readableStream = new ReadableStream({
+            cancel: () => {
+                this.isClosed = true;
+            },
+            start: (controller) => {
+                readableController = controller;
+            },
+        });
+        const accept = request?.headers?.get('accept');
+        super(readableStream, {
+            ...init,
+            headers: {
+                'content-type': !request || accept?.includes('application/jsonl')
+                    ? 'application/jsonl; charset=utf-8'
+                    : 'text/plain; charset=utf-8',
+                ...init?.headers,
+            },
+        });
+        this.readableStream = request ? readableStream : null;
+        this.encoder = request ? encoder : null;
+        this.controller = request ? readableController : null;
+        request?.signal?.addEventListener('abort', this.close, { once: true });
+    }
+    send = (data) => {
+        const { controller, encoder } = this;
+        if (this.isClosed)
+            return;
+        // Enqueue to the ReadableStream
+        controller?.enqueue(encoder?.encode(JSON.stringify(data) + '\n'));
+        // Handle async iterator consumers
+        if (this.iteratorResolvers.length > 0) {
+            // If there's a pending next() call, resolve it immediately
+            const resolve = this.iteratorResolvers.shift();
+            resolve({ value: data, done: false });
+        }
+        else {
+            // Otherwise, queue the value for later consumption
+            this.iteratorQueue.push(data);
+        }
+    };
+    close = () => {
+        const { controller } = this;
+        if (this.isClosed)
+            return;
+        this.isClosed = true;
+        controller?.close();
+        // Resolve all pending iterator next() calls with done: true
+        while (this.iteratorResolvers.length > 0) {
+            const resolve = this.iteratorResolvers.shift();
+            resolve({ done: true, value: undefined });
+        }
+    };
+    throw = (e) => {
+        this.send({ isError: true, reason: e instanceof Error ? e.message : e });
+        return this.close();
+    };
+    [Symbol.dispose] = () => this.close();
+    [Symbol.asyncDispose] = () => this.close();
+    [Symbol.asyncIterator] = () => {
+        return {
+            next: async () => {
+                // If we have queued values, return them immediately
+                if (this.iteratorQueue.length > 0) {
+                    const value = this.iteratorQueue.shift();
+                    return { value, done: false };
+                }
+                // If the stream is closed and no more values, we're done
+                if (this.isClosed) {
+                    return { done: true, value: undefined };
+                }
+                // Otherwise, wait for the next value or close
+                return new Promise((resolve) => {
+                    this.iteratorResolvers.push(resolve);
+                });
+            },
+        };
+    };
+}
+exports.JSONLinesResponse = JSONLinesResponse;

package/{VovkApp.d.ts → cjs/VovkApp.d.ts}

@@ -1,27 +1,28 @@
-import { HttpMethod, HttpStatus, type RouteHandler, type VovkController, type DecoratorOptions, type VovkRequest } from './types';
+import type { NextRequest } from 'next/server';
+import { HttpMethod, HttpStatus, type RouteHandler, type VovkController, type DecoratorOptions } from './types';
 export declare class VovkApp {
     #private;
     private static getHeadersFromOptions;
     routes: Record<HttpMethod, Map<VovkController, Record<string, RouteHandler>>>;
-    GET: (req: VovkRequest, data: {
+    GET: (req: NextRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;
-    POST: (req: VovkRequest, data: {
+    POST: (req: NextRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;
-    PUT: (req: VovkRequest, data: {
+    PUT: (req: NextRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;
-    PATCH: (req: VovkRequest, data: {
+    PATCH: (req: NextRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;
-    DELETE: (req: VovkRequest, data: {
+    DELETE: (req: NextRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;
-    HEAD: (req: VovkRequest, data: {
+    HEAD: (req: NextRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;
-    OPTIONS: (req: VovkRequest, data: {
+    OPTIONS: (req: NextRequest, data: {
         params: Promise<Record<string, string[]>>;
     }) => Promise<Response>;
     respond: (status: HttpStatus, body: unknown, options?: DecoratorOptions) => Response;

package/{VovkApp.js → cjs/VovkApp.js}

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VovkApp = void 0;
 const types_1 = require("./types");
 const HttpException_1 = require("./HttpException");
-const StreamJSONResponse_1 = require("./StreamJSONResponse");
+const JSONLinesResponse_1 = require("./JSONLinesResponse");
 const reqQuery_1 = __importDefault(require("./utils/reqQuery"));
 const reqMeta_1 = __importDefault(require("./utils/reqMeta"));
 const reqForm_1 = __importDefault(require("./utils/reqForm"));
@@ -16,9 +16,9 @@ class VovkApp {
         if (!options)
             return {};
         const corsHeaders = {
-            'Access-Control-Allow-Origin': '*',
-            'Access-Control-Allow-Methods': 'GET, POST, PUT, DELETE, OPTIONS, HEAD',
-            'Access-Control-Allow-Headers': 'Content-Type, Authorization',
+            'access-control-allow-origin': '*',
+            'access-control-allow-methods': 'GET, POST, PUT, DELETE, OPTIONS, HEAD',
+            'access-control-allow-headers': 'content-type, authorization',
         };
         const headers = {
             ...(options.cors ? corsHeaders : {}),
@@ -46,7 +46,7 @@ class VovkApp {
         return new Response(JSON.stringify(body), {
             status,
             headers: {
-                'Content-Type': 'application/json',
+                'content-type': 'application/json',
                 ..._a.getHeadersFromOptions(options),
             },
         });
@@ -59,70 +59,91 @@ class VovkApp {
             isError: true,
         }, options);
     };
-    #callMethod = async (httpMethod, req, params) => {
+    #getHandler = ({ handlers, path, params, }) => {
+        let methodParams = {};
+        if (Object.keys(params).length === 0) {
+            return { handler: handlers[''], methodParams };
+        }
+        const allMethodKeys = Object.keys(handlers);
+        let methodKeys = [];
+        const pathStr = path.join('/');
+        methodKeys = allMethodKeys
+            // First, try to match literal routes exactly.
+            .filter((p) => {
+            if (p.includes('{'))
+                return false; // Skip parameterized paths
+            return p === pathStr;
+        });
+        if (!methodKeys.length) {
+            methodKeys = allMethodKeys.filter((p) => {
+                const routeSegments = p.split('/');
+                if (routeSegments.length !== path.length)
+                    return false;
+                const params = {};
+                for (let i = 0; i < routeSegments.length; i++) {
+                    const routeSegment = routeSegments[i];
+                    const pathSegment = path[i];
+                    if (routeSegment.includes('{')) {
+                        // const parameter = routeSegment.slice(1);
+                        const regexPattern = routeSegment
+                            .replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // Escape special chars
+                            .replace(/\\{(\w+)\\}/g, '(?<$1>[^/]+)'); // Replace {var} with named groups
+                        const values = pathSegment.match(new RegExp(`^${regexPattern}$`))?.groups ?? {};
+                        for (const parameter in values) {
+                            if (!Object.prototype.hasOwnProperty.call(values, parameter))
+                                continue;
+                            if (parameter in params) {
+                                throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, `Duplicate parameter "${parameter}" at ${p}`);
+                            }
+                            // If it's a parameterized segment, capture the parameter value.
+                            params[parameter] = values[parameter];
+                        }
+                    }
+                    else if (routeSegment !== pathSegment) {
+                        // If it's a literal segment and it does not match the corresponding path segment, return false.
+                        return false;
+                    }
+                }
+                methodParams = params;
+                return true;
+            });
+        }
+        if (methodKeys.length > 1) {
+            throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, `Conflicting routes found: ${methodKeys.join(', ')}`);
+        }
+        const [methodKey] = methodKeys;
+        if (methodKey) {
+            return { handler: handlers[methodKey], methodParams };
+        }
+        return { handler: null, methodParams };
+    };
+    #callMethod = async (httpMethod, nextReq, params) => {
+        const req = nextReq;
         const controllers = this.routes[httpMethod];
-        const methodParams = {};
         const path = params[Object.keys(params)[0]];
         const handlers = {};
+        let headerList;
+        try {
+            headerList = nextReq.headers;
+        }
+        catch {
+            // this is static rendering environment, headers are not available
+            headerList = null;
+        }
+        const xMeta = headerList?.get('x-meta');
+        const xMetaHeader = xMeta && JSON.parse(xMeta);
+        if (xMetaHeader)
+            (0, reqMeta_1.default)(req, { xMetaHeader });
         controllers.forEach((staticMethods, controller) => {
             const prefix = controller._prefix ?? '';
-            if (!controller._activated) {
-                throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, `Controller "${controller.name}" found but not activated`);
-            }
-            Object.entries(staticMethods).forEach(([path, staticMethod]) => {
+            Object.entries(staticMethods ?? {}).forEach(([path, staticMethod]) => {
                 const fullPath = [prefix, path].filter(Boolean).join('/');
                 handlers[fullPath] = { staticMethod, controller };
             });
         });
-        const getHandler = () => {
-            if (Object.keys(params).length === 0) {
-                return handlers[''];
-            }
-            const allMethodKeys = Object.keys(handlers);
-            let methodKeys = [];
-            methodKeys = allMethodKeys
-                // First, try to match literal routes exactly.
-                .filter((p) => {
-                if (p.includes(':'))
-                    return false; // Skip parameterized paths
-                return p === path.join('/');
-            });
-            if (!methodKeys.length) {
-                methodKeys = allMethodKeys.filter((p) => {
-                    const routeSegments = p.split('/');
-                    if (routeSegments.length !== path.length)
-                        return false;
-                    for (let i = 0; i < routeSegments.length; i++) {
-                        const routeSegment = routeSegments[i];
-                        const pathSegment = path[i];
-                        if (routeSegment.startsWith(':')) {
-                            const parameter = routeSegment.slice(1);
-                            if (parameter in methodParams) {
-                                throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, `Duplicate parameter "${parameter}"`);
-                            }
-                            // If it's a parameterized segment, capture the parameter value.
-                            methodParams[parameter] = pathSegment;
-                        }
-                        else if (routeSegment !== pathSegment) {
-                            // If it's a literal segment and it does not match the corresponding path segment, return false.
-                            return false;
-                        }
-                    }
-                    return true;
-                });
-            }
-            if (methodKeys.length > 1) {
-                throw new HttpException_1.HttpException(types_1.HttpStatus.INTERNAL_SERVER_ERROR, `Conflicting routes found: ${methodKeys.join(', ')}`);
-            }
-            const [methodKey] = methodKeys;
-            if (methodKey) {
-                return handlers[methodKey];
-            }
-            return null;
-        };
-        const handler = getHandler();
+        const { handler, methodParams } = this.#getHandler({ handlers, path, params });
         if (!handler) {
-            return this.#respondWithError(types_1.HttpStatus.NOT_FOUND, `Route ${path.join('/')} is not found`);
+            return this.#respondWithError(types_1.HttpStatus.NOT_FOUND, `${Object.keys(handlers)} - Route ${path.join('/')} is not found`);
         }
         const { staticMethod, controller } = handler;
         req.vovk = {
@@ -130,19 +151,24 @@ class VovkApp {
             query: () => (0, reqQuery_1.default)(req),
             meta: (meta) => (0, reqMeta_1.default)(req, meta),
             form: () => (0, reqForm_1.default)(req),
+            params: () => methodParams,
         };
         try {
+            await staticMethod._options?.before?.call(controller, req);
             const result = await staticMethod.call(controller, req, methodParams);
+            if (result instanceof Response) {
+                return result;
+            }
             const isIterator = typeof result === 'object' &&
                 !!result &&
+                !(result instanceof Array) &&
                 ((Reflect.has(result, Symbol.iterator) &&
                     typeof result[Symbol.iterator] === 'function') ||
                     (Reflect.has(result, Symbol.asyncIterator) &&
                         typeof result[Symbol.asyncIterator] === 'function'));
-            if (isIterator && !(result instanceof Array)) {
-                const streamResponse = new StreamJSONResponse_1.StreamJSONResponse({
+            if (isIterator) {
+                const streamResponse = new JSONLinesResponse_1.JSONLinesResponse(req, {
                     headers: {
-                        ...StreamJSONResponse_1.StreamJSONResponse.defaultHeaders,
                         ..._a.getHeadersFromOptions(staticMethod._options),
                     },
                 });
@@ -159,9 +185,6 @@ class VovkApp {
                 })();
                 return streamResponse;
             }
-            if (result instanceof Response) {
-                return result;
-            }
             return this.respond(200, result ?? null, staticMethod._options);
         }
         catch (e) {
@@ -174,7 +197,7 @@ class VovkApp {
                 console.error(onErrorError);
             }
             if (err.message !== 'NEXT_REDIRECT' && err.message !== 'NEXT_NOT_FOUND') {
-                const statusCode = err.statusCode ?? types_1.HttpStatus.INTERNAL_SERVER_ERROR;
+                const statusCode = err.statusCode || types_1.HttpStatus.INTERNAL_SERVER_ERROR;
                 return this.#respondWithError(statusCode, err.message, staticMethod._options, err.cause);
             }
             throw e; // if NEXT_REDIRECT or NEXT_NOT_FOUND, rethrow it

package/cjs/client/createRPC.d.ts

@@ -0,0 +1,5 @@
+import type { KnownAny } from '../types';
+import type { VovkClient, VovkClientFetcher, VovkDefaultFetcherOptions } from './types';
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = Record<string, never>>(givenSchema: unknown, segmentName: string, rpcModuleName: string, givenFetcher?: VovkClientFetcher<OPTS> | Promise<{
+    fetcher: VovkClientFetcher<OPTS>;
+}>, options?: VovkDefaultFetcherOptions<OPTS>) => VovkClient<T, OPTS>;

package/cjs/client/createRPC.js

@@ -0,0 +1,108 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRPC = void 0;
+const fetcher_1 = require("./fetcher");
+const defaultHandler_1 = require("./defaultHandler");
+const defaultStreamHandler_1 = require("./defaultStreamHandler");
+const serializeQuery_1 = __importDefault(require("../utils/serializeQuery"));
+const trimPath = (path) => path.trim().replace(/^\/|\/$/g, '');
+const getHandlerPath = (endpoint, params, query) => {
+    let result = endpoint;
+    const queryStr = query ? (0, serializeQuery_1.default)(query) : null;
+    for (const [key, value] of Object.entries(params ?? {})) {
+        result = result.replace(`{${key}}`, value);
+    }
+    return `${result}${queryStr ? '?' : ''}${queryStr}`;
+};
+const createRPC = (givenSchema, segmentName, rpcModuleName, givenFetcher, options) => {
+    const schema = givenSchema; // fixes incompatibilities with JSON module
+    // fetcher ??= defaultFetcher as NonNullable<typeof fetcher>;
+    const segmentNamePath = options?.segmentNameOverride ?? segmentName;
+    const segmentSchema = schema.segments[segmentName];
+    if (!segmentSchema)
+        throw new Error(`Unable to create RPC module. Segment schema is missing for segment "${segmentName}".`);
+    const controllerSchema = schema.segments[segmentName]?.controllers[rpcModuleName];
+    const client = {};
+    if (!controllerSchema) {
+        throw new Error(`Unable to create RPC module. Controller schema is missing for module "${rpcModuleName}" from segment "${segmentName}".`);
+    }
+    const controllerPrefix = trimPath(controllerSchema.prefix ?? '');
+    for (const [staticMethodName, handlerSchema] of Object.entries(controllerSchema.handlers ?? {})) {
+        const { path, httpMethod, validation } = handlerSchema;
+        const getEndpoint = ({ apiRoot, params, query }) => {
+            const forceApiRoot = controllerSchema.forceApiRoot ?? segmentSchema.forceApiRoot;
+            apiRoot = apiRoot ?? forceApiRoot ?? options?.apiRoot ?? '/api';
+            const endpoint = [
+                apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/',
+                apiRoot,
+                forceApiRoot ? '' : segmentNamePath,
+                getHandlerPath([controllerPrefix, path].filter(Boolean).join('/'), params, query),
+            ]
+                .filter(Boolean)
+                .join('/')
+                .replace(/([^:])\/+/g, '$1/'); // replace // by / but not for protocols (http://, https://)
+            return endpoint;
+        };
+        const handler = (async (input = {}) => {
+            const fetcher = givenFetcher instanceof Promise
+                ? (await givenFetcher).fetcher
+                : (givenFetcher ?? fetcher_1.fetcher);
+            const validate = async (validationInput, { endpoint, }) => {
+                const validateOnClient = input.validateOnClient ??
+                    (options?.validateOnClient instanceof Promise
+                        ? (await options?.validateOnClient)?.validateOnClient
+                        : options?.validateOnClient);
+                if (validateOnClient && validation) {
+                    if (typeof validateOnClient !== 'function') {
+                        throw new Error('validateOnClient must be a function');
+                    }
+                    return ((await validateOnClient({ ...validationInput }, validation, { fullSchema: schema, endpoint })) ??
+                        validationInput);
+                }
+                return validationInput;
+            };
+            const internalOptions = {
+                name: staticMethodName,
+                httpMethod: httpMethod,
+                getEndpoint,
+                validate,
+                defaultHandler: defaultHandler_1.defaultHandler,
+                defaultStreamHandler: defaultStreamHandler_1.defaultStreamHandler,
+                schema: handlerSchema,
+            };
+            const internalInput = {
+                ...options,
+                ...input,
+                body: input.body ?? null,
+                query: input.query ?? {},
+                params: input.params ?? {},
+            };
+            if (!fetcher)
+                throw new Error('Fetcher is not provided');
+            const [respData, resp] = await fetcher(internalOptions, internalInput);
+            return input.transform ? input.transform(respData, resp) : respData;
+        });
+        // TODO use Object.freeze, Object.seal or Object.defineProperty to avoid mutation
+        handler.schema = handlerSchema;
+        handler.controllerSchema = controllerSchema;
+        handler.segmentSchema = segmentSchema;
+        handler.fullSchema = schema;
+        handler.isRPC = true;
+        handler.path = [segmentNamePath, controllerPrefix, path].filter(Boolean).join('/');
+        handler.queryKey = (key) => [
+            handler.segmentSchema.segmentName,
+            handler.controllerSchema.prefix ?? '',
+            handler.controllerSchema.rpcModuleName,
+            handler.schema.path,
+            handler.schema.httpMethod,
+            ...(key ?? []),
+        ];
+        // @ts-expect-error TODO
+        client[staticMethodName] = handler;
+    }
+    return client;
+};
+exports.createRPC = createRPC;

package/cjs/client/defaultHandler.d.ts

@@ -0,0 +1,6 @@
+import { VovkHandlerSchema } from '../types';
+export declare const DEFAULT_ERROR_MESSAGE = "Unknown error at defaultHandler";
+export declare const defaultHandler: ({ response, schema }: {
+    response: Response;
+    schema: VovkHandlerSchema;
+}) => Promise<unknown>;

package/{client → cjs/client}/defaultHandler.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultHandler = exports.DEFAULT_ERROR_MESSAGE = void 0;
 const HttpException_1 = require("../HttpException");
 exports.DEFAULT_ERROR_MESSAGE = 'Unknown error at defaultHandler';
-const defaultHandler = async (response) => {
+// Helper function to get a value from an object using dot notation path
+const getNestedValue = (obj, path) => {
+    return path.split('.').reduce((o, key) => (o && typeof o === 'object' ? o[key] : undefined), obj);
+};
+const defaultHandler = async ({ response, schema }) => {
     let result;
     try {
         result = await response.json();
@@ -13,9 +17,12 @@ const defaultHandler = async (response) => {
         throw new HttpException_1.HttpException(response.status, e?.message ?? exports.DEFAULT_ERROR_MESSAGE);
     }
     if (!response.ok) {
+        const errorKey = schema.operationObject && 'x-errorMessageKey' in schema.operationObject
+            ? schema.operationObject['x-errorMessageKey']
+            : 'message';
         // handle server errors
         const errorResponse = result;
-        throw new HttpException_1.HttpException(response.status, errorResponse?.message ?? exports.DEFAULT_ERROR_MESSAGE, errorResponse?.cause);
+        throw new HttpException_1.HttpException(response.status, getNestedValue(errorResponse, errorKey) ?? exports.DEFAULT_ERROR_MESSAGE, errorResponse?.cause ?? JSON.stringify(result));
     }
     return result;
 };