@things-factory/shell 6.1.172 → 6.1.174

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.1.172",
+  "version": "6.1.174",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -59,10 +59,10 @@
     "@operato/shell": "^1.0.1",
     "@operato/typeorm-history": "^1.1.65",
     "@operato/utils": "^1.0.1",
-    "@things-factory/ejs-remote": "^6.1.172",
-    "@things-factory/env": "^6.1.172",
-    "@things-factory/styles": "^6.1.172",
-    "@things-factory/utils": "^6.1.172",
+    "@things-factory/ejs-remote": "^6.1.174",
+    "@things-factory/env": "^6.1.174",
+    "@things-factory/styles": "^6.1.174",
+    "@things-factory/utils": "^6.1.174",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "args": "^5.0.0",
     "broadcastchannel-polyfill": "^1.0.1",
@@ -131,5 +131,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "07a66227652e199dea02bee9937d6b663c0eb0f0"
+  "gitHead": "582dea90062d7298e39e18d3634a7ac3c3a56310"
 }

package/server/middlewares/index.ts

@@ -40,8 +40,8 @@ export function initMiddlewares(app) {
   })
 }
 
-process.on('bootstrap-module-subscription' as any, (app, subscriptionMiddleware) => {
-  subscriptionMiddleware.push(domainMiddleware)
-})
+// process.on('bootstrap-module-subscription' as any, (app, subscriptionMiddleware) => {
+//   subscriptionMiddleware.push(domainMiddleware)
+// })
 
 export * from './domain-middleware'

package/server/pubsub.ts

@@ -89,6 +89,6 @@ process.on('SIGUSR1', exitHandler.bind(null, { name: 'SIGUSR1', exit: true }))
 process.on('SIGUSR2', exitHandler.bind(null, { name: 'SIGUSR2', exit: true }))
 
 //catches uncaught exceptions
-process.on('uncaughtException', exitHandler.bind(null, { name: 'uncaughtException', exit: true }))
+// process.on('uncaughtException', exitHandler.bind(null, { name: 'uncaughtException', exit: true }))
 
 export { pubsub }

package/server/server-dev.ts

@@ -21,6 +21,7 @@ import compose from 'koa-compose'
 import { historyApiFallback } from 'koa2-connect-history-api-fallback'
 import { WebSocketServer } from 'ws'
 import co from 'co'
+import http from 'http'
 
 import koaWebpack from '@hatiolab/koa-webpack'
 import cors from '@koa/cors'
@@ -38,9 +39,10 @@ import {
 import { schema } from './schema'
 import { Domain } from './service'
 import { EntityManager } from 'typeorm'
+import { domainMiddleware } from './middlewares'
 
 process.on('uncaughtException', error => {
-  logger.error('uncaughtException: ', error)
+  logger.error('uncaughtException: ', error, error.stack)
 
   //process.exit(1)
 })
@@ -88,13 +90,14 @@ interface ICustomAppState {
 
 interface ICustomAppContext {
   t: any
+  ssoMiddlewares: any[]
 }
 
 /* bootstrap */
 const bootstrap = async () => {
   await databaseInitializer()
 
-  const app = new Koa<ICustomAppState, ICustomAppContext>()
+  const app = new Koa<ICustomAppState, ICustomAppContext>() as any
 
   app.use(
     cors({
@@ -159,11 +162,11 @@ const bootstrap = async () => {
           ...(connectionParams['headers'] || (connectionParams as any))
         }
 
-        var koacontext = await app.createContext(request, {} as any)
+        var koacontext = await app.createContext(request, new http.ServerResponse(request))
         koacontext['state'] = {}
 
         /* in case connect error(like a authentication error) just throw exception */
-        var middlewares = [...subscriptionMiddleware]
+        var middlewares = [domainMiddleware, ...subscriptionMiddleware]
         const fn = co.wrap(compose(middlewares))
 
         await fn(koacontext)
@@ -247,6 +250,10 @@ const bootstrap = async () => {
   app.use(koaBodyParser(bodyParserOption))
 
   /* routers */
+  const ssoMiddlewares = []
+  process.emit('bootstrap-collect-sso-middleware' as any, null, ssoMiddlewares)
+  app.ssoMiddlewares = ssoMiddlewares
+
   process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)
   process.emit('bootstrap-module-global-private-route' as any, app, globalPrivateRouter)
   process.emit('bootstrap-module-domain-public-route' as any, app, domainPublicRouter)

package/server/server.ts

@@ -21,6 +21,7 @@ import compose from 'koa-compose'
 import { historyApiFallback } from 'koa2-connect-history-api-fallback'
 import { WebSocketServer } from 'ws'
 import co from 'co'
+import http from 'http'
 
 import cors from '@koa/cors'
 import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
@@ -35,9 +36,10 @@ import {
   graphqlRouter
 } from './routers'
 import { schema } from './schema'
+import { domainMiddleware } from './middlewares'
 
 process.on('uncaughtException', error => {
-  logger.error('uncaughtException: ', error)
+  logger.error('uncaughtException: ', error, error.stack)
 
   //process.exit(1)
 })
@@ -70,7 +72,7 @@ const fileUploadOption = {
 const bootstrap = async () => {
   await databaseInitializer()
 
-  const app = new Koa()
+  const app = new Koa() as any
 
   app.use(
     cors({
@@ -135,11 +137,11 @@ const bootstrap = async () => {
           ...(connectionParams['headers'] || (connectionParams as any))
         }
 
-        var koacontext = await app.createContext(request, {} as any)
+        var koacontext = await app.createContext(request, new http.ServerResponse(request))
         koacontext['state'] = {}
 
         /* in case connect error(like a authentication error) just throw exception */
-        var middlewares = [...subscriptionMiddleware]
+        var middlewares = [domainMiddleware, ...subscriptionMiddleware]
         const fn = co.wrap(compose(middlewares))
 
         await fn(koacontext)
@@ -208,6 +210,10 @@ const bootstrap = async () => {
   app.use(koaBodyParser(bodyParserOption))
 
   /* routers */
+  const ssoMiddlewares = []
+  process.emit('bootstrap-collect-sso-middleware' as any, null, ssoMiddlewares)
+  app.ssoMiddlewares = ssoMiddlewares
+
   process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)
   process.emit('bootstrap-module-global-private-route' as any, app, globalPrivateRouter)
   process.emit('bootstrap-module-domain-public-route' as any, app, domainPublicRouter)