pockethost 1.4.0 → 1.6.0

package/src/plugin.ts

@@ -0,0 +1,54 @@
+import { forEach } from '@s-libs/micro-dash'
+import { produce } from 'immer'
+import {
+  PocketHostPlugin,
+  doSettingsFilter,
+  namespace,
+  newId,
+  onAfterPluginsLoadedAction,
+  onInstanceConfigFilter,
+  onInstanceLogAction,
+  onServeAction,
+  onServeSlugsFilter,
+} from '../common'
+import { dbg, info } from './cli'
+import { INTERNAL_APP_SECRET, PH_PROJECT_DIR, settings } from './constants'
+import { setConfig } from './core/config'
+import { serve } from './server'
+
+export const pockethost: PocketHostPlugin = async ({}) => {
+  onInstanceConfigFilter(async (config) => {
+    return produce(config, (draft) => {
+      draft.binds.hooks.push({
+        src: PH_PROJECT_DIR(`src/instance-app/hooks/**/*`),
+        base: PH_PROJECT_DIR(`src/instance-app/hooks`),
+      })
+    })
+  })
+
+  onInstanceLogAction(async ({ instance, type, data }) => {
+    dbg(namespace(instance.subdomain, type), data.toString())
+  })
+
+  onServeAction(async ({ only }) => {
+    if (!only.includes(`pockethost`)) return
+    serve()
+  })
+
+  onServeSlugsFilter(async (slugs) => {
+    return [...slugs, `pockethost`]
+  })
+
+  onAfterPluginsLoadedAction(async () => {
+    const allSettings = await doSettingsFilter(settings)
+    forEach(allSettings, (v, k) => {
+      dbg(`${k}: ${v}`)
+    })
+  }, 99)
+
+  onAfterPluginsLoadedAction(async () => {
+    if (INTERNAL_APP_SECRET()) return
+    info(`Generating internal app secret...`)
+    setConfig(`PH_INTERNAL_APP_SECRET`, newId(30))
+  })
+}

package/src/server.ts

@@ -3,7 +3,6 @@ import 'express-async-errors'
 import { default as httpProxy } from 'http-proxy'
 import {
   LoggerService,
-  PocketHostPlugin,
   doAfterInstanceFoundAction,
   doAfterServerStartAction,
   doAppMountedAction,
@@ -12,14 +11,17 @@ import {
   doIncomingRequestAction,
   doRequestErrorAction,
   doRequestErrorMessageFilter,
-  onInstanceLogAction,
-  onServeAction,
-  onServeSlugsFilter,
 } from '../common'
-import { APEX_DOMAIN, PORT, asyncExitHook } from '../core'
-import { dbg } from './cli'
-
-const serve = async () => {
+import {
+  APEX_DOMAIN,
+  INTERNAL_APP_AUTH_HEADER,
+  INTERNAL_APP_PREFIX,
+  INTERNAL_APP_SECRET,
+  PORT,
+  asyncExitHook,
+} from '../core'
+
+export const serve = async () => {
   const _proxyLogger = LoggerService().create('ProxyService')
   const { dbg, error, info, trace, warn } = _proxyLogger
 
@@ -50,7 +52,25 @@ const serve = async () => {
   }
   app.use(errorHandler)
 
-  doAppMountedAction({ app })
+  const internalApp = express()
+  internalApp.use((req, res, next) => {
+    dbg(`Got a request to internal app ${req.url}`)
+    next()
+  })
+  internalApp.use((req, res, next) => {
+    const authHeader = req.headers[INTERNAL_APP_AUTH_HEADER]
+    const internalAppSecret = INTERNAL_APP_SECRET()
+
+    if (authHeader !== internalAppSecret) {
+      res.status(403).send('Forbidden')
+      return
+    }
+
+    next()
+  })
+  app.use(`/${INTERNAL_APP_PREFIX}`, internalApp)
+
+  doAppMountedAction({ app, internalApp })
 
   app.all(`*`, async (req, res, next) => {
     const method = req.method
@@ -88,11 +108,7 @@ const serve = async () => {
     })
 
     const url = await doGetOrProvisionInstanceUrlFilter('', {
-      req,
-      res,
       instance,
-      host,
-      subdomain,
     })
 
     dbg(`Forwarding request for ${req.url} to instance ${url}`)
@@ -111,18 +127,3 @@ const serve = async () => {
     info(`Shutting down pockethost`)
   })
 }
-
-export const pockethost: PocketHostPlugin = async ({}) => {
-  onInstanceLogAction(async ({ instance, type, data }) => {
-    dbg(data.toString())
-  })
-
-  onServeAction(async ({ only }) => {
-    if (!only.includes(`pockethost`)) return
-    serve()
-  })
-
-  onServeSlugsFilter(async (slugs) => {
-    return [...slugs, `pockethost`]
-  })
-}