@things-factory/shell 8.0.0-alpha.8 → 8.0.0-beta.1

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@things-factory/shell",
-  "version": "8.0.0-alpha.8",
+  "version": "8.0.0-beta.1",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
     "things-factory-dev": "bin/things-factory-dev",
     "things-factory-migration": "bin/things-factory-migration",
     "things-factory-stop": "bin/things-factory-stop",
-    "things-factory-dockerize": "bin/things-factory-dockerize"
+    "things-factory-dockerize": "bin/things-factory-dockerize",
+    "things-factory-dockerize-arm": "bin/things-factory-dockerize-arm"
   },
   "main": "dist-server/index.js",
   "browser": "client/index.js",
@@ -42,8 +43,7 @@
     "@graphql-tools/schema": "^8.5.0",
     "@graphql-tools/utils": "^10.1.2",
     "@graphql-yoga/redis-event-target": "^3.0.1",
-    "@hatiolab/koa-webpack": "^7.0.9",
-    "@hatiolab/things-scene": "^8.0.0-alpha",
+    "@hatiolab/things-scene": "^8.0.0-beta",
     "@koa/cors": "^5.0.0",
     "@material-design-icons/font": "^0.14.9",
     "@material/mwc-button": "^0.27.0",
@@ -53,19 +53,19 @@
     "@material/mwc-textfield": "^0.27.0",
     "@material/web": "^2.0.0",
     "@open-wc/scoped-elements": "^2.1.3",
-    "@operato/board": "^8.0.0-alpha",
-    "@operato/graphql": "^8.0.0-alpha",
-    "@operato/help": "^8.0.0-alpha",
-    "@operato/layout": "^8.0.0-alpha",
-    "@operato/shell": "^8.0.0-alpha",
-    "@operato/typeorm-history": "^8.0.0-alpha",
-    "@operato/utils": "^8.0.0-alpha",
+    "@operato/board": "^8.0.0-beta",
+    "@operato/graphql": "^8.0.0-beta",
+    "@operato/help": "^8.0.0-beta",
+    "@operato/layout": "^8.0.0-beta",
+    "@operato/shell": "^8.0.0-beta",
+    "@operato/typeorm-history": "^8.0.0-beta",
+    "@operato/utils": "^8.0.0-beta",
     "@reduxjs/toolkit": "^2.2.5",
-    "@things-factory/ejs-remote": "^8.0.0-alpha.0",
-    "@things-factory/env": "^8.0.0-alpha.8",
+    "@things-factory/ejs-remote": "^8.0.0-beta.1",
+    "@things-factory/env": "^8.0.0-beta.1",
     "@things-factory/operato-license-checker": "^4.0.4",
-    "@things-factory/styles": "^8.0.0-alpha.0",
-    "@things-factory/utils": "^8.0.0-alpha.0",
+    "@things-factory/styles": "^8.0.0-beta.1",
+    "@things-factory/utils": "^8.0.0-beta.1",
     "@webcomponents/scoped-custom-element-registry": "^0.0.9",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "args": "^5.0.0",
@@ -113,7 +113,6 @@
     "pwa-helpers": "^0.9.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "redux-thunk": "^2.3.0",
     "regenerator-runtime": "^0.13.2",
     "reselect": "^4.0.0",
     "sass": "^1.50.1",
@@ -123,15 +122,16 @@
     "uuid": "^10.0.0",
     "web-animations-js": "^2.3.2",
     "web-push": "^3.5.0",
+    "webpack-dev-middleware": "^7.4.2",
     "ws": "^8.8.1"
   },
   "optionalDependencies": {
-    "better-sqlite3": "^7.5.3",
-    "mssql": "^10.0.2",
-    "mysql2": "^2.3.3",
-    "oracledb": "^5.4.0",
+    "better-sqlite3": "^11.5.0",
+    "mssql": "^11.0.1",
+    "mysql2": "^3.11.3",
+    "oracledb": "^6.6.0",
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "0a9fb3ab431934982294b58c743d01b6f782a15f"
+  "gitHead": "36c494e587640c1490318ef7b95adab02606e0c2"
 }

package/server/server-dev.ts

@@ -26,7 +26,6 @@ import { WebSocketServer } from 'ws'
 import co from 'co'
 import http from 'http'
 
-import koaWebpack from '@hatiolab/koa-webpack'
 import cors from '@koa/cors'
 
 import crypto from 'crypto'
@@ -47,6 +46,7 @@ import { schema } from './schema'
 import { Domain } from './service'
 import { EntityManager } from 'typeorm'
 import { domainMiddleware } from './middlewares'
+const wdm = require('webpack-dev-middleware')
 
 process.on('uncaughtException', error => {
   logger.error('uncaughtException: ', error)
@@ -244,15 +244,6 @@ const bootstrap = async () => {
     debug: false
   })
 
-  const middleware = await koaWebpack({
-    compiler,
-    hotClient: {},
-    devMiddleware: {
-      publicPath: webpackConfig.output.publicPath,
-      stats: { colors: true }
-    }
-  })
-
   // only for development mode. triggered after webpack compilation is done.
   compiler.hooks.done.tap({ name: 'server-dev' }, stats => {
     process.emit('client-rebuilt' as any, app, compiler.outputFileSystem)
@@ -297,7 +288,11 @@ const bootstrap = async () => {
   /* should follow this order : history-fallback => webpack-middleware */
   app.use(historyApiFallback({ whiteList: [] }))
 
-  app.use(middleware)
+  app.use(
+    wdm.koaWrapper(compiler, {
+      publicPath: webpackConfig.output.publicPath
+    })
+  )
 
   httpServer.listen({ port: PORT }, () => {
     logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}/graphql`)

package/server/server.ts

@@ -264,6 +264,27 @@ const bootstrap = async () => {
     })
   )
 
+  // Set keep-alive timeout from configuration or fallback to default (65000ms).
+  // The keepAliveTimeout determines how long the server will keep an idle connection
+  // alive before closing it.
+  const keepAliveTimeout = config.get('keepAliveTimeout', 65000)
+
+  // Apply the configured keep-alive timeout to the server. If no configuration is
+  // provided, default to 65000ms (65 seconds). In the context of an external load balancer,
+  // this timeout is critical for maintaining persistent connections between the load
+  // balancer and the server. Setting a sufficiently long keepAliveTimeout minimizes
+  // the need to constantly re-establish TCP connections, improving efficiency and
+  // reducing connection overhead.
+  httpServer.keepAliveTimeout = keepAliveTimeout || 65000
+
+  // Set headersTimeout to be 1000ms (1 second) longer than keepAliveTimeout.
+  // This ensures the server has sufficient time to receive headers from the client
+  // before closing the connection, preventing premature disconnections. In the context
+  // of a load balancer, this ensures that if the load balancer is sending headers
+  // slowly (due to network delays or other factors), the connection isn't closed
+  // before the headers are fully transmitted.
+  httpServer.headersTimeout = keepAliveTimeout + 1000
+
   httpServer.listen({ port: PORT }, () => {
     logger.info(`🚀 Server ready at http://0.0.0.0:${PORT}/graphql`)
     logger.info(`🚀 Subscriptions ready at ws://0.0.0.0:${PORT}/graphql`)