5htp-core 0.5.1-8 → 0.5.1-91

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "5htp-core",
 	"description": "Convenient TypeScript framework designed for Performance and Productivity.",
-	"version": "0.5.1-8",
+	"version": "0.5.1-91",
 	"author": "Gaetan Le Gac (https://github.com/gaetanlegac)",
 	"repository": "git://github.com/gaetanlegac/5htp-core.git",
 	"license": "MIT",
@@ -101,8 +101,5 @@
 		"@types/yargs-parser": "^21.0.0",
 		"schema-dts": "^1.1.2",
 		"sharp": "^0.33.5"
-	},
-	"peerDependencies": {
-		"5htp": "0.4.5"
 	}
 }

package/src/server/app/container/index.ts

@@ -58,7 +58,7 @@ export class ApplicationContainer<
         },
     }
 
-    public start( ApplicationClass: typeof Application ) {
+    public start( ApplicationClass: typeof Application ): Application {
 
         // Instanciate Application
         try {
@@ -75,6 +75,8 @@ export class ApplicationContainer<
             this.handleBug(error, "Failed to start the Application");
             process.exit(1);
         }
+
+        return this.application;
     }
 
     public async handleBug( rejection: Error, message: string, request?: ServerRequest ) {

package/src/server/app/index.ts

@@ -2,6 +2,9 @@
 - DEPENDANCES
 ----------------------------------*/
 
+// Npm
+import type express from 'express';
+
 // Core
 import AppContainer from './container';
 import ApplicationService, { StartedServicesIndex } from './service';
@@ -42,7 +45,7 @@ export const Service = ServicesContainer;
 /*----------------------------------
 - FUNCTIONS
 ----------------------------------*/
-export class Application<
+export abstract class Application<
     TServicesContainer extends ServicesContainerClass = ServicesContainerClass
 > extends ApplicationService<Config, Hooks, /* TODO: this ? */Application, {}> {
 
@@ -190,6 +193,9 @@ export class Application<
     /*----------------------------------
     - ERROR HANDLING
     ----------------------------------*/
+
+    public abstract handleRequest( req: express.Request, res: express.Response );
+
     // Default error handler
     public async reportBug( bug: ServerBug ) {
 

package/src/server/index.ts

@@ -1,4 +1,7 @@
 import AppContainer from './app/container';
 import '@/server/config/*.ts';
 import Application from '@/server';
-AppContainer.start( Application );
+
+const app = AppContainer.start( Application );
+
+export default app.handleRequest;

package/src/server/services/router/http/index.ts

@@ -206,21 +206,12 @@ export default class HttpServer {
         /*----------------------------------
         - BOOT SERVICES
         ----------------------------------*/
-
-        /*
-        // Précompilation des templates email
-        await compilerEmails();
-
-        // Chargement de la liste des pays et langues
-        await GeoTracking.ChargerCache();
-
-        await QueryParser.prebuildCache();*/
-        // Si le HMR est activé, app sera englobée dans une autre instance express
-        // Impossible donc de créer un serveur http ici, on le fera dans start.js
-        console.info("Lancement du serveur web");
-        this.http.listen(this.config.port, () => {
-            console.info(`Web server ready on ${this.publicUrl}`);
-        });
+        if (!this.router.config.serverless) {
+            console.info("Lancement du serveur web");
+            this.http.listen(this.config.port, () => {
+                console.info(`Web server ready on ${this.publicUrl}`);
+            });
+        }
 
     }
 

package/src/server/services/router/index.ts

@@ -85,12 +85,13 @@ export type Config<
 > = {
 
     debug: boolean,
+    serverless?: boolean,
 
     disk?: string, // Disk driver ID
 
     domains: TDomainsList,
 
-    http: HttpServiceConfig
+    http: HttpServiceConfig,
 
     context: (
         request: ServerRequest<ServerRouter>,