@funduck/connectrpc-fastify 1.0.10 → 1.0.12

package/README.md

@@ -9,7 +9,7 @@ This is a wrapper for [Connectrpc](https://github.com/connectrpc/connect-es) usi
 
 If you are comfortable with HTTP/1 only and want a compact, ready-to-use setup, this repository is for you.
 
-It simplifies the binding of controllers, middlewares, and guards.
+It simplifies the binding of controllers and middlewares.
 
 I use it as a basis for integration into Nestjs, which will be implemented [here](https://github.com/funduck/connectrpc-fastify-nestjs).
 
@@ -21,17 +21,22 @@ This library allows you to:
 * Perform RPC with simple request and response messages
 * Perform RPC with streaming responses
 * Perform RPC with streaming requests
-* Use middlewares
-* Use global guards
+* Use middlewares with Fastify hooks
+* Access HandlerContext in controllers (headers, context values, etc.)
 
 *Bidirectional streaming RPC is currently out of scope because it requires HTTP/2, which is unstable on public networks. In practice, HTTP/1 provides more consistent performance.*
 
 ## How To Use
-You can check out `test` directory for a complete example of server and client. Start reading from `test/server.ts`.
+You can check out `test` directory for a complete example of server and client. Start reading from `test/demo/server.ts`.
 
 ### Controllers
 Controller must implement the service interface and register itself with `ConnectRPC.registerController` in the constructor.
+
+Controller methods receive `HandlerContext` which provides access to request headers, context values, and other metadata.
+
 ```TS
+import type { HandlerContext } from '@connectrpc/connect';
+
 export class ElizaController implements Service<typeof ElizaService> {
   constructor() {
     ConnectRPC.registerController(this, ElizaService);
@@ -39,7 +44,11 @@ export class ElizaController implements Service<typeof ElizaService> {
 
   async say(
     request: SayRequest,
+    context: HandlerContext,
   ) {
+    // Access headers from context
+    const authHeader = context.requestHeader.get('authorization');
+    
     return {
       sentence: `You said: ${request.sentence}`,
     };
@@ -66,91 +75,44 @@ try {
 ```
 
 ### Middlewares
-You can use middlewares for pre-processing requests.
+Middlewares run as Fastify hooks and have access to raw request/response objects.
 
 Middleware must implement `Middleware` interface and register itself with `ConnectRPC.registerMiddleware` in the constructor.
 ```TS
-export class TestMiddleware1 implements Middleware {
+export class AuthMiddleware implements Middleware {
   constructor() {
     ConnectRPC.registerMiddleware(this);
   }
 
   use(req: FastifyRequest['raw'], res: FastifyReply['raw'], next: () => void) {
+    // Check authentication
+    const authHeader = req.headers['authorization'];
+    if (!authHeader) {
+      res.statusCode = 401;
+      res.end('Unauthorized');
+      return;
+    }
     next();
   }
 }
 ```
 
-Then create an instance of the middleware before registering the ConnectRPC plugin.
+Create an instance of the middleware before registering the ConnectRPC plugin.
 ```TS
-const fastify = Fastify({
-    logger: true,
-});
+const fastify = Fastify({ logger: true });
 
 new ElizaController();
-
-new TestMiddleware1();
+new AuthMiddleware();
 
 await ConnectRPC.registerFastifyPlugin(fastify);
 
 ConnectRPC.initMiddlewares(fastify, [
-    middlewareConfig(TestMiddleware1), // Global middleware for all services and methods
-    //middlewareConfig(TestMiddleware1, ElizaService), // Middleware for all ElizaService methods
-    //middlewareConfig(TestMiddleware1, ElizaService, ['say']), // Middleware for ElizaService's say method only
+    middlewareConfig(AuthMiddleware), // Global middleware for all services and methods
+    // middlewareConfig(AuthMiddleware, ElizaService), // Middleware for all ElizaService methods
+    // middlewareConfig(AuthMiddleware, ElizaService, ['say']), // Middleware for specific method only
 ]);
 
-try {
-    await fastify.listen({ port: 3000 });
-} catch (err) {
-    fastify.log.error(err);
-    process.exit(1);
-}
-```
-
-### Guards
-Guards are used to restrict access to certain services or methods.
-
-Guard must implement `Guard` interface and register itself with `ConnectRPC.registerGuard` in the constructor.
-```TS
-export class TestGuard1 implements Guard {
-  constructor() {
-    ConnectRPC.registerGuard(this);
-  }
-
-  canActivate(context: ExecutionContext): boolean {
-    return true;
-  }
-}
-```
-
-Then create an instance of the guard before registering the ConnectRPC plugin and initialize it similarly to middlewares.
-```TS
-const fastify = Fastify({
-    logger: true,
-});
-
-new ElizaController();
-
-new TestMiddleware1();
-
-new TestGuard1();
-
-await ConnectRPC.registerFastifyPlugin(fastify);
-
-ConnectRPC.initMiddlewares(fastify, [
-    middlewareConfig(TestMiddleware1), // Global middleware for all services and methods
-    // middlewareConfig(TestMiddleware1, ElizaService), // Middleware for all ElizaService methods
-    // middlewareConfig(TestMiddleware1, ElizaService, ['say']), // Middleware for ElizaService's say method only
-]);
-
-ConnectRPC.initGuards(fastify);
-
-try {
-    await fastify.listen({ port: 3000 });
-} catch (err) {
-    fastify.log.error(err);
-    process.exit(1);
-}
+await fastify.listen({ port: 3000 });
 ```
 
 ## Feedback

package/dist/connectrpc.d.ts

@@ -1,6 +1,6 @@
 import { GenService, GenServiceMethods } from '@bufbuild/protobuf/codegenv2';
 import { FastifyInstance } from 'fastify';
-import { Guard, Logger, Middleware, MiddlewareConfigUnion, Service } from './interfaces';
+import { Logger, Middleware, MiddlewareConfigUnion, Service } from './interfaces';
 declare class ConnectRPCClass {
     setLogger(customLogger: Logger): void;
     registerMiddleware(self: Middleware, options?: {
@@ -13,14 +13,9 @@ declare class ConnectRPCClass {
     registerController<T extends GenServiceMethods>(self: Service<GenService<T>>, service: GenService<T>, options?: {
         allowMultipleInstances?: boolean;
     }): void;
-    registerGuard(self: Guard, options?: {
-        allowMultipleInstances?: boolean;
-    }): void;
     registerFastifyPlugin(server: FastifyInstance): Promise<void>;
     private _middlewaresInitialized;
     initMiddlewares(server: FastifyInstance, middlewareConfigs: MiddlewareConfigUnion[]): Promise<void>;
-    private _guardsInitialized;
-    initGuards(server: FastifyInstance): Promise<void>;
 }
 /**
  * Main ConnectRPC class to manage registration of controllers and middlewares

package/dist/connectrpc.js

@@ -2,14 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectRPC = void 0;
 const fastify_plugin_1 = require("./fastify-plugin");
-const guards_1 = require("./guards");
 const helpers_1 = require("./helpers");
 const middlewares_1 = require("./middlewares");
 const stores_1 = require("./stores");
 class ConnectRPCClass {
     constructor() {
         this._middlewaresInitialized = false;
-        this._guardsInitialized = false;
     }
     setLogger(customLogger) {
         (0, helpers_1.setLogger)(customLogger);
@@ -24,9 +22,6 @@ class ConnectRPCClass {
     registerController(self, service, options) {
         stores_1.ControllersStore.registerInstance(self, service, options);
     }
-    registerGuard(self, options) {
-        stores_1.GuardsStore.registerInstance(self, options);
-    }
     registerFastifyPlugin(server) {
         return (0, fastify_plugin_1.registerFastifyPlugin)(server);
     }
@@ -34,19 +29,9 @@ class ConnectRPCClass {
         if (this._middlewaresInitialized) {
             throw new Error('Middlewares have already been initialized!');
         }
-        if (this._guardsInitialized) {
-            throw new Error('Middlewares must be initialized before guards!');
-        }
         this._middlewaresInitialized = true;
         return (0, middlewares_1.initMiddlewares)(server, middlewareConfigs);
     }
-    initGuards(server) {
-        if (this._guardsInitialized) {
-            throw new Error('Guards have already been initialized!');
-        }
-        this._guardsInitialized = true;
-        return (0, guards_1.initGuards)(server);
-    }
 }
 /**
  * Main ConnectRPC class to manage registration of controllers and middlewares

package/dist/connectrpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"connectrpc.js","sourceRoot":"","sources":["../src/connectrpc.ts"],"names":[],"mappings":";;;AAEA,qDAAyD;AACzD,qCAAsC;AACtC,uCAAsC;AAQtC,+CAAgD;AAChD,qCAA0E;AAE1E,MAAM,eAAe;IAArB;QAyCU,4BAAuB,GAAG,KAAK,CAAC;QAgBhC,uBAAkB,GAAG,KAAK,CAAC;IASrC,CAAC;IAjEC,SAAS,CAAC,YAAoB;QAC5B,IAAA,mBAAS,EAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;IAED,kBAAkB,CAChB,IAAgB,EAChB,OAEC;QAED,wBAAe,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,kBAAkB,CAChB,IAA4B,EAC5B,OAAsB,EACtB,OAEC;QAED,yBAAgB,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,aAAa,CACX,IAAW,EACX,OAEC;QAED,oBAAW,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,qBAAqB,CAAC,MAAuB;QAC3C,OAAO,IAAA,sCAAqB,EAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAID,eAAe,CACb,MAAuB,EACvB,iBAA0C;QAE1C,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;QACpC,OAAO,IAAA,6BAAe,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAID,UAAU,CAAC,MAAuB;QAChC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;QAC/B,OAAO,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC;IAC5B,CAAC;CACF;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC"}
+{"version":3,"file":"connectrpc.js","sourceRoot":"","sources":["../src/connectrpc.ts"],"names":[],"mappings":";;;AAEA,qDAAyD;AACzD,uCAAsC;AAOtC,+CAAgD;AAChD,qCAA6D;AAE7D,MAAM,eAAe;IAArB;QAgCU,4BAAuB,GAAG,KAAK,CAAC;IAY1C,CAAC;IA3CC,SAAS,CAAC,YAAoB;QAC5B,IAAA,mBAAS,EAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;IAED,kBAAkB,CAChB,IAAgB,EAChB,OAEC;QAED,wBAAe,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED;;;OAGG;IACH,kBAAkB,CAChB,IAA4B,EAC5B,OAAsB,EACtB,OAEC;QAED,yBAAgB,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,qBAAqB,CAAC,MAAuB;QAC3C,OAAO,IAAA,sCAAqB,EAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAID,eAAe,CACb,MAAuB,EACvB,iBAA0C;QAE1C,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;QACpC,OAAO,IAAA,6BAAe,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACpD,CAAC;CACF;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC"}

package/dist/context-values.d.ts

@@ -0,0 +1,29 @@
+import { ContextKey, ContextValues } from '@connectrpc/connect';
+/**
+ * Custom ContextValues implementation that extends the standard ConnectRPC ContextValues
+ * with an entries() method to iterate over key-value pairs.
+ */
+export declare class CustomContextValues implements ContextValues {
+    private values;
+    /**
+     * Get a context value by key
+     */
+    get<T>(key: ContextKey<T>): T;
+    /**
+     * Set a context value by key
+     */
+    set<T>(key: ContextKey<T>, value: T): this;
+    /**
+     * Delete a context value by key
+     */
+    delete(key: ContextKey<unknown>): this;
+    /**
+     * Iterate over all key-value pairs in the context
+     * Returns an iterator of [ContextKey, value] pairs
+     */
+    entries(): IterableIterator<[symbol, unknown]>;
+}
+/**
+ * Create a new CustomContextValues instance
+ */
+export declare function createCustomContextValues(): CustomContextValues;

package/dist/context-values.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomContextValues = void 0;
+exports.createCustomContextValues = createCustomContextValues;
+/**
+ * Custom ContextValues implementation that extends the standard ConnectRPC ContextValues
+ * with an entries() method to iterate over key-value pairs.
+ */
+class CustomContextValues {
+    constructor() {
+        this.values = new Map();
+    }
+    /**
+     * Get a context value by key
+     */
+    get(key) {
+        if (this.values.has(key.id)) {
+            return this.values.get(key.id);
+        }
+        return key.defaultValue;
+    }
+    /**
+     * Set a context value by key
+     */
+    set(key, value) {
+        this.values.set(key.id, value);
+        return this;
+    }
+    /**
+     * Delete a context value by key
+     */
+    delete(key) {
+        this.values.delete(key.id);
+        return this;
+    }
+    /**
+     * Iterate over all key-value pairs in the context
+     * Returns an iterator of [ContextKey, value] pairs
+     */
+    *entries() {
+        for (const [id, value] of this.values.entries()) {
+            yield [id, value];
+        }
+    }
+}
+exports.CustomContextValues = CustomContextValues;
+/**
+ * Create a new CustomContextValues instance
+ */
+function createCustomContextValues() {
+    return new CustomContextValues();
+}
+//# sourceMappingURL=context-values.js.map

package/dist/context-values.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-values.js","sourceRoot":"","sources":["../src/context-values.ts"],"names":[],"mappings":";;;AAiDA,8DAEC;AAjDD;;;GAGG;AACH,MAAa,mBAAmB;IAAhC;QACU,WAAM,GAAG,IAAI,GAAG,EAAmB,CAAC;IAqC9C,CAAC;IAnCC;;OAEG;IACH,GAAG,CAAI,GAAkB;QACvB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAM,CAAC;QACtC,CAAC;QACD,OAAO,GAAG,CAAC,YAAY,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,GAAG,CAAI,GAAkB,EAAE,KAAQ;QACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,GAAwB;QAC7B,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,CAAC,OAAO;QACN,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YAChD,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;CACF;AAtCD,kDAsCC;AAED;;GAEG;AACH,SAAgB,yBAAyB;IACvC,OAAO,IAAI,mBAAmB,EAAE,CAAC;AACnC,CAAC"}

package/dist/fastify-plugin.js

@@ -2,17 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerFastifyPlugin = registerFastifyPlugin;
 const connect_fastify_1 = require("@connectrpc/connect-fastify");
-const guards_1 = require("./guards");
 const helpers_1 = require("./helpers");
+const interceptors_1 = require("./interceptors");
 const stores_1 = require("./stores");
 async function registerFastifyPlugin(server, options = {}) {
     // Create implementations from controller instances
     const implementations = new Map();
     for (const { instance, service } of stores_1.ControllersStore.values()) {
-        const guards = (0, guards_1.getGuards)(instance);
-        if (guards.length > 0) {
-            helpers_1.logger.log(`Found ${guards.length} guards on controller ${instance.constructor.name}`);
-        }
         const methodMappings = (0, helpers_1.discoverMethodMappings)(instance.__proto__, service);
         // Create the implementation object
         const implementation = {};
@@ -27,9 +23,7 @@ async function registerFastifyPlugin(server, options = {}) {
                 if (controllerMethod) {
                     // Bind the method with proper 'this' context
                     const bindedMethod = controllerMethod.bind(instance);
-                    implementation[methodName] = (...args) => {
-                        return bindedMethod(...args);
-                    };
+                    implementation[methodName] = bindedMethod;
                     // Store route metadata for guards and interceptors
                     stores_1.RouteMetadataStore.registerRoute(service.typeName, name, // PascalCase method name (e.g., "Say")
                     instance.constructor, controllerMethod, controllerMethodName, instance);
@@ -61,6 +55,7 @@ async function registerFastifyPlugin(server, options = {}) {
         grpcWeb: false,
         connect: true,
         acceptCompression: options.acceptCompression ?? [],
+        interceptors: [interceptors_1.contextInterceptor],
         routes: routes,
     });
     helpers_1.logger.log('Ready');

package/dist/fastify-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"fastify-plugin.js","sourceRoot":"","sources":["../src/fastify-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fastify-plugin.js","sourceRoot":"","sources":["../src/fastify-plugin.ts"],"names":[],"mappings":"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"}

package/dist/helpers.d.ts

@@ -11,3 +11,7 @@ export declare function discoverMethodMappings(prototype: any, service: GenServi
 export declare function convertMiddlewareToHook(middlewareInstance: any): (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
 export declare let logger: Logger;
 export declare function setLogger(customLogger: Logger): void;
+/**
+ * Generate a unique request ID
+ */
+export declare function generateRequestId(): string;

package/dist/helpers.js

@@ -4,6 +4,7 @@ exports.logger = void 0;
 exports.discoverMethodMappings = discoverMethodMappings;
 exports.convertMiddlewareToHook = convertMiddlewareToHook;
 exports.setLogger = setLogger;
+exports.generateRequestId = generateRequestId;
 /**
  * Automatically discover method mappings by matching service methods to controller methods
  */
@@ -55,22 +56,28 @@ function convertMiddlewareToHook(middlewareInstance) {
 }
 exports.logger = {
     log: (...args) => {
-        console.info(...args);
+        // console.info(...args);
     },
     error: (...args) => {
-        console.error(...args);
+        // console.error(...args);
     },
     warn: (...args) => {
-        console.warn(...args);
+        // console.warn(...args);
     },
     debug: (...args) => {
-        console.debug(...args);
+        // console.debug(...args);
     },
     verbose: (...args) => {
-        console.log(...args);
+        // console.log(...args);
     },
 };
 function setLogger(customLogger) {
     exports.logger = customLogger;
 }
+/**
+ * Generate a unique request ID
+ */
+function generateRequestId() {
+    return `req_${Date.now()}_${Math.random().toString(36).substring(2, 15)}`;
+}
 //# sourceMappingURL=helpers.js.map

package/dist/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export declare function printMsg(): void;
 export { ConnectRPC } from './connectrpc';
+export { CustomContextValues, createCustomContextValues, } from './context-values';
 export { middlewareConfig } from './interfaces';
-export type { ExecutionContext, Guard, Logger, Middleware, MiddlewareConfig, MiddlewareConfigUnion, Service, } from './interfaces';
-export { initGuards } from './guards';
+export type { Logger, Middleware, MiddlewareConfig, MiddlewareConfigUnion, Service, } from './interfaces';
 export type { OmitConnectrpcFields } from './types';
+export { getCustomContextValues } from './middlewares';

package/dist/index.js

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initGuards = exports.middlewareConfig = exports.ConnectRPC = void 0;
+exports.getCustomContextValues = exports.middlewareConfig = exports.createCustomContextValues = exports.CustomContextValues = exports.ConnectRPC = void 0;
 exports.printMsg = printMsg;
 function printMsg() {
-    console.log('Thanks for using connectrpc-fastify!');
+    console.error('connectrpc-fastify is in development mode! not ready for production yet!');
 }
 var connectrpc_1 = require("./connectrpc");
 Object.defineProperty(exports, "ConnectRPC", { enumerable: true, get: function () { return connectrpc_1.ConnectRPC; } });
+var context_values_1 = require("./context-values");
+Object.defineProperty(exports, "CustomContextValues", { enumerable: true, get: function () { return context_values_1.CustomContextValues; } });
+Object.defineProperty(exports, "createCustomContextValues", { enumerable: true, get: function () { return context_values_1.createCustomContextValues; } });
 var interfaces_1 = require("./interfaces");
 Object.defineProperty(exports, "middlewareConfig", { enumerable: true, get: function () { return interfaces_1.middlewareConfig; } });
-var guards_1 = require("./guards");
-Object.defineProperty(exports, "initGuards", { enumerable: true, get: function () { return guards_1.initGuards; } });
+var middlewares_1 = require("./middlewares");
+Object.defineProperty(exports, "getCustomContextValues", { enumerable: true, get: function () { return middlewares_1.getCustomContextValues; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,4BAEC;AAFD,SAAgB,QAAQ;IACtB,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;AACtD,CAAC;AAED,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AAEnB,2CAAgD;AAAvC,8GAAA,gBAAgB,OAAA;AAYzB,mCAAsC;AAA7B,oGAAA,UAAU,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,4BAIC;AAJD,SAAgB,QAAQ;IACtB,OAAO,CAAC,KAAK,CACX,0EAA0E,CAC3E,CAAC;AACJ,CAAC;AAED,2CAA0C;AAAjC,wGAAA,UAAU,OAAA;AAEnB,mDAG0B;AAFxB,qHAAA,mBAAmB,OAAA;AACnB,2HAAA,yBAAyB,OAAA;AAG3B,2CAAgD;AAAvC,8GAAA,gBAAgB,OAAA;AAYzB,6CAAuD;AAA9C,qHAAA,sBAAsB,OAAA"}

package/dist/interceptors.d.ts

@@ -0,0 +1,7 @@
+import type { Interceptor } from '@connectrpc/connect';
+/**
+ * ContextInterceptor - copies context values from MiddlewareContextStore to HandlerContext
+ * This interceptor should be first in the chain to ensure context values are available
+ * to subsequent interceptors and controllers.
+ */
+export declare const contextInterceptor: Interceptor;

package/dist/interceptors.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.contextInterceptor = void 0;
+const stores_1 = require("./stores");
+/**
+ * ContextInterceptor - copies context values from MiddlewareContextStore to HandlerContext
+ * This interceptor should be first in the chain to ensure context values are available
+ * to subsequent interceptors and controllers.
+ */
+const contextInterceptor = (next) => async (req) => {
+    // Get the request ID from headers
+    const requestId = req.header.get('x-server-request-id');
+    if (requestId) {
+        const middlewareContext = stores_1.MiddlewareContextStore.get(requestId);
+        if (middlewareContext) {
+            // Copy context values from middleware context to handler context
+            for (const [key, value] of middlewareContext.contextValues.entries()) {
+                req.contextValues.set({ id: key, defaultValue: undefined }, value);
+            }
+        }
+    }
+    // Continue with the next interceptor or handler
+    return await next(req);
+};
+exports.contextInterceptor = contextInterceptor;
+//# sourceMappingURL=interceptors.js.map

package/dist/interceptors.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interceptors.js","sourceRoot":"","sources":["../src/interceptors.ts"],"names":[],"mappings":";;;AACA,qCAAkD;AAElD;;;;GAIG;AACI,MAAM,kBAAkB,GAAgB,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IACrE,kCAAkC;IAClC,MAAM,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;IAExD,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,iBAAiB,GAAG,+BAAsB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAEhE,IAAI,iBAAiB,EAAE,CAAC;YACtB,iEAAiE;YACjE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,iBAAiB,CAAC,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;gBACrE,GAAG,CAAC,aAAa,CAAC,GAAG,CACnB,EAAE,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAS,EAC3C,KAAK,CACN,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,gDAAgD;IAChD,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AApBW,QAAA,kBAAkB,sBAoB7B"}

package/dist/interfaces.d.ts

@@ -1,4 +1,5 @@
 import type { GenMessage, GenService } from '@bufbuild/protobuf/codegenv2';
+import { HandlerContext } from '@connectrpc/connect';
 import { FastifyReply, FastifyRequest } from 'fastify';
 import { OmitConnectrpcFields } from './types';
 export interface Logger {
@@ -28,16 +29,19 @@ type ExtractOutput<T> = T extends {
 } ? M : never;
 /**
  * Convert a service method to a controller method signature
+ *
+ * Note: The context parameter receives a HandlerContext instance at runtime
+ * which provides access to headers, values, signal, and other request metadata.
  */
 type ServiceMethod<T> = T extends {
     methodKind: 'unary';
-} ? (request: ExtractInput<T>) => Promise<OmitConnectrpcFields<ExtractOutput<T>>> : T extends {
+} ? (request: ExtractInput<T>, context?: HandlerContext) => Promise<OmitConnectrpcFields<ExtractOutput<T>>> : T extends {
     methodKind: 'server_streaming';
-} ? (request: ExtractInput<T>) => AsyncIterable<OmitConnectrpcFields<ExtractOutput<T>>> : T extends {
+} ? (request: ExtractInput<T>, context?: HandlerContext) => AsyncIterable<OmitConnectrpcFields<ExtractOutput<T>>> : T extends {
     methodKind: 'client_streaming';
-} ? (request: AsyncIterable<ExtractInput<T>>) => Promise<OmitConnectrpcFields<ExtractOutput<T>>> : T extends {
+} ? (request: AsyncIterable<ExtractInput<T>>, context?: HandlerContext) => Promise<OmitConnectrpcFields<ExtractOutput<T>>> : T extends {
     methodKind: 'bidi_streaming';
-} ? (request: AsyncIterable<ExtractInput<T>>) => AsyncIterable<OmitConnectrpcFields<ExtractOutput<T>>> : never;
+} ? (request: AsyncIterable<ExtractInput<T>>, context?: HandlerContext) => AsyncIterable<OmitConnectrpcFields<ExtractOutput<T>>> : never;
 /**
  * Generic interface that maps a ConnectRPC service to controller methods
  *
@@ -106,20 +110,4 @@ export type MiddlewareConfigUnion = MiddlewareConfigGlobal | MiddlewareConfig<an
  * This ensures proper type inference for method names based on the service
  */
 export declare function middlewareConfig<T extends GenService<any>>(use: Type<Middleware>, on?: T, methods?: Array<ServiceMethodNames<T>>): MiddlewareConfigUnion;
-export interface ExecutionContext {
-    getClass<T = any>(): Type<T>;
-    getHandler(): Function;
-    getArgs<T extends Array<any> = any[]>(): T;
-    getArgByIndex<T = any>(index: number): T;
-    switchToHttp(): {
-        getRequest(): FastifyRequest['raw'];
-        getResponse(): FastifyReply['raw'];
-        getNext<T = any>(): () => T;
-    };
-    switchToRpc(): any;
-    switchToWs(): any;
-}
-export interface Guard {
-    canActivate(context: ExecutionContext): boolean | Promise<boolean>;
-}
 export {};

package/dist/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;AA0IA,4CAUC;AAdD;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,GAAqB,EACrB,EAAM,EACN,OAAsC;IAEtC,OAAO;QACL,GAAG;QACH,EAAE;QACF,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;AAkJA,4CAUC;AAdD;;;GAGG;AACH,SAAgB,gBAAgB,CAC9B,GAAqB,EACrB,EAAM,EACN,OAAsC;IAEtC,OAAO;QACL,GAAG;QACH,EAAE;QACF,OAAO;KACR,CAAC;AACJ,CAAC"}

package/dist/middlewares.d.ts

@@ -1,3 +1,5 @@
-import { FastifyInstance } from 'fastify';
+import { FastifyInstance, FastifyRequest } from 'fastify';
 import { MiddlewareConfigUnion } from './interfaces';
+/** This method allows middleware to access custom context values associated with a request */
+export declare function getCustomContextValues(req: FastifyRequest['raw']): import("./context-values").CustomContextValues | null;
 export declare function initMiddlewares(server: FastifyInstance, middlewareConfigs: MiddlewareConfigUnion[]): Promise<void>;

package/dist/middlewares.js

@@ -1,9 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomContextValues = getCustomContextValues;
 exports.initMiddlewares = initMiddlewares;
+const context_values_1 = require("./context-values");
 const helpers_1 = require("./helpers");
 const stores_1 = require("./stores");
+function setupCustomContextValues(req) {
+    const requestId = (0, helpers_1.generateRequestId)();
+    // Store the request ID in a custom header
+    req.headers['x-server-request-id'] = requestId;
+    // Create and store the middleware context with ContextValues
+    stores_1.MiddlewareContextStore.set(requestId, {
+        contextValues: (0, context_values_1.createCustomContextValues)(),
+    });
+}
+/** This method allows middleware to access custom context values associated with a request */
+function getCustomContextValues(req) {
+    const requestId = req.headers['x-server-request-id'];
+    if (requestId) {
+        const middlewareContext = stores_1.MiddlewareContextStore.get(requestId);
+        if (middlewareContext) {
+            return middlewareContext.contextValues;
+        }
+    }
+    return null;
+}
+function clearCustomContextValues(req) {
+    const requestId = req.headers['x-server-request-id'];
+    if (requestId) {
+        stores_1.MiddlewareContextStore.delete(requestId);
+    }
+}
 async function initMiddlewares(server, middlewareConfigs) {
+    // Add context middleware first - this stores req/res and creates ContextValues for interceptors
+    server.addHook('onRequest', async (request, reply) => {
+        setupCustomContextValues(request.raw);
+        // Clean up the context when the response finishes
+        reply.raw.on('finish', () => {
+            clearCustomContextValues(request.raw);
+        });
+    });
+    helpers_1.logger.log('Applied context middleware for storing req/res objects and ContextValues');
     for (const config of middlewareConfigs) {
         // Convert method names to set with PascalCase
         const methods = new Set((config.methods || []).map((m) => m[0].toUpperCase() + m.slice(1)));

package/dist/middlewares.js.map

@@ -1 +1 @@
-{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../src/middlewares.ts"],"names":[],"mappings":";;AAKA,0CAiEC;AArED,uCAA4D;AAE5D,qCAA2C;AAEpC,KAAK,UAAU,eAAe,CACnC,MAAuB,EACvB,iBAA0C;IAE1C,KAAK,MAAM,MAAM,IAAI,iBAAiB,EAAE,CAAC;QACvC,8CAA8C;QAC9C,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CACnE,CAAC;QAEF,6CAA6C;QAC7C,MAAM,kBAAkB,GAAG,wBAAe,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEnE,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,gBAAM,CAAC,IAAI,CACT,cAAc,MAAM,CAAC,GAAG,CAAC,IAAI,wJAAwJ,CACtL,CAAC;YACF,SAAS;QACX,CAAC;QAED,IAAI,OAAO,kBAAkB,CAAC,GAAG,KAAK,UAAU,EAAE,CAAC;YACjD,MAAM,IAAI,GAAG,IAAA,iCAAuB,EAAC,kBAAkB,CAAC,CAAC;YAEzD,wDAAwD;YACxD,MAAM,YAAY,GAAG,KAAK,EAAE,OAAY,EAAE,KAAU,EAAE,EAAE;gBACtD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAa,CAAC;gBAElC,0CAA0C;gBAC1C,0CAA0C;gBAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;gBAEhD,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,+BAA+B;oBAC/B,OAAO;gBACT,CAAC;gBAED,MAAM,CAAC,EAAE,WAAW,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC;gBAE1C,mDAAmD;gBACnD,IAAI,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;oBACpD,OAAO;gBACT,CAAC;gBAED,kDAAkD;gBAClD,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC7C,OAAO;gBACT,CAAC;gBAED,uBAAuB;gBACvB,MAAM,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;YAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE;gBAC3B,CAAC,CAAC,eAAe,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE;gBACrC,CAAC,CAAC,kBAAkB,CAAC;YACvB,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO;gBAC/B,CAAC,CAAC,aAAa,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBAC3C,CAAC,CAAC,cAAc,CAAC;YACnB,gBAAM,CAAC,GAAG,CACR,uBAAuB,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,WAAW,GAAG,UAAU,EAAE,CACpE,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../src/middlewares.ts"],"names":[],"mappings":"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"}

package/dist/stores.d.ts

@@ -1,5 +1,6 @@
 import { GenService, GenServiceMethods } from '@bufbuild/protobuf/codegenv2';
-import { Guard, Middleware, Service, Type } from './interfaces';
+import { CustomContextValues } from './context-values';
+import { Middleware, Service, Type } from './interfaces';
 declare class ControllersStoreClass {
     private controllers;
     values(): {
@@ -7,6 +8,7 @@ declare class ControllersStoreClass {
         service: GenService<any>;
         target: Type<any>;
     }[];
+    clear(): void;
     registerInstance<T extends GenServiceMethods>(self: Service<GenService<T>>, service: GenService<T>, { allowMultipleInstances, }?: {
         allowMultipleInstances?: boolean;
     }): void;
@@ -17,6 +19,7 @@ export declare const ControllersStore: ControllersStoreClass;
  */
 declare class MiddlewareStoreClass {
     private middlewares;
+    clear(): void;
     /**
      * Register a middleware instance from its constructor
      */
@@ -34,6 +37,7 @@ export declare const MiddlewareStore: MiddlewareStoreClass;
  */
 declare class RouteMetadataStoreClass {
     private routes;
+    clear(): void;
     /**
      * Register route metadata for a specific service method
      * @param serviceName - The full service name (e.g., "connectrpc.eliza.v1.ElizaService")
@@ -69,24 +73,30 @@ declare class RouteMetadataStoreClass {
 }
 export declare const RouteMetadataStore: RouteMetadataStoreClass;
 /**
- * Store for guard classes and their instances
+ * Middleware context - contains both raw req/res and context values
  */
-declare class GuardsStoreClass {
-    private guards;
+export interface MiddlewareContext {
+    contextValues: CustomContextValues;
+}
+/**
+ * Store for middleware context - maps request IDs to middleware context
+ * This allows interceptors to access both raw request/response objects and context values
+ */
+declare class MiddlewareContextStoreClass {
+    private contexts;
+    clear(): void;
     /**
-     * Register a guard instance from its constructor
+     * Store middleware context by request ID
      */
-    registerInstance(self: Guard, { allowMultipleInstances, }?: {
-        allowMultipleInstances?: boolean;
-    }): void;
+    set(requestId: string, context: MiddlewareContext): void;
     /**
-     * Get a guard instance by its class
+     * Get middleware context by request ID
      */
-    getInstance(guardClass: Type<Guard>): Guard | null;
+    get(requestId: string): MiddlewareContext | null;
     /**
-     * Get all registered guards
+     * Delete middleware context by request ID
      */
-    getAllGuards(): Guard[];
+    delete(requestId: string): void;
 }
-export declare const GuardsStore: GuardsStoreClass;
+export declare const MiddlewareContextStore: MiddlewareContextStoreClass;
 export {};

package/dist/stores.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GuardsStore = exports.RouteMetadataStore = exports.MiddlewareStore = exports.ControllersStore = void 0;
+exports.MiddlewareContextStore = exports.RouteMetadataStore = exports.MiddlewareStore = exports.ControllersStore = void 0;
 class ControllersStoreClass {
     constructor() {
         this.controllers = new Map();
@@ -11,6 +11,10 @@ class ControllersStoreClass {
             ...data,
         }));
     }
+    // For testing purposes
+    clear() {
+        this.controllers.clear();
+    }
     registerInstance(self, service, { allowMultipleInstances = false, } = {}) {
         const controllerClass = self.constructor;
         if (!allowMultipleInstances && this.controllers.has(controllerClass)) {
@@ -30,6 +34,10 @@ class MiddlewareStoreClass {
     constructor() {
         this.middlewares = new Map();
     }
+    // For testing purposes
+    clear() {
+        this.middlewares.clear();
+    }
     /**
      * Register a middleware instance from its constructor
      */
@@ -55,6 +63,10 @@ class RouteMetadataStoreClass {
     constructor() {
         this.routes = new Map();
     }
+    // For testing purposes
+    clear() {
+        this.routes.clear();
+    }
     /**
      * Register route metadata for a specific service method
      * @param serviceName - The full service name (e.g., "connectrpc.eliza.v1.ElizaService")
@@ -90,34 +102,35 @@ class RouteMetadataStoreClass {
 }
 exports.RouteMetadataStore = new RouteMetadataStoreClass();
 /**
- * Store for guard classes and their instances
+ * Store for middleware context - maps request IDs to middleware context
+ * This allows interceptors to access both raw request/response objects and context values
  */
-class GuardsStoreClass {
+class MiddlewareContextStoreClass {
     constructor() {
-        this.guards = new Map();
+        this.contexts = new Map();
+    }
+    // For testing purposes
+    clear() {
+        this.contexts.clear();
     }
     /**
-     * Register a guard instance from its constructor
+     * Store middleware context by request ID
      */
-    registerInstance(self, { allowMultipleInstances = false, } = {}) {
-        const guardClass = self.constructor;
-        if (!allowMultipleInstances && this.guards.has(guardClass)) {
-            throw new Error(`Guard ${guardClass.name} is already registered! This may happen if you export guard as provider and also register it in some Nest module.`);
-        }
-        this.guards.set(guardClass, self);
+    set(requestId, context) {
+        this.contexts.set(requestId, context);
     }
     /**
-     * Get a guard instance by its class
+     * Get middleware context by request ID
      */
-    getInstance(guardClass) {
-        return this.guards.get(guardClass) || null;
+    get(requestId) {
+        return this.contexts.get(requestId) || null;
     }
     /**
-     * Get all registered guards
+     * Delete middleware context by request ID
      */
-    getAllGuards() {
-        return Array.from(this.guards.values());
+    delete(requestId) {
+        this.contexts.delete(requestId);
     }
 }
-exports.GuardsStore = new GuardsStoreClass();
+exports.MiddlewareContextStore = new MiddlewareContextStoreClass();
 //# sourceMappingURL=stores.js.map

package/dist/stores.js.map

@@ -1 +1 @@
-{"version":3,"file":"stores.js","sourceRoot":"","sources":["../src/stores.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stores.js","sourceRoot":"","sources":["../src/stores.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,33 +1,36 @@
 {
   "name": "@funduck/connectrpc-fastify",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "author": "Oleg Milekhin <qlfunduck@gmail.com>",
   "description": "Wrapper for official @connectrpc/connect and fastify. Simplifies configuration, type safe binding to controller, simplifies use of middlewares and guards.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "npx rimraf dist; tsc -p tsconfig.build.json",
-    "compile-proto": "cd test && npx buf dep update; npx buf lint; npx buf generate",
-    "test": "npm run compile-proto && cd test && DEBUG=true npx tsx e2e-demo.ts",
+    "compile-proto": "cd test/demo && npx buf dep update; npx buf lint; npx buf generate",
+    "test:demo": "npm run compile-proto && cd test/demo && DEBUG=true npx tsx e2e-demo.ts",
+    "test": "npm run compile-proto && jest --verbose",
+    "test:coverage": "npm run compile-proto && jest --coverage --runInBand",
     "publish:check": "npm test && npm run build && npm publish --tag latest --access public --dry-run",
     "publish:latest": "npm publish --tag latest --access public"
   },
   "license": "MIT",
-  "dependencies": {
-    "@connectrpc/connect-fastify": "^2.1.1",
-    "type-fest": "^5.4.1"
-  },
   "peerDependencies": {
     "@bufbuild/protobuf": "^2.10.2",
-    "fastify": "^5.6.2"
+    "@connectrpc/connect-fastify": "^2.1.1",
+    "fastify": "^5.6.2",
+    "type-fest": "^5.4.1"
   },
   "devDependencies": {
     "@bufbuild/buf": "^1.64.0",
     "@bufbuild/protoc-gen-es": "^2.10.2",
     "@connectrpc/connect": "^2.1.1",
     "@connectrpc/connect-node": "^2.1.1",
+    "@types/jest": "^30.0.0",
     "@types/node": "^25.0.9",
+    "jest": "^30.2.0",
     "prettier-plugin-organize-imports": "^4.3.0",
+    "ts-jest": "^29.4.6",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   }

package/dist/execution-context.d.ts

@@ -1,22 +0,0 @@
-import { FastifyReply, FastifyRequest } from 'fastify';
-import { ExecutionContext, Type } from './interfaces';
-export declare class ManualExecutionContext implements ExecutionContext {
-    readonly request: FastifyRequest['raw'];
-    readonly response: FastifyReply['raw'];
-    readonly next: <T = any>() => T;
-    readonly args: any[];
-    readonly constructorRef: Type<any> | null;
-    readonly handler: Function | null;
-    constructor(request: FastifyRequest['raw'], response: FastifyReply['raw'], next: <T = any>() => T, args: any[], constructorRef?: Type<any> | null, handler?: Function | null);
-    getClass<T = any>(): Type<T>;
-    getHandler(): Function;
-    getArgs<T extends Array<any> = any[]>(): T;
-    getArgByIndex<T = any>(index: number): T;
-    switchToHttp(): this & {
-        getRequest: () => import("node:http").IncomingMessage;
-        getResponse: () => import("node:http").ServerResponse<import("node:http").IncomingMessage>;
-        getNext: () => <T = any>() => T;
-    };
-    switchToRpc(): void;
-    switchToWs(): void;
-}

package/dist/execution-context.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ManualExecutionContext = void 0;
-class ManualExecutionContext {
-    constructor(request, response, next, args, constructorRef = null, handler = null) {
-        this.request = request;
-        this.response = response;
-        this.next = next;
-        this.args = args;
-        this.constructorRef = constructorRef;
-        this.handler = handler;
-    }
-    getClass() {
-        return this.constructorRef;
-    }
-    getHandler() {
-        return this.handler;
-    }
-    getArgs() {
-        return this.args;
-    }
-    getArgByIndex(index) {
-        return this.args[index];
-    }
-    switchToHttp() {
-        return Object.assign(this, {
-            getRequest: () => this.request,
-            getResponse: () => this.response,
-            getNext: () => this.next,
-        });
-    }
-    switchToRpc() {
-        throw new Error('Context switching to RPC is not supported.');
-    }
-    switchToWs() {
-        throw new Error('Context switching to WebSockets is not supported.');
-    }
-}
-exports.ManualExecutionContext = ManualExecutionContext;
-//# sourceMappingURL=execution-context.js.map

package/dist/execution-context.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"execution-context.js","sourceRoot":"","sources":["../src/execution-context.ts"],"names":[],"mappings":";;;AAGA,MAAa,sBAAsB;IACjC,YACW,OAA8B,EAC9B,QAA6B,EAC7B,IAAsB,EACtB,IAAW,EACX,iBAAmC,IAAI,EACvC,UAA2B,IAAI;QAL/B,YAAO,GAAP,OAAO,CAAuB;QAC9B,aAAQ,GAAR,QAAQ,CAAqB;QAC7B,SAAI,GAAJ,IAAI,CAAkB;QACtB,SAAI,GAAJ,IAAI,CAAO;QACX,mBAAc,GAAd,cAAc,CAAyB;QACvC,YAAO,GAAP,OAAO,CAAwB;IACvC,CAAC;IAEJ,QAAQ;QACN,OAAO,IAAI,CAAC,cAAe,CAAC;IAC9B,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,OAAQ,CAAC;IACvB,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,IAAS,CAAC;IACxB,CAAC;IAED,aAAa,CAAU,KAAa;QAClC,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,CAAM,CAAC;IAC/B,CAAC;IAED,YAAY;QACV,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;YACzB,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO;YAC9B,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ;YAChC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI;SACzB,CAAC,CAAC;IACL,CAAC;IAED,WAAW;QACT,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IAED,UAAU;QACR,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;CACF;AAzCD,wDAyCC"}

package/dist/guards.d.ts

@@ -1,11 +0,0 @@
-import { FastifyInstance } from 'fastify';
-import { ExecutionContext, Guard } from './interfaces';
-export declare class ManualGuardExecutor {
-    executeGuard(guard: Guard, context: ExecutionContext): Promise<boolean>;
-    executeGuards(guards: Guard[], context: ExecutionContext): Promise<boolean>;
-}
-export declare function getGuards(controller: any): Guard[];
-/**
- * Initialize guards middleware - this should be called after all other middlewares are registered
- */
-export declare function initGuards(server: FastifyInstance): Promise<void>;

package/dist/guards.js

@@ -1,95 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ManualGuardExecutor = void 0;
-exports.getGuards = getGuards;
-exports.initGuards = initGuards;
-const execution_context_1 = require("./execution-context");
-const helpers_1 = require("./helpers");
-const stores_1 = require("./stores");
-class ManualGuardExecutor {
-    async executeGuard(guard, context) {
-        const result = guard.canActivate(context);
-        // Handle synchronous boolean result
-        if (typeof result === 'boolean') {
-            return result;
-        }
-        // Handle Promise result
-        return await result;
-    }
-    async executeGuards(guards, context) {
-        for (const guard of guards) {
-            const canActivate = await this.executeGuard(guard, context);
-            if (!canActivate) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
-exports.ManualGuardExecutor = ManualGuardExecutor;
-function getGuards(controller) {
-    // Return all registered guards
-    // In a more sophisticated implementation, you could filter guards
-    // based on decorators on the controller or method
-    return stores_1.GuardsStore.getAllGuards();
-}
-/**
- * Initialize guards middleware - this should be called after all other middlewares are registered
- */
-async function initGuards(server) {
-    const guardExecutor = new ManualGuardExecutor();
-    // Add a hook that runs after all other middlewares
-    server.addHook('preHandler', async (request, reply) => {
-        const url = request.url;
-        // Parse the URL to get the route
-        // Format: /package.ServiceName/MethodName
-        const match = url.match(/^\/([^/]+)\/([^/]+)$/);
-        if (!match) {
-            // Not a ConnectRPC route, skip guard execution
-            return;
-        }
-        // Get route metadata
-        const routeMetadata = stores_1.RouteMetadataStore.getRouteMetadata(url);
-        if (!routeMetadata) {
-            // No metadata found for this route
-            helpers_1.logger.warn(`No route metadata found for ${url}`);
-            return;
-        }
-        const { controllerClass, controllerMethod, controllerMethodName, instance, } = routeMetadata;
-        // Get guards for the controller
-        const guards = getGuards(instance);
-        if (guards.length === 0) {
-            // No guards to execute
-            return;
-        }
-        // Create execution context
-        // Note: For ConnectRPC, we don't have the actual request arguments yet at this point
-        // They will be deserialized later by the ConnectRPC handler
-        const executionContext = new execution_context_1.ManualExecutionContext(request.raw, reply.raw, (() => undefined), [], // args will be populated later if needed
-        controllerClass, controllerMethod);
-        // Execute guards
-        try {
-            const canActivate = await guardExecutor.executeGuards(guards, executionContext);
-            if (!canActivate) {
-                // Guard rejected the request
-                reply.code(403).send({
-                    code: 'permission_denied',
-                    message: 'Forbidden',
-                });
-                throw new Error('Guard rejected the request');
-            }
-        }
-        catch (error) {
-            // If guard throws an error, reject the request
-            if (!reply.sent) {
-                reply.code(403).send({
-                    code: 'permission_denied',
-                    message: error instanceof Error ? error.message : 'Forbidden',
-                });
-            }
-            throw error;
-        }
-    });
-    helpers_1.logger.log('Guards middleware initialized');
-}
-//# sourceMappingURL=guards.js.map

package/dist/guards.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"guards.js","sourceRoot":"","sources":["../src/guards.ts"],"names":[],"mappings":"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"}