@@ -9,7 +9,7 @@ import { Type } from '../../core/decorators';
99import { enumByMethod , LifecycleComponentEnum } from './enums' ;
1010import { LifecycleManager } from './lifecycle' ;
1111import { RouteBuilder } from './route' ;
12- import { CoreRoute , HapiConfig , HapinessHTTPHandlerResponse } from './interfaces' ;
12+ import { ConnectionOptions , CoreRoute , HapiConfig , HTTPHandlerResponse } from './interfaces' ;
1313import { Observable } from 'rxjs' ;
1414import { RouteConfiguration , Server , Request , ReplyNoContinue , ReplyWithContinue } from 'hapi' ;
1515
@@ -32,7 +32,12 @@ export class HttpServerExt implements OnExtensionLoad, OnModuleInstantiated {
3232 onExtensionLoad ( module : CoreModule , config : HapiConfig ) : Observable < Extension > {
3333 return Observable
3434 . of ( new Server ( config . options ) )
35- . do ( _ => _ . connection ( Object . assign ( { } , config , { options : undefined } ) ) )
35+ . flatMap ( server => Observable
36+ . of ( Object . assign ( { } , config , { options : undefined } ) )
37+ . map ( _ => this . formatConnections ( _ ) )
38+ . do ( _ => _ . forEach ( connection => server . connection ( connection ) ) )
39+ . map ( _ => server )
40+ )
3641 . flatMap ( server =>
3742 Observable
3843 . of ( {
@@ -63,6 +68,23 @@ export class HttpServerExt implements OnExtensionLoad, OnModuleInstantiated {
6368 . flatMap ( _ => server . start ( ) ) ;
6469 }
6570
71+ /**
72+ * Format the config provided
73+ * to a list of ConnectionOptions
74+ *
75+ * @param {HapiConfig } config
76+ * @returns ConnectionOptions
77+ */
78+ private formatConnections ( config : HapiConfig ) : ConnectionOptions [ ] {
79+ return [ ]
80+ . concat ( ! ! ( < any > config ) . connections ?
81+ ( < any > config ) . connections :
82+ config
83+ )
84+ . filter ( _ => ! ! _ )
85+ . map ( _ => < ConnectionOptions > _ ) ;
86+ }
87+
6688 /**
6789 * Register a HapiJS Plugin
6890 *
@@ -71,36 +93,50 @@ export class HttpServerExt implements OnExtensionLoad, OnModuleInstantiated {
7193 * @returns Observable
7294 */
7395 private registerPlugin ( module : CoreModule , server : Server ) : Observable < CoreRoute [ ] > {
74- const register : any = ( s , o , n ) => n ( ) ;
75- register . attributes = {
76- name : module . name ,
77- version : module . version
78- } ;
79- return Observable
80- . fromPromise ( server . register ( register ) )
81- . flatMap ( _ => this . addRoutes ( module , server ) ) ;
96+ return this
97+ . buildRoutes ( module )
98+ . flatMap ( routes => Observable
99+ . of ( < any > this . registerHandler ( routes ) )
100+ . do ( _ => _ . attributes = { name : module . name , version : module . version } )
101+ . flatMap ( _ => Observable
102+ . fromPromise ( server . register ( _ ) )
103+ . map ( __ => routes )
104+ )
105+ ) ;
82106 }
83107
84108 /**
85109 * Add routes from CoreModule
86110 *
87- * @param {CoreModule } module
88- * @param {Server } server
111+ * @param {CoreRoute[] } module
89112 * @returns Observable
90113 */
91- private addRoutes ( module : CoreModule , server : Server ) : Observable < CoreRoute [ ] > {
92- return Observable
93- . from ( RouteBuilder . buildRoutes ( module ) )
94- . do ( _ =>
95- server
96- . route ( < RouteConfiguration > {
114+ private registerHandler ( routes : CoreRoute [ ] = [ ] ) : ( s , o , n ) => void {
115+ return ( server : Server , options , next ) => {
116+ routes
117+ . forEach ( _ => {
118+ const _server = ! ! _ . labels ? server . select ( _ . labels ) : server ;
119+ _server . route ( < RouteConfiguration > {
97120 method : _ . method ,
98121 path : _ . path ,
99122 config : Object . assign ( {
100123 handler : ( request , reply ) => this . httpHandler ( request , reply , _ )
101124 } , _ . config )
102- } )
103- )
125+ } ) ;
126+ } ) ;
127+ next ( ) ;
128+ }
129+ }
130+
131+ /**
132+ * Build CoreRoute based on a module
133+ *
134+ * @param {CoreModule } module
135+ * @returns Observable
136+ */
137+ private buildRoutes ( module : CoreModule ) : Observable < CoreRoute [ ] > {
138+ return Observable
139+ . from ( RouteBuilder . buildRoutes ( module ) )
104140 . toArray ( ) ;
105141 }
106142
@@ -135,14 +171,26 @@ export class HttpServerExt implements OnExtensionLoad, OnModuleInstantiated {
135171 ) ;
136172 }
137173
138- private formatResponse ( data : any ) : HapinessHTTPHandlerResponse {
174+ /**
175+ * Format response to HTTPHandlerResponse object
176+ *
177+ * @param {any } data
178+ * @returns HTTPHandlerResponse
179+ */
180+ private formatResponse ( data : any ) : HTTPHandlerResponse {
139181 return {
140182 statusCode : ! ! data ? data . statusCode || 200 : 200 ,
141183 headers : ! ! data ? data . headers || { } : { } ,
142184 response : ! ! data ? data . response || data : data
143185 } ;
144186 }
145187
188+ /**
189+ * Check of response is not empty
190+ *
191+ * @param {any } response
192+ * @returns boolean
193+ */
146194 private isValid ( response : any ) : boolean {
147195 return typeof ( response ) !== 'undefined' && response !== null ;
148196 }
@@ -172,6 +220,17 @@ export class HttpServerExt implements OnExtensionLoad, OnModuleInstantiated {
172220 . map ( _ => module ) ;
173221 }
174222
223+ /**
224+ * Lifecycle Event Handler
225+ * Instantiate the Lifecycle component
226+ * And trigger the hook
227+ *
228+ * @param {Type<any> } lifecycle
229+ * @param {CoreModule } module
230+ * @param {Request } request
231+ * @param {ReplyWithContinue } reply
232+ * @returns Observable
233+ */
175234 private eventHandler ( lifecycle : Type < any > , module : CoreModule , request : Request , reply : ReplyWithContinue ) : Observable < any > {
176235 return Observable
177236 . of ( lifecycle )
0 commit comments