@hazeljs/core 0.2.0-beta.8 → 0.2.0-beta.80

package/dist/router.js

@@ -17,6 +17,8 @@ const CONTROLLER_METADATA_KEY = 'hazel:controller';
 const HTTP_CODE_METADATA_KEY = 'hazel:http-code';
 const HEADER_METADATA_KEY = 'hazel:headers';
 const REDIRECT_METADATA_KEY = 'hazel:redirect';
+const TIMEOUT_METADATA_KEY = 'hazel:timeout';
+const OPTIONAL_INDICES_METADATA_KEY = 'hazel:optional-indices';
 class Router {
     constructor(container) {
         this.container = container;
@@ -31,7 +33,7 @@ class Router {
         this.routesByMethod.set('PATCH', new Map());
     }
     registerController(controller) {
-        logger_1.default.info(`Registering controller: ${controller.name}`);
+        logger_1.default.debug(`Registering controller: ${controller.name}`);
         const controllerMetadata = Reflect.getMetadata(CONTROLLER_METADATA_KEY, controller) || {};
         const routes = Reflect.getMetadata(ROUTE_METADATA_KEY, controller) || [];
         logger_1.default.debug('Controller metadata:', controllerMetadata);
@@ -41,7 +43,7 @@ class Router {
             const basePath = controllerMetadata.path || '';
             const routePath = path || '';
             const fullPath = this.normalizePath(`${basePath}${routePath}`);
-            logger_1.default.info(`Registering route: ${method} ${fullPath} (handler: ${String(propertyKey)})`);
+            logger_1.default.debug(`Registering route: ${method} ${fullPath} (handler: ${String(propertyKey)})`);
             // Get parameter types from TypeScript metadata
             const paramTypes = Reflect.getMetadata('design:paramtypes', controller.prototype, propertyKey) || [];
             logger_1.default.debug('Parameter types:', paramTypes.map((t) => t?.name || 'undefined'));
@@ -133,6 +135,7 @@ class Router {
                     method: req.method || 'GET',
                     url: req.url || '/',
                 };
+                context.retryOptions = Reflect.getMetadata('hazel:retry', controllerClass.prototype, methodName);
                 // Execute guards (class-level + method-level)
                 const classGuards = Reflect.getMetadata('hazel:guards', controllerClass) || [];
                 const methodGuards = Reflect.getMetadata('hazel:guards', controllerClass.prototype, methodName) || [];
@@ -142,6 +145,7 @@ class Router {
                         switchToHttp: () => ({
                             getRequest: () => req,
                             getResponse: () => res,
+                            getContext: () => context,
                         }),
                     };
                     for (const guardType of allGuards) {
@@ -195,6 +199,10 @@ class Router {
                                 args[i] = context.headers;
                             }
                         }
+                        else if (injection.type === 'request') {
+                            // Handle @Req() / @Request() decorator - raw request for multipart, etc.
+                            args[i] = req;
+                        }
                         else if (injection.type === 'response') {
                             // Handle @Res decorator
                             args[i] = new hazel_response_1.HazelExpressResponse(res);
@@ -231,6 +239,39 @@ class Router {
                                 args[i] = queryValue;
                             }
                         }
+                        else if (injection.type === 'user') {
+                            // Handle @CurrentUser() decorator — reads from context.user (set by a guard)
+                            const user = context.user ?? req.user;
+                            args[i] = injection.field ? user?.[injection.field] : user;
+                        }
+                        else if (injection.type === 'ip') {
+                            const r = req;
+                            const forwarded = r.headers?.['x-forwarded-for'];
+                            const ip = typeof forwarded === 'string'
+                                ? forwarded.split(',')[0].trim()
+                                : Array.isArray(forwarded)
+                                    ? forwarded[0]?.trim()
+                                    : r.socket?.remoteAddress;
+                            args[i] = ip ?? undefined;
+                        }
+                        else if (injection.type === 'host') {
+                            const host = req.headers?.['host'];
+                            args[i] = typeof host === 'string' ? host : Array.isArray(host) ? host[0] : undefined;
+                        }
+                        else if (injection.type === 'session') {
+                            args[i] = req.session;
+                        }
+                        else if (injection.type === 'custom' && typeof injection.resolve === 'function') {
+                            // Handle custom parameter decorators (e.g. @Ability() from @hazeljs/casl).
+                            // The decorator stores a resolver function; call it with request, context, container.
+                            args[i] = await injection.resolve(req, context, this.container);
+                        }
+                    }
+                }
+                const optionalIndices = Reflect.getMetadata(OPTIONAL_INDICES_METADATA_KEY, controllerClass, methodName) || [];
+                for (const i of optionalIndices) {
+                    if (i < args.length && (args[i] === undefined || args[i] === null)) {
+                        args[i] = undefined;
                     }
                 }
                 // Auto-inject RequestContext for undecorated parameters
@@ -253,10 +294,19 @@ class Router {
                 }
                 // Get the controller method
                 const method = controller[methodName];
-                // Execute the controller method with interceptors
-                const result = await this.applyInterceptors(Reflect.getMetadata('hazel:interceptors', controllerClass, methodName) || [], context, async () => {
+                const timeoutMs = Reflect.getMetadata(TIMEOUT_METADATA_KEY, controllerClass.prototype, methodName);
+                let handlerPromise = this.applyInterceptors(Reflect.getMetadata('hazel:interceptors', controllerClass, methodName) || [], context, async () => {
                     return method.apply(controller, args);
                 });
+                if (timeoutMs != null && timeoutMs > 0) {
+                    handlerPromise = Promise.race([
+                        handlerPromise,
+                        new Promise((_, reject) => {
+                            setTimeout(() => reject(new http_error_1.RequestTimeoutError(`Request timed out after ${timeoutMs}ms`)), timeoutMs);
+                        }),
+                    ]);
+                }
+                const result = await handlerPromise;
                 // Apply @Redirect metadata
                 const redirectMeta = Reflect.getMetadata(REDIRECT_METADATA_KEY, controllerClass.prototype, methodName);
                 if (redirectMeta) {
@@ -376,7 +426,7 @@ class Router {
         return path.startsWith('/') ? path : `/${path}`;
     }
     async match(method, url, context) {
-        const path = url.split('?')[0];
+        const path = this.normalizePath(url.split('?')[0] || '/');
         logger_1.default.debug(`Matching route: ${method} ${path}`);
         // Use method-specific cache for O(1) method lookup instead of O(n)
         const methodRoutes = this.routesByMethod.get(method);
@@ -432,7 +482,7 @@ class Router {
             // Match the request method and URL
             const match = await this.match(req.method || 'GET', req.url || '/', context);
             if (!match) {
-                logger_1.default.warn(`No route found for ${req.method} ${req.url}`);
+                logger_1.default.debug(`No route found for ${req.method} ${req.url}`);
                 res.status(404).json({ error: 'Not Found' });
                 return;
             }

package/dist/types.d.ts

@@ -56,6 +56,12 @@ export interface RequestContext {
         [key: string]: unknown;
     };
     req?: Request;
+    /** Set by router from @Retry() metadata; consumed by RetryInterceptor */
+    retryOptions?: {
+        count: number;
+        delay?: number;
+        retryIf?: (err: Error) => boolean;
+    };
 }
 export interface ValidationRule {
     type: 'string' | 'number' | 'boolean' | 'object' | 'array';

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,MAAM,MAAM,IAAI,CAAC,CAAC,GAAG,OAAO,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;AAE1D,MAAM,WAAW,cAAc;IAC7B,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1B,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAC7B,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAC3B,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1B,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;CACnC;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;CAC/B;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC7C,IAAI,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,QAAQ,CAAC;IACnC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC9B,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,GAAG,EAAE,MAAM,IAAI,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,IAAI,CAAC,EAAE;QACL,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,KAAK,CAAC,EAAE,cAAc,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hazeljs/core",
-  "version": "0.2.0-beta.8",
+  "version": "0.2.0-beta.80",
   "description": "Core HazelJS framework - Dependency injection, routing, decorators, and base functionality",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,6 +19,8 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
     "dotenv": "^16.5.0",
     "reflect-metadata": "^0.2.2",
     "winston": "^3.17.0"
@@ -55,11 +57,11 @@
     "decorators",
     "routing"
   ],
-  "author": "Muhammad Arslan <marslan@hazeljs.com>",
-  "license": "MIT",
+  "author": "Muhammad Arslan <muhammad.arslan@hazeljs.com>",
+  "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/hazeljs/hazel-js/issues"
   },
   "homepage": "https://hazeljs.com",
-  "gitHead": "b5cc0bf7d43739cad25220a611490b1d175acd62"
+  "gitHead": "083332d9cc6b634265382e7d1e0439236d30fedd"
 }