containers/live-server-compiler/monitor.sh

@@ -2,4 +2,4 @@
 set -e
 
 cd /var/www/Minds/front
-npx nodemon -L --delay 3 --watch server.ts --watch dist --ignore dist/server/ --ignore dist/server.js --ext js,css,jpg,png,svg,mp4,webp,webm  --exec "/usr/bin/env sh" /build.sh
+npx nodemon --delay 3 --watch server.ts --watch dist/en/ --ext js,css,jpg,png,svg,mp4,webp,webm  --exec "/usr/bin/env sh" /build.sh

containers/live-server/monitor.sh

@@ -2,4 +2,4 @@
 set -e
 
 cd /var/www/Minds/front
-npx nodemon -L --delay 3 --watch dist --ignore dist/en --ext js,mjs  --exec "/usr/bin/env sh" /serve.sh
+npx nodemon --delay 3 --watch dist/server.js --watch dist/server --ext js,mjs  --exec "/usr/bin/env sh" /serve.sh

containers/server/Dockerfile

@@ -5,6 +5,10 @@ FROM node:13-alpine
 
 COPY . /dist
 
-CMD node /dist/server
+RUN npm install pm2 -g
+
+CMD pm2-runtime /dist/server \
+    --max-memory-restart 512M \
+    --instances 2
 
 VOLUME ["/dist"]
\ No newline at end of file

gulpfile.ts

@@ -7,7 +7,6 @@ import * as template from 'gulp-template';
 import { join } from 'path';
 import { argv } from 'yargs';
 
-
 const AUTOPREFIXER_BROWSERS = [
   'ie >= 11',
   'ie_mob >= 11',
@@ -17,32 +16,44 @@ const AUTOPREFIXER_BROWSERS = [
   'opera >= 23',
   'ios >= 7',
   'android >= 4.4',
-  'bb >= 10'
+  'bb >= 10',
 ];
 
 // --------------
 // Build SASS
 gulp.task('build.sass', done => {
-  const app_cdn = argv.deployUrl ? argv.deployUrl: '';
-  gulp.src(join('./src', '**', '*.scss'))
-    .pipe(cssGlobbing({  extensions: ['.scss'] }))
-    .pipe(sass({
-      includePaths: [join('./src', 'stylesheets')],
-      style: 'compressed'
-    }).on('error', sass.logError))
+  const app_cdn = argv.deployUrl ? argv.deployUrl : '';
+  gulp
+    .src(join(__dirname, 'src', '**', '*.scss'))
+    .pipe(cssGlobbing({ extensions: ['.scss'] }))
+    .pipe(
+      sass({
+        includePaths: [join(__dirname, 'src', 'stylesheets')],
+        style: 'compressed',
+      }).on('error', sass.logError)
+    )
     .pipe(autoprefixer(AUTOPREFIXER_BROWSERS))
-    .pipe(template({
-      'APP_CDN': app_cdn,
-    }))
-    .pipe(gulp.dest('./.styles'))
+    .pipe(
+      template({
+        APP_CDN: app_cdn,
+      })
+    )
+    .pipe(gulp.dest(join(__dirname, '.styles')))
     .on('end', () => {
-      gulp.src('./.styles/stylesheets/main.css')
-        .pipe(gulp.dest('./src'))
+      gulp
+        .src(join(__dirname, '.styles', 'stylesheets', 'main.css'))
+        .pipe(gulp.dest(join(__dirname, 'src')))
         .on('end', done);
     });
 });
 
 // --------------
 // i18n
-gulp.task('extract.i18n', require(join(__dirname, 'tasks', 'extract.i18n.xlf'))(gulp));
-gulp.task('import.i18n', require(join(__dirname, 'tasks', 'import.i18n.xlf'))(gulp));
+gulp.task(
+  'extract.i18n',
+  require(join(__dirname, 'tasks', 'extract.i18n.xlf'))(gulp)
+);
+gulp.task(
+  'import.i18n',
+  require(join(__dirname, 'tasks', 'import.i18n.xlf'))(gulp)
+);

package.json

@@ -12,6 +12,8 @@
     "serve-dev": "echo 'Deprecated, please use serve:ssr'; npm run serve:ssr --",
     "prebuild:dev": "gulp build.sass --deploy-url=http://localhost:8080/",
     "build:dev": "ng build --output-path=dist/en --deploy-url=http://localhost:8080/ --watch=true --poll=800 --aot",
+    "preserve:dev": "gulp build.sass --deploy-url=http://localhost:4200/",
+    "serve:dev": "ng serve --deploy-url=http://localhost:4200/ --watch=true --poll=800 --aot --progress --proxy-config proxy.conf.js --host=0.0.0.0 --disableHostCheck=true",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "cypress run --debug",
@@ -21,6 +23,7 @@
     "serve:ssr": "node dist/server",
     "build:ssr": "npm run build:client-and-server-bundles && npm run compile:server",
     "build:client-and-server-bundles": "npm run build && ng run minds:server:production",
+    "build:ssr:dev": "ng run minds:server:production && npm run compile:server",
     "bundle-report": "webpack-bundle-analyzer dist/en/stats.json"
   },
   "private": true,

proxy.conf.js

+const engineSecure = Boolean(parseInt(process.env['ENGINE_SECURE']) || 0);
+const engineHost = process.env['ENGINE_HOST'] || 'localhost';
+const enginePort = process.env['ENGINE_PORT'] || (engineSecure ? 443 : 80);
+
+const PROXY_CONFIG = [
+  {
+    context: [
+      '/api',
+      '/fs',
+      '/icon',
+      '/carousel',
+    ],
+    target: {
+      protocol: engineSecure ? 'https:' : 'http:',
+      host: engineHost,
+      port: enginePort,
+    },
+    secure: false,
+    changeOrigin: true,
+    withCredentials: true,
+    logLevel: process.env['PROXY_LOG_LEVEL'] || 'info',
+  }
+];
+
+module.exports = PROXY_CONFIG;

server.ts

@@ -103,7 +103,10 @@ app.get('/undefined', (req, res) => {
 
 // cache
 const NodeCache = require('node-cache');
-const myCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 120 });
+const myCache = new NodeCache({
+  stdTTL: 2 * 60, // 2 minute cache
+  checkperiod: 60, // Check every minute
+});
 
 const cache = () => {
   return (req, res, next) => {
@@ -112,7 +115,7 @@ const cache = () => {
         .filter(kv => kv[0] !== 'mwa' && kv[0] !== 'XSRF-TOKEN')
         .join(':') || 'loggedout';
     const key =
-      `__express__/${sessKey}/` +
+      `__express__/${req.headers.host}/${sessKey}/` +
       (req.originalUrl || req.url) +
       (isMobileOrTablet() ? '/mobile' : '/desktop');
     const exists = myCache.has(key);
@@ -132,6 +135,10 @@ const cache = () => {
   };
 };
 
+app.get('/node-cache-stats', (req, res) => {
+  res.send(myCache.getStats());
+});
+
 // All regular routes use the Universal engine
 app.get('*', cache(), (req, res) => {
   const http =
@@ -198,3 +205,5 @@ app.get('*', cache(), (req, res) => {
 app.listen(PORT, () => {
   console.log(`Node server listening on http://localhost:${PORT}`);
 });
+
+app.keepAliveTimeout = 65000;