Named routes & basic login framework
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import {Inject, Singleton} from '../di'
|
||||
import {HTTPStatus, universalPath, UniversalPath, withTimeout} from '../util'
|
||||
import {HTTPStatus, withTimeout} from '../util'
|
||||
import {Unit} from '../lifecycle/Unit'
|
||||
import {createServer, IncomingMessage, RequestListener, Server, ServerResponse} from 'http'
|
||||
import {Logging} from './Logging'
|
||||
@@ -18,10 +18,7 @@ import {ParseIncomingBodyHTTPModule} from '../http/kernel/module/ParseIncomingBo
|
||||
import {Config} from './Config'
|
||||
import {InjectRequestEventBusHTTPModule} from '../http/kernel/module/InjectRequestEventBusHTTPModule'
|
||||
import {Routing} from './Routing'
|
||||
import {Route} from '../http/routing/Route'
|
||||
import {staticServer} from '../http/servers/static'
|
||||
import {EventBus} from '../event/EventBus'
|
||||
import {PackageDiscovered} from '../support/PackageDiscovered'
|
||||
|
||||
/**
|
||||
* Application unit that starts the HTTP/S server, creates Request and Response objects
|
||||
@@ -47,30 +44,6 @@ export class HTTPServer extends Unit {
|
||||
/** The underlying native Node.js server. */
|
||||
protected server?: Server
|
||||
|
||||
/**
|
||||
* Register an asset directory for the given package.
|
||||
* This creates a static server route for the package with the
|
||||
* configured vendor prefix.
|
||||
* @param packageName
|
||||
* @param basePath
|
||||
*/
|
||||
public async registerVendorAssets(packageName: string, basePath: UniversalPath): Promise<void> {
|
||||
if ( this.config.get('server.builtIns.vendor.enabled', true) ) {
|
||||
this.logging.debug(`Registering vendor assets route for package ${packageName} on ${basePath}...`)
|
||||
await this.routing.registerRoutes(() => {
|
||||
const prefix = this.config.get('server.builtIns.vendor.prefix', '/vendor')
|
||||
Route.group(prefix, () => {
|
||||
Route.group(packageName, () => {
|
||||
Route.get('/**', staticServer({
|
||||
basePath,
|
||||
directoryListing: false,
|
||||
}))
|
||||
})
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
public async up(): Promise<void> {
|
||||
const port = this.config.get('server.port', 8000)
|
||||
|
||||
@@ -86,8 +59,6 @@ export class HTTPServer extends Unit {
|
||||
ParseIncomingBodyHTTPModule.register(this.kernel)
|
||||
InjectRequestEventBusHTTPModule.register(this.kernel)
|
||||
|
||||
await this.registerBuiltIns()
|
||||
|
||||
await new Promise<void>(res => {
|
||||
this.server = createServer(this.handler)
|
||||
|
||||
@@ -148,34 +119,4 @@ export class HTTPServer extends Unit {
|
||||
await extolloReq.response.send()
|
||||
}
|
||||
}
|
||||
|
||||
/** Register built-in servers and routes. */
|
||||
protected async registerBuiltIns(): Promise<void> {
|
||||
const extolloAssets = universalPath(__dirname, '..', 'resources', 'assets')
|
||||
await this.registerVendorAssets('@extollo/lib', extolloAssets)
|
||||
|
||||
this.bus.subscribe(PackageDiscovered, async (event: PackageDiscovered) => {
|
||||
if ( event.packageConfig?.extollo?.assets?.discover && event.packageConfig.name ) {
|
||||
this.logging.debug(`Registering vendor assets for discovered package: ${event.packageConfig.name}`)
|
||||
const basePath = event.packageConfig?.extollo?.assets?.basePath
|
||||
if ( basePath && Array.isArray(basePath) ) {
|
||||
const assetPath = event.packageJson.concat('..', ...basePath)
|
||||
await this.registerVendorAssets(event.packageConfig.name, assetPath)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
if ( this.config.get('server.builtIns.assets.enabled', true) ) {
|
||||
const prefix = this.config.get('server.builtIns.assets.prefix', '/assets')
|
||||
this.logging.debug(`Registering built-in assets server with prefix: ${prefix}`)
|
||||
await this.routing.registerRoutes(() => {
|
||||
Route.group(prefix, () => {
|
||||
Route.get('/**', staticServer({
|
||||
directoryListing: false,
|
||||
basePath: ['resources', 'assets'],
|
||||
}))
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user