feat: allow plugins to return a promise initializer

pkgems · Jan 13, 2019 · a4cdbe4 · a4cdbe4
1 parent 1a10cd6
commit a4cdbe4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/packages/core/emeralt-cli/src/index.ts b/packages/core/emeralt-cli/src/index.ts
@@ -20,9 +20,11 @@ createEmeraltServer({
   }),
   database: EmeraltDatabaseInMemory({}),
   storage: EmeraltStorageInMemory({}),
-}).listen(8080, () => {
-  console.log(chalk.bold.greenBright('Emeralt is listening at 8080...'))
-  console.log('Default user:')
-  console.log(`Username: ${chalk.greenBright('emeralt')}`)
-  console.log(`Password: ${chalk.greenBright('emeralt')}`)
+}).then((server) => {
+  server.listen(8080, () => {
+    console.log(chalk.bold.greenBright('Emeralt is listening at 8080...'))
+    console.log('Default user:')
+    console.log(`Username: ${chalk.greenBright('emeralt')}`)
+    console.log(`Password: ${chalk.greenBright('emeralt')}`)
+  })
 })
diff --git a/packages/core/emeralt-server/src/server.ts b/packages/core/emeralt-server/src/server.ts
@@ -11,12 +11,13 @@ type EmeraltServer = http.Server & {
   emeralt: TEmeraltServerParamsInternal
 }
 
-export const createEmeraltServer = (params: TEmeraltServerParams) => {
+export const createEmeraltServer = async (params: TEmeraltServerParams) => {
+  // initialize plugins
   const internal: TEmeraltServerParamsInternal = {
     config: params.config,
-    auth: params.auth(params.config),
-    database: params.database(params.config),
-    storage: params.storage(params.config),
+    auth: await params.auth(params.config),
+    database: await params.database(params.config),
+    storage: await params.storage(params.config),
   }
 
   const services = createServices(internal)

diff --git a/packages/core/emeralt-server/test/mocks/mock-server.ts b/packages/core/emeralt-server/test/mocks/mock-server.ts
@@ -3,8 +3,8 @@ import { EmeraltDatabaseInMemory } from '@emeralt/database-inmemory'
 import { EmeraltAuthInMemory } from '@emeralt/auth-inmemory'
 import { EmeraltStorageInMemory } from '@emeralt/storage-inmemory'
 
-export const createMockServer = () => {
-  const server = createEmeraltServer({
+export const createMockServer = async () => {
+  const server = await createEmeraltServer({
     config: {
       logLevel: 'silent',
       jwt: {
@@ -19,7 +19,7 @@ export const createMockServer = () => {
     }),
     database: EmeraltDatabaseInMemory({}),
     storage: EmeraltStorageInMemory({}),
-  }).listen()
+  }).then((s) => s.listen())
 
   // @ts-ignore
   const address = `http://localhost:${server.address().port}`

diff --git a/packages/core/emeralt-types/src/emeralt/plugin.ts b/packages/core/emeralt-types/src/emeralt/plugin.ts
@@ -1,5 +1,5 @@
 import { TEmeraltServerConfig } from './server'
 
 export interface IEmeraltPlugin<T, C = {}> {
-  (pluginConfig: C): (serverConfig: TEmeraltServerConfig) => T
+  (pluginConfig: C): (serverConfig: TEmeraltServerConfig) => Promise<T> | T
 }