@alterior/fastify 3.15.0 → 3.16.0

package/dist/event.d.ts

@@ -1,5 +1,5 @@
 export declare class FastifyEvent {
-    static get current(): import("http").IncomingMessage;
-    static get request(): import("http").IncomingMessage;
+    static get current(): import("@alterior/web-server").RequestBase;
+    static get request(): import("@alterior/web-server").RequestBase;
 }
 //# sourceMappingURL=event.d.ts.map

package/dist/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACrB,MAAM,KAAK,OAAO,mCAA+B;IACjD,MAAM,KAAK,OAAO,mCAA+B;CACpD"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACrB,MAAM,KAAK,OAAO,+CAA+B;IACjD,MAAM,KAAK,OAAO,+CAA+B;CACpD"}

package/dist/fastify-engine.d.ts

@@ -1,14 +1,16 @@
-import fastify, { FastifyInstance } from "fastify";
-import { WebEvent, WebServerEngine, ConnectMiddleware } from '@alterior/web-server';
-import * as http from 'http';
-export type FastifyConnectMiddleware = ConnectMiddleware & fastify.FastifyInstance<http.Server, http.IncomingMessage, http.ServerResponse>;
+import { WebEvent, WebServerEngine, ConnectMiddleware, ServerOwnedWebEvent, ConnectApplication } from '@alterior/web-server';
 export declare class FastifyEngine extends WebServerEngine {
-    readonly app: FastifyConnectMiddleware & FastifyInstance;
-    readonly providers: any[];
+    private server;
+    private setup;
+    readonly fastify: import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>> & {
+        __linterBrands: "SafePromiseLike";
+    };
+    readonly app: ConnectApplication;
+    readonly providers: never[];
     sendJsonBody(routeEvent: WebEvent, body: any): void;
     addConnectMiddleware(path: string, middleware: any): void;
-    addRoute(method: string, path: string, handler: (event: WebEvent) => void, middleware?: any): void;
-    addAnyRoute(handler: (event: WebEvent) => void): void;
+    addRoute(method: string, path: string, handler: (event: WebEvent) => void, middleware?: ConnectMiddleware[]): void;
+    addAnyRoute(handler: (event: ServerOwnedWebEvent) => void): void;
     private getRegistrarName;
 }
 //# sourceMappingURL=fastify-engine.d.ts.map

package/dist/fastify-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastify-engine.d.ts","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEpF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,MAAM,wBAAwB,GAAG,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE3I,qBAAa,aAAc,SAAQ,eAAe;IACjD,QAAQ,CAAC,GAAG,EAAI,wBAAwB,GAAG,eAAe,CAAW;IACrE,QAAQ,CAAC,SAAS,QAAM;IAEf,YAAY,CAAC,UAAU,EAAG,QAAQ,EAAE,IAAI,EAAG,GAAG;IAKvD,oBAAoB,CAAC,IAAI,EAAG,MAAM,EAAE,UAAU,EAAG,GAAG;IAIpD,QAAQ,CAAC,MAAM,EAAG,MAAM,EAAE,IAAI,EAAG,MAAM,EAAE,OAAO,EAAG,CAAC,KAAK,EAAG,QAAQ,KAAK,IAAI,EAAE,UAAU,CAAC,KAAA;IAY1F,WAAW,CAAC,OAAO,EAAG,CAAC,KAAK,EAAG,QAAQ,KAAK,IAAI;IAIhD,OAAO,CAAC,gBAAgB;CAOxB"}
+{"version":3,"file":"fastify-engine.d.ts","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAa,kBAAkB,EAEnG,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,aAAc,SAAQ,eAAe;IAC9C,OAAO,CAAC,MAAM,CAAqB;IAEnC,OAAO,CAAC,KAAK;IAKb,QAAQ,CAAC,OAAO;;MAAgB;IAChC,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAA+D;IAC/F,QAAQ,CAAC,SAAS,UAAM;IAEf,YAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG;IAM5C,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG;IAIlD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,EAAE,UAAU,CAAC,EAAE,iBAAiB,EAAE;IAY3G,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI;IAIlE,OAAO,CAAC,gBAAgB;CAO3B"}

package/dist/fastify-engine.js

@@ -2,30 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FastifyEngine = void 0;
 const tslib_1 = require("tslib");
+const middie_1 = tslib_1.__importDefault(require("@fastify/middie"));
 const fastify_1 = tslib_1.__importDefault(require("fastify"));
+const di_1 = require("@alterior/di");
 const web_server_1 = require("@alterior/web-server");
 class FastifyEngine extends web_server_1.WebServerEngine {
     constructor() {
         super(...arguments);
-        this.app = (0, fastify_1.default)();
+        this.server = (0, di_1.inject)(web_server_1.WebServer);
+        this.fastify = this.setup();
+        this.app = (req, res) => this.fastify.server.emit('request', req, res);
         this.providers = [];
     }
+    setup() {
+        let app = (0, fastify_1.default)();
+        app.register(middie_1.default);
+        return app;
+    }
     sendJsonBody(routeEvent, body) {
         routeEvent.response.setHeader('Content-Type', 'application/json');
-        routeEvent.response['send'](body);
+        routeEvent.response.write(body);
+        routeEvent.response.end();
     }
     addConnectMiddleware(path, middleware) {
-        this.app.use(path, middleware);
+        this.fastify.use(path, middleware);
     }
     addRoute(method, path, handler, middleware) {
         if (!middleware)
             middleware = [];
-        this.app[this.getRegistrarName(method)](path, ...middleware, (req, res) => {
+        this.fastify[this.getRegistrarName(method)](path, ...middleware, (req, res) => {
             return handler(new web_server_1.WebEvent(req, res));
         });
     }
     addAnyRoute(handler) {
-        this.app.use((req, res) => handler(new web_server_1.WebEvent(req, res)));
+        this.fastify.all('*', (req, res) => handler(this.server.registerEvent(new web_server_1.WebEvent(req, res))));
     }
     getRegistrarName(method) {
         let registrar = method.toLowerCase();

package/dist/fastify-engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"fastify-engine.js","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":";;;;AAAA,8DAAmD;AACnD,qDAAoF;AAMpF,MAAa,aAAc,SAAQ,4BAAe;IAAlD;;QACU,QAAG,GAA+C,IAAA,iBAAO,GAAE,CAAC;QAC5D,cAAS,GAAG,EAAE,CAAC;IAkCzB,CAAC;IAhCS,YAAY,CAAC,UAAqB,EAAE,IAAU;QACtD,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,oBAAoB,CAAC,IAAa,EAAE,UAAgB;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,QAAQ,CAAC,MAAe,EAAE,IAAa,EAAE,OAAoC,EAAE,UAAW;QACzF,IAAI,CAAC,UAAU;YACd,UAAU,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CACtC,IAAI,EACJ,GAAG,UAAU,EACb,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACZ,OAAO,OAAO,CAAC,IAAI,qBAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC,CACD,CAAC;IACH,CAAC;IAED,WAAW,CAAC,OAAoC;QAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,qBAAQ,CAAM,GAAG,EAAO,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAEO,gBAAgB,CAAC,MAAe;QACvC,IAAI,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,gCAAgC,CAAC,CAAC;QAElF,OAAO,SAAS,CAAC;IAClB,CAAC;CACD;AApCD,sCAoCC"}
+{"version":3,"file":"fastify-engine.js","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":";;;;AAAA,qEAAqC;AACrC,8DAA8B;AAE9B,qCAAsC;AACtC,qDAG8B;AAE9B,MAAa,aAAc,SAAQ,4BAAe;IAAlD;;QACY,WAAM,GAAG,IAAA,WAAM,EAAC,sBAAS,CAAC,CAAC;QAO1B,YAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACvB,QAAG,GAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACtF,cAAS,GAAG,EAAE,CAAC;IAmC5B,CAAC;IA1CW,KAAK;QACT,IAAI,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACpB,GAAG,CAAC,QAAQ,CAAC,gBAAM,CAAC,CAAC;QACrB,OAAO,GAAG,CAAC;IACf,CAAC;IAKQ,YAAY,CAAC,UAAoB,EAAE,IAAS;QACjD,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IAEQ,oBAAoB,CAAC,IAAY,EAAE,UAAe;QACvD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACvC,CAAC;IAEQ,QAAQ,CAAC,MAAc,EAAE,IAAY,EAAE,OAAkC,EAAE,UAAgC;QAChH,IAAI,CAAC,UAAU;YACX,UAAU,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAChD,IAAI,EACJ,GAAG,UAAU,EACb,CAAC,GAAgB,EAAE,GAAiB,EAAE,EAAE;YACpC,OAAO,OAAO,CAAC,IAAI,qBAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CACJ,CAAC;IACN,CAAC;IAEQ,WAAW,CAAC,OAA6C;QAC9D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,qBAAQ,CAAC,GAAU,EAAE,GAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;IAEO,gBAAgB,CAAC,MAAc;QACnC,IAAI,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,gCAAgC,CAAC,CAAC;QAErF,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AA7CD,sCA6CC"}

package/dist.esm/event.d.ts

@@ -1,5 +1,5 @@
 export declare class FastifyEvent {
-    static get current(): import("http").IncomingMessage;
-    static get request(): import("http").IncomingMessage;
+    static get current(): import("@alterior/web-server").RequestBase;
+    static get request(): import("@alterior/web-server").RequestBase;
 }
 //# sourceMappingURL=event.d.ts.map

package/dist.esm/event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACrB,MAAM,KAAK,OAAO,mCAA+B;IACjD,MAAM,KAAK,OAAO,mCAA+B;CACpD"}
+{"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../src/event.ts"],"names":[],"mappings":"AAEA,qBAAa,YAAY;IACrB,MAAM,KAAK,OAAO,+CAA+B;IACjD,MAAM,KAAK,OAAO,+CAA+B;CACpD"}

package/dist.esm/fastify-engine.d.ts

@@ -1,14 +1,16 @@
-import fastify, { FastifyInstance } from "fastify";
-import { WebEvent, WebServerEngine, ConnectMiddleware } from '@alterior/web-server';
-import * as http from 'http';
-export type FastifyConnectMiddleware = ConnectMiddleware & fastify.FastifyInstance<http.Server, http.IncomingMessage, http.ServerResponse>;
+import { WebEvent, WebServerEngine, ConnectMiddleware, ServerOwnedWebEvent, ConnectApplication } from '@alterior/web-server';
 export declare class FastifyEngine extends WebServerEngine {
-    readonly app: FastifyConnectMiddleware & FastifyInstance;
-    readonly providers: any[];
+    private server;
+    private setup;
+    readonly fastify: import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> & PromiseLike<import("fastify").FastifyInstance<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault>> & {
+        __linterBrands: "SafePromiseLike";
+    };
+    readonly app: ConnectApplication;
+    readonly providers: never[];
     sendJsonBody(routeEvent: WebEvent, body: any): void;
     addConnectMiddleware(path: string, middleware: any): void;
-    addRoute(method: string, path: string, handler: (event: WebEvent) => void, middleware?: any): void;
-    addAnyRoute(handler: (event: WebEvent) => void): void;
+    addRoute(method: string, path: string, handler: (event: WebEvent) => void, middleware?: ConnectMiddleware[]): void;
+    addAnyRoute(handler: (event: ServerOwnedWebEvent) => void): void;
     private getRegistrarName;
 }
 //# sourceMappingURL=fastify-engine.d.ts.map

package/dist.esm/fastify-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fastify-engine.d.ts","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,EAAE,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEpF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,MAAM,MAAM,wBAAwB,GAAG,iBAAiB,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;AAE3I,qBAAa,aAAc,SAAQ,eAAe;IACjD,QAAQ,CAAC,GAAG,EAAI,wBAAwB,GAAG,eAAe,CAAW;IACrE,QAAQ,CAAC,SAAS,QAAM;IAEf,YAAY,CAAC,UAAU,EAAG,QAAQ,EAAE,IAAI,EAAG,GAAG;IAKvD,oBAAoB,CAAC,IAAI,EAAG,MAAM,EAAE,UAAU,EAAG,GAAG;IAIpD,QAAQ,CAAC,MAAM,EAAG,MAAM,EAAE,IAAI,EAAG,MAAM,EAAE,OAAO,EAAG,CAAC,KAAK,EAAG,QAAQ,KAAK,IAAI,EAAE,UAAU,CAAC,KAAA;IAY1F,WAAW,CAAC,OAAO,EAAG,CAAC,KAAK,EAAG,QAAQ,KAAK,IAAI;IAIhD,OAAO,CAAC,gBAAgB;CAOxB"}
+{"version":3,"file":"fastify-engine.d.ts","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,QAAQ,EAAE,eAAe,EAAE,iBAAiB,EAAE,mBAAmB,EAAa,kBAAkB,EAEnG,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,aAAc,SAAQ,eAAe;IAC9C,OAAO,CAAC,MAAM,CAAqB;IAEnC,OAAO,CAAC,KAAK;IAKb,QAAQ,CAAC,OAAO;;MAAgB;IAChC,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAA+D;IAC/F,QAAQ,CAAC,SAAS,UAAM;IAEf,YAAY,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG;IAM5C,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG;IAIlD,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,EAAE,UAAU,CAAC,EAAE,iBAAiB,EAAE;IAY3G,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI;IAIlE,OAAO,CAAC,gBAAgB;CAO3B"}

package/dist.esm/fastify-engine.js

@@ -1,27 +1,37 @@
+import middie from '@fastify/middie';
 import fastify from "fastify";
-import { WebEvent, WebServerEngine } from '@alterior/web-server';
+import { inject } from "@alterior/di";
+import { WebEvent, WebServerEngine, WebServer } from '@alterior/web-server';
 export class FastifyEngine extends WebServerEngine {
     constructor() {
         super(...arguments);
-        this.app = fastify();
+        this.server = inject(WebServer);
+        this.fastify = this.setup();
+        this.app = (req, res) => this.fastify.server.emit('request', req, res);
         this.providers = [];
     }
+    setup() {
+        let app = fastify();
+        app.register(middie);
+        return app;
+    }
     sendJsonBody(routeEvent, body) {
         routeEvent.response.setHeader('Content-Type', 'application/json');
-        routeEvent.response['send'](body);
+        routeEvent.response.write(body);
+        routeEvent.response.end();
     }
     addConnectMiddleware(path, middleware) {
-        this.app.use(path, middleware);
+        this.fastify.use(path, middleware);
     }
     addRoute(method, path, handler, middleware) {
         if (!middleware)
             middleware = [];
-        this.app[this.getRegistrarName(method)](path, ...middleware, (req, res) => {
+        this.fastify[this.getRegistrarName(method)](path, ...middleware, (req, res) => {
             return handler(new WebEvent(req, res));
         });
     }
     addAnyRoute(handler) {
-        this.app.use((req, res) => handler(new WebEvent(req, res)));
+        this.fastify.all('*', (req, res) => handler(this.server.registerEvent(new WebEvent(req, res))));
     }
     getRegistrarName(method) {
         let registrar = method.toLowerCase();

package/dist.esm/fastify-engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"fastify-engine.js","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":"AAAA,OAAO,OAA4B,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAqB,MAAM,sBAAsB,CAAC;AAMpF,MAAM,OAAO,aAAc,SAAQ,eAAe;IAAlD;;QACU,QAAG,GAA+C,OAAO,EAAE,CAAC;QAC5D,cAAS,GAAG,EAAE,CAAC;IAkCzB,CAAC;IAhCS,YAAY,CAAC,UAAqB,EAAE,IAAU;QACtD,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,oBAAoB,CAAC,IAAa,EAAE,UAAgB;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,QAAQ,CAAC,MAAe,EAAE,IAAa,EAAE,OAAoC,EAAE,UAAW;QACzF,IAAI,CAAC,UAAU;YACd,UAAU,GAAG,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CACtC,IAAI,EACJ,GAAG,UAAU,EACb,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YACZ,OAAO,OAAO,CAAC,IAAI,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QACxC,CAAC,CACD,CAAC;IACH,CAAC;IAED,WAAW,CAAC,OAAoC;QAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAM,GAAG,EAAO,GAAG,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;IAEO,gBAAgB,CAAC,MAAe;QACvC,IAAI,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,gCAAgC,CAAC,CAAC;QAElF,OAAO,SAAS,CAAC;IAClB,CAAC;CACD"}
+{"version":3,"file":"fastify-engine.js","sourceRoot":"","sources":["../src/fastify-engine.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EACH,QAAQ,EAAE,eAAe,EAA0C,SAAS,EAE/E,MAAM,sBAAsB,CAAC;AAE9B,MAAM,OAAO,aAAc,SAAQ,eAAe;IAAlD;;QACY,WAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QAO1B,YAAO,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QACvB,QAAG,GAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACtF,cAAS,GAAG,EAAE,CAAC;IAmC5B,CAAC;IA1CW,KAAK;QACT,IAAI,GAAG,GAAG,OAAO,EAAE,CAAC;QACpB,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrB,OAAO,GAAG,CAAC;IACf,CAAC;IAKQ,YAAY,CAAC,UAAoB,EAAE,IAAS;QACjD,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAClE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChC,UAAU,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IAEQ,oBAAoB,CAAC,IAAY,EAAE,UAAe;QACvD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACvC,CAAC;IAEQ,QAAQ,CAAC,MAAc,EAAE,IAAY,EAAE,OAAkC,EAAE,UAAgC;QAChH,IAAI,CAAC,UAAU;YACX,UAAU,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAChD,IAAI,EACJ,GAAG,UAAU,EACb,CAAC,GAAgB,EAAE,GAAiB,EAAE,EAAE;YACpC,OAAO,OAAO,CAAC,IAAI,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CACJ,CAAC;IACN,CAAC;IAEQ,WAAW,CAAC,OAA6C;QAC9D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,QAAQ,CAAC,GAAU,EAAE,GAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;IAEO,gBAAgB,CAAC,MAAc;QACnC,IAAI,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,yBAAyB,MAAM,gCAAgC,CAAC,CAAC;QAErF,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alterior/fastify",
-  "version": "3.15.0",
+  "version": "3.16.0",
   "description": "Access Fastify state within an Alterior app",
   "author": "The Alterior Project (https://github.com/alterior-mvc)",
   "license": "MIT",
@@ -37,9 +37,11 @@
     "docs": "typedoc src/index.ts"
   },
   "dependencies": {
-    "@alterior/logging": "^3.15.0",
-    "@alterior/web-server": "^3.15.0",
-    "fastify": "^2.15.3"
+    "@alterior/di": "^3.16.0",
+    "@alterior/logging": "^3.16.0",
+    "@alterior/web-server": "^3.16.0",
+    "@fastify/middie": "^9.3.2",
+    "fastify": "^5.8.5"
   },
   "gitHead": "87f31ea4078faaca53b45573c6a0013cdb40dd07"
 }

package/src/fastify-engine.ts

@@ -1,44 +1,55 @@
-import fastify, { FastifyInstance } from "fastify";
-import { WebEvent, WebServerEngine, ConnectMiddleware } from '@alterior/web-server';
+import middie from '@fastify/middie';
+import fastify from "fastify";
 
-import * as http from 'http';
-
-export type FastifyConnectMiddleware = ConnectMiddleware & fastify.FastifyInstance<http.Server, http.IncomingMessage, http.ServerResponse>;
+import { inject } from "@alterior/di";
+import {
+    WebEvent, WebServerEngine, ConnectMiddleware, ServerOwnedWebEvent, WebServer, ConnectApplication,
+    RequestBase, ResponseBase
+} from '@alterior/web-server';
 
 export class FastifyEngine extends WebServerEngine {
-	readonly app = <FastifyConnectMiddleware & FastifyInstance>fastify();
-	readonly providers = [];
-
-	override sendJsonBody(routeEvent : WebEvent, body : any) {
-		routeEvent.response.setHeader('Content-Type', 'application/json');
-		routeEvent.response['send'](body);
-	}
-
-	addConnectMiddleware(path : string, middleware : any) {
-		this.app.use(path, middleware);
-	}
-	
-	addRoute(method : string, path : string, handler : (event : WebEvent) => void, middleware?) {
-		if (!middleware)
-			middleware = [];
-		this.app[this.getRegistrarName(method)](
-			path, 
-			...middleware, 
-			(req, res) => {
-				return handler(new WebEvent(req, res));
-			}
-		);
-	}
-
-	addAnyRoute(handler : (event : WebEvent) => void) {
-		this.app.use((req, res) => handler(new WebEvent(<any>req, <any>res)));
-	}
-
-	private getRegistrarName(method : string) {
-		let registrar = method.toLowerCase();
-		if (!this.supportedMethods.includes(registrar))
-			throw new Error(`The specified method '${method}' is not supported by Express.`);
-			
-		return registrar;
-	}
+    private server = inject(WebServer);
+
+    private setup() {
+        let app = fastify();
+        app.register(middie);
+        return app;
+    }
+    readonly fastify = this.setup();
+    readonly app: ConnectApplication = (req, res) => this.fastify.server.emit('request', req, res);
+    readonly providers = [];
+
+    override sendJsonBody(routeEvent: WebEvent, body: any) {
+        routeEvent.response.setHeader('Content-Type', 'application/json');
+        routeEvent.response.write(body);
+        routeEvent.response.end();
+    }
+
+    override addConnectMiddleware(path: string, middleware: any) {
+        this.fastify.use(path, middleware);
+    }
+
+    override addRoute(method: string, path: string, handler: (event: WebEvent) => void, middleware?: ConnectMiddleware[]) {
+        if (!middleware)
+            middleware = [];
+        (this.fastify as any)[this.getRegistrarName(method)](
+            path,
+            ...middleware,
+            (req: RequestBase, res: ResponseBase) => {
+                return handler(new WebEvent(req, res));
+            }
+        );
+    }
+
+    override addAnyRoute(handler: (event: ServerOwnedWebEvent) => void) {
+        this.fastify.all('*', (req, res) => handler(this.server.registerEvent(new WebEvent(req as any, res as any))));
+    }
+
+    private getRegistrarName(method: string) {
+        let registrar = method.toLowerCase();
+        if (!this.supportedMethods.includes(registrar))
+            throw new Error(`The specified method '${method}' is not supported by Express.`);
+
+        return registrar;
+    }
 }