New refactored version using lerna workspaces

.gitignore

@@ -1,7 +1,7 @@
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
 node_modules/
-nestserver-*.exe
+nestserver-*
 .vscode
 dist/
 yarn-error.log

cobigen-nest-server/.npmignore

@@ -3,5 +3,4 @@
 node_modules/
 .vscode
 dist/
-nestserver-linux-1.0.7
-nestserver-macos-1.0.7
+nestserver-*

cobigen-nest-server/lerna.json

@@ -0,0 +1,6 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0"
+}

cobigen-nest-server/package.json

@@ -1,64 +1,22 @@
 {
-  "name": "@devonfw/cobigen-nestserver",
-  "bin": "dist/main.js",
-  "version": "1.1.7",
-  "description": "Nestjs server to implement the input reader and merger for CobiGen",
-  "author": "CobiGen Team",
-  "license": "MIT",
+  "name": "cobigen-nest-server",
+  "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
   "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "start": "ts-node -r tsconfig-paths/register src/main.ts",
-    "start:dev": "nodemon",
-    "start:debug": "nodemon --config nodemon-debug.json",
-    "prestart:prod": "rimraf dist && npm run build",
-    "start:prod": "node dist/main.js",
-    "lint": "tslint -p tsconfig.json -c tslint.json",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "build": "npm run cleanup:root && npm run cleanup:packages && tsc -p tsconfig.build.json && npm run copy:rename && npm run compress",
+    "cleanup:root": "rimraf dist",
+    "cleanup:packages": "rimraf packages/*/dist/ && rimraf packages/*/nestserver-*",
+    "copy:rename": "npm run copy && npm run rename",
+    "copy": "copyfiles -f \"node_modules/@devonfw/ts-merger/dist/ts-merger.umd.js\" \"node_modules/@devonfw/ts-merger/build/\"",
+    "rename": "node -e \"require('fs').rename('node_modules/@devonfw/ts-merger/build/ts-merger.umd.js', 'node_modules/@devonfw/ts-merger/build/index.js', function(err) { if (err) console.log(err); console.log('File successfully renamed!') })\"",
+    "compress": "terser node_modules/@devonfw/ts-merger/build/index.js  --compress --mangle --warn --output node_modules/@devonfw/ts-merger/build/index.js"
   },
   "dependencies": {
-    "@devonfw/ts-merger": "^2.2.9",
-    "@nestjs/common": "^5.4.0",
-    "@nestjs/core": "^5.4.0",
-    "js-beautify": "^1.9.0",
-    "pkg": "^4.4.8",
-    "reflect-metadata": "^0.1.12",
-    "rimraf": "^2.6.2",
-    "rxjs": "^6.2.2",
-    "typescript": "^3.0.1"
-  },
-  "devDependencies": {
-    "@nestjs/testing": "^5.1.0",
-    "@types/express": "^4.16.0",
-    "@types/jest": "^23.3.1",
-    "@types/node": "^10.7.1",
-    "@types/supertest": "^2.0.5",
-    "jest": "^23.5.0",
-    "nodemon": "^1.18.3",
-    "prettier": "^1.14.2",
-    "supertest": "^3.1.0",
-    "ts-jest": "^23.1.3",
-    "ts-loader": "^4.4.2",
-    "ts-node": "^7.0.1",
-    "tsconfig-paths": "^3.5.0",
-    "tslint": "5.11.0"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": "src",
-    "testRegex": ".spec.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "coverageDirectory": "../coverage",
-    "testEnvironment": "node"
+    "copyfiles": "^2.4.1",
+    "lerna": "^4.0.0",
+    "rimraf": "^3.0.2",
+    "terser": "^5.12.1"
   }
 }

cobigen-nest-server/packages/linux/package.json

@@ -0,0 +1,69 @@
+{
+  "name": "@devonfw/cobigen-nestserver-linux",
+  "bin": "dist/main.js",
+  "version": "1.1.10",
+  "description": "Nestjs server to implement the input reader and merger for CobiGen",
+  "author": "CobiGen Team",
+  "license": "MIT",
+  "scripts":{
+    "build": "tsc -p tsconfig.build.json",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "start": "ts-node -r tsconfig-paths/register src/main.ts",
+    "start:dev": "nodemon",
+    "start:debug": "nodemon --config nodemon-debug.json",
+    "prestart:prod": "rimraf dist && npm run build",
+    "start:prod": "node dist/main.js",
+    "lint": "tslint -p tsconfig.json -c tslint.json",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "prepare": "npm run package",
+    "package": "pkg --targets latest-linux-x64 --output \"nestserver-linux-%npm_package_version%\" dist/main.js"
+  },
+  "dependencies": {
+    "@devonfw/ts-merger": "^2.2.10",
+    "@nestjs/common": "^8.4.4",
+    "@nestjs/core": "^8.4.4",
+    "@nestjs/platform-express": "^8.4.4",
+    "js-beautify": "^1.14.3",
+    "pkg": "^5.6.0",
+    "reflect-metadata": "^0.1.13",
+    "rimraf": "^3.0.2",
+    "rxjs": "^7.5.5",
+    "typescript": "^4.6.3"
+  },
+  "devDependencies": {
+    "@nestjs/testing": "^8.4.4",
+    "@types/express": "^4.17.13",
+    "@types/jest": "^27.4.1",
+    "@types/node": "^17.0.25",
+    "@types/supertest": "^2.0.12",
+    "express": "4.17.3",
+    "jest": "^27.5.1",
+    "nodemon": "^2.0.15",
+    "prettier": "^2.6.2",
+    "supertest": "^6.2.2",
+    "ts-jest": "^27.1.4",
+    "ts-loader": "^9.2.8",
+    "ts-node": "^10.7.0",
+    "tsconfig-paths": "^3.14.1",
+    "eslint": "8.13.0",
+    "webpack": "5.72.0"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": "src",
+    "testRegex": ".spec.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "coverageDirectory": "../coverage",
+    "testEnvironment": "node"
+  }
+}

cobigen-nest-server/packages/linux/src/main.ts

@@ -0,0 +1,64 @@
+import { NestFactory } from '@nestjs/core';
+import { AppModule } from './app.module';
+import { Request, Response } from 'express';
+import properties from './config/properties';
+import * as express from 'express';
+
+// We need these variables for resetting the timeout
+let counter: number = 0;
+let time: NodeJS.Timeout;
+// Will hold the server
+let server;
+
+/**
+ * This function resets the current timeout.
+ * We don't want to close the server if we have just received a new request.
+ * @export
+ * @param {Request} req the current request
+ * @param {Response} res the result of the request
+ * @param {*} next  to pass control to the next middleware function. Otherwise, the request will be left hanging.
+ */
+export function resetTimeout(req: Request, res: Response, next) {
+  counter++;
+
+  if (counter % 2 === 0) {
+    // We need to start again the timeout
+    time = setTimeout(() => {
+      if (server === undefined) {
+        // If no server is found, let's just exit
+        process.exit();
+      } else {
+        // Gracefully close the server
+        server.close();
+      }
+    }, properties.timeout);
+    // The request should be passed to the controller
+    next();
+  } else {
+    // Let's clear the timeout and then set it again
+    clearTimeout(time);
+    resetTimeout(req, res, next);
+  }
+}
+
+async function bootstrap() {
+  const app = await NestFactory.create(AppModule);
+  // Port is passed as argument when creating the process
+  let port: string = process.argv[2];
+  // We need to parse long JSON files on requests
+  app.use(express.json({ limit: '12mb' }));
+  app.use(express.urlencoded({ limit: '12mb', extended: true }));
+
+  if (port === undefined) {
+    // Default port when no parameter was passed
+    port = '5000';
+  }
+
+  server = await app.listen(port);
+
+  // We set the timeout, so that the server gets closed after some time of inactivity
+  time = setTimeout(() => {
+    server.close();
+  }, properties.timeout);
+}
+bootstrap();

cobigen-nest-server/src/processmanagement/inputreader/input-reader.ts → cobigen-nest-server/packages/linux/src/processmanagement/inputreader/input-reader.ts

@@ -1,10 +1,11 @@
 import { ModelEto } from './../etos/model.eto';
 import { InputFileEto } from '../etos/input-file.eto';
+import * as tsm from '@devonfw/ts-merger';
+
 export class InputReader {
   readonly content;
 
   public async getInputObjects(inputFile:InputFileEto, removeEmptyFields : boolean) {
-    const tsm = require('@devonfw/ts-merger');
     const parsedFile = tsm.readFile(inputFile.content);
 
     // Extending the model

cobigen-nest-server/src/processmanagement/processmanagement.controller.ts → cobigen-nest-server/packages/linux/src/processmanagement/processmanagement.controller.ts

@@ -2,6 +2,7 @@ import { Controller, Get, Post, Body } from '@nestjs/common';
 import { InputFileEto } from './etos/input-file.eto';
 import { MergerEto } from './etos/merger.eto';
 import { InputReader } from './inputreader/input-reader';
+import * as tsm from '@devonfw/ts-merger';
 
 const config = require('../../package.json');
 
@@ -39,7 +40,6 @@ export class ProcessmanagementController {
     const baseContent: string = merger.baseContent.replace(/\\n/gm, '\n');
     const patchOverrides: boolean = merger.patchOverrides;
 
-    const tsm = require('@devonfw/ts-merger');
     const mergedCode: string = tsm.merge(
       baseContent,
       patchContent,

cobigen-nest-server/test/inputreadingrequest.e2e-spec.ts → cobigen-nest-server/packages/linux/test/inputreadingrequest.e2e-spec.ts

@@ -18,7 +18,6 @@ describe('Testing input reader request to the server', () => {
     return request(app.getHttpServer())
       .post('processmanagement/tsplugin/getInputModel')
       .send({ content: 'class a {}' })
-      .expect(201)
-      .toBeNonEmptyString();
+      .expect(201);
   });
 });

cobigen-nest-server/packages/linux/tsconfig.build.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "test", "**/*spec.ts"]
+}

cobigen-nest-server/packages/linux/tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "target": "es6",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./"
+  },
+  "exclude": ["node_modules"]
+}

cobigen-nest-server/packages/macos/.prettierrc

@@ -0,0 +1,4 @@
+{
+  "singleQuote": true,
+  "trailingComma": "all"
+}