From ef5859acc713da4cee4eb7293c5a168573e218c7 Mon Sep 17 00:00:00 2001 From: Oscar Date: Fri, 11 Apr 2025 13:48:38 +0200 Subject: [PATCH 1/8] POC: moved the start of the server to only run when the microservice runs --- helpers/mu/server.js | 5 ----- helpers/mu/start-server.js | 9 +++++++++ transpile-sources.sh | 7 +++++++ 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 helpers/mu/start-server.js diff --git a/helpers/mu/server.js b/helpers/mu/server.js index 9ff7aeb..594f8ae 100644 --- a/helpers/mu/server.js +++ b/helpers/mu/server.js @@ -36,11 +36,6 @@ const errorHandler = function(err, req, res, next) { }); }; -// start server -app.listen( port, hostname, function() { - console.log(`Starting server on ${hostname}:${port} in ${app.get('env')} mode`); -}); - export default app; export { diff --git a/helpers/mu/start-server.js b/helpers/mu/start-server.js new file mode 100644 index 0000000..ab619b8 --- /dev/null +++ b/helpers/mu/start-server.js @@ -0,0 +1,9 @@ +var { app } = await import("mu"); +var port = process.env.PORT || "80"; +var hostname = process.env.HOST || "0.0.0.0"; +// start server +app.listen(port, hostname, function () { + console.log( + `Starting server on ${hostname}:${port} in ${app.get("env")} mode` + ); +}); diff --git a/transpile-sources.sh b/transpile-sources.sh index 2adff56..af2d408 100755 --- a/transpile-sources.sh +++ b/transpile-sources.sh @@ -79,3 +79,10 @@ popd > /dev/null ## merged template and app modules with mu module docker-rsync --delete /usr/src/app/app/node_modules /usr/src/dist/ docker-rsync /usr/src/app/app/package.json /usr/src/dist/package.json + + +######################### +# Add server start script +######################### +ls /usr/src/app/ +cat /usr/src/app/helpers/mu/start-server.js >> /usr/src/dist/app.js \ No newline at end of file From 8b52537d19f76da0125ebdcac078bdede1c00039 Mon Sep 17 00:00:00 2001 From: Oscar Date: Fri, 11 Apr 2025 13:57:30 +0200 Subject: [PATCH 2/8] move the start server code outside the mu library --- helpers/mu/start-server.js => start-server.js | 0 transpile-sources.sh | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename helpers/mu/start-server.js => start-server.js (100%) diff --git a/helpers/mu/start-server.js b/start-server.js similarity index 100% rename from helpers/mu/start-server.js rename to start-server.js diff --git a/transpile-sources.sh b/transpile-sources.sh index af2d408..c045cd9 100755 --- a/transpile-sources.sh +++ b/transpile-sources.sh @@ -85,4 +85,4 @@ docker-rsync /usr/src/app/app/package.json /usr/src/dist/package.json # Add server start script ######################### ls /usr/src/app/ -cat /usr/src/app/helpers/mu/start-server.js >> /usr/src/dist/app.js \ No newline at end of file +cat /usr/src/app/start-server.js >> /usr/src/dist/app.js \ No newline at end of file From 294980d896a83f4acae49de3ee511569194e051b Mon Sep 17 00:00:00 2001 From: Oscar Date: Fri, 11 Apr 2025 16:02:21 +0200 Subject: [PATCH 3/8] change the way of starting the server --- run-development.sh | 2 +- run-production.sh | 4 ++-- start-server.js | 3 ++- transpile-sources.sh | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/run-development.sh b/run-development.sh index f2f5ab1..f4a9b72 100755 --- a/run-development.sh +++ b/run-development.sh @@ -81,4 +81,4 @@ cp /usr/src/app/helpers/mu/package.json /usr/src/dist/node_modules/mu/ cd /usr/src/dist/ node \ --inspect="0.0.0.0:9229" \ - ./app.js + ./start-server.js diff --git a/run-production.sh b/run-production.sh index 248cc2d..b392768 100755 --- a/run-production.sh +++ b/run-production.sh @@ -39,8 +39,8 @@ then # boot transpiled sources cd /usr/src/dist/ - exec node ./app.js + exec node ./start-server.js else cd /usr/src/dist/ - exec node ./app.js + exec node ./start-server.js fi diff --git a/start-server.js b/start-server.js index ab619b8..d77cfd7 100644 --- a/start-server.js +++ b/start-server.js @@ -1,4 +1,5 @@ -var { app } = await import("mu"); +import { app } from "mu"; +import "./app.js"; var port = process.env.PORT || "80"; var hostname = process.env.HOST || "0.0.0.0"; // start server diff --git a/transpile-sources.sh b/transpile-sources.sh index c045cd9..57d6c67 100755 --- a/transpile-sources.sh +++ b/transpile-sources.sh @@ -84,5 +84,4 @@ docker-rsync /usr/src/app/app/package.json /usr/src/dist/package.json ######################### # Add server start script ######################### -ls /usr/src/app/ -cat /usr/src/app/start-server.js >> /usr/src/dist/app.js \ No newline at end of file +cp /usr/src/app/start-server.js /usr/src/dist/start-server.js \ No newline at end of file From dae88f6869f5c4da84b903156c00dcd3c7358d59 Mon Sep 17 00:00:00 2001 From: Aad Versteden Date: Fri, 2 May 2025 12:59:07 +0200 Subject: [PATCH 4/8] Remove spurious whitespace no functional change --- transpile-sources.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transpile-sources.sh b/transpile-sources.sh index 57d6c67..f5ed52e 100755 --- a/transpile-sources.sh +++ b/transpile-sources.sh @@ -84,4 +84,4 @@ docker-rsync /usr/src/app/app/package.json /usr/src/dist/package.json ######################### # Add server start script ######################### -cp /usr/src/app/start-server.js /usr/src/dist/start-server.js \ No newline at end of file +cp /usr/src/app/start-server.js /usr/src/dist/start-server.js From dcb468237beba31ead306170d594f04522070283 Mon Sep 17 00:00:00 2001 From: Erika Pauwels Date: Wed, 25 Jun 2025 16:18:35 +0200 Subject: [PATCH 5/8] Use consistent syntax No functional change. Being consistent with syntax in existing files. --- start-server.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/start-server.js b/start-server.js index d77cfd7..ce8dd3a 100644 --- a/start-server.js +++ b/start-server.js @@ -1,10 +1,10 @@ -import { app } from "mu"; -import "./app.js"; -var port = process.env.PORT || "80"; -var hostname = process.env.HOST || "0.0.0.0"; +import { app } from 'mu'; +import './app.js'; + +var port = process.env.PORT || '80'; +var hostname = process.env.HOST || '0.0.0.0'; + // start server app.listen(port, hostname, function () { - console.log( - `Starting server on ${hostname}:${port} in ${app.get("env")} mode` - ); + console.log(`Starting server on ${hostname}:${port} in ${app.get('env')} mode`); }); From 1352612a155444d549e2f9af27d23845f0873269 Mon Sep 17 00:00:00 2001 From: Erika Pauwels Date: Wed, 25 Jun 2025 16:19:16 +0200 Subject: [PATCH 6/8] Remove unused variables --- helpers/mu/server.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/helpers/mu/server.js b/helpers/mu/server.js index 594f8ae..f0a113d 100644 --- a/helpers/mu/server.js +++ b/helpers/mu/server.js @@ -4,8 +4,6 @@ import bodyParser from 'body-parser'; var app = express(); -var port = process.env.PORT || '80'; -var hostname = process.env.HOST || '0.0.0.0'; var bodySizeLimit = process.env.MAX_BODY_SIZE || '100kb'; // parse JSONAPI content type From 2a3cf8ba6386ab11776c6cd973e583301df9219b Mon Sep 17 00:00:00 2001 From: Oscar Date: Fri, 18 Jul 2025 08:56:06 +0200 Subject: [PATCH 7/8] change base image of the setup ide script --- scripts/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.json b/scripts/config.json index 84f534f..070d555 100644 --- a/scripts/config.json +++ b/scripts/config.json @@ -23,7 +23,7 @@ "arguments": [] }, "environment": { - "image": "semtech/mu-javascript-template:feature-dev-experience-tryouts", + "image": "semtech/mu-javascript-template:feature-seperate-server-start", "interactive": false, "script": "setup-ide/run.sh" }, From 79d0faa470f7de2a53b884c254d7c7dece3f783b Mon Sep 17 00:00:00 2001 From: Aad Versteden Date: Tue, 12 Aug 2025 10:35:03 +0200 Subject: [PATCH 8/8] Use current image for running scripts We don't need a separate image for running the scripts. The latest mu-cli will run the scripts in the current image which is good enough for this purpose. --- scripts/config.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/config.json b/scripts/config.json index 070d555..a807a5a 100644 --- a/scripts/config.json +++ b/scripts/config.json @@ -1,5 +1,5 @@ { - "version": "0.1", + "version": "0.2", "scripts": [ { "documentation": { @@ -8,7 +8,6 @@ "arguments": [] }, "environment": { - "image": "ubuntu", "interactive": false, "script": "dev-script/run.sh" }, @@ -23,7 +22,6 @@ "arguments": [] }, "environment": { - "image": "semtech/mu-javascript-template:feature-seperate-server-start", "interactive": false, "script": "setup-ide/run.sh" },