From c5ee19227fe56520f75a4798603f6cbf51677dcd Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 13:57:14 -0300 Subject: [PATCH 01/12] Avoid compiling Go drivers on NIX plataform as Firebase Studio only currently provides 8GB RAM, not enough for the build. --- platform-nix-idx/build.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/platform-nix-idx/build.sh b/platform-nix-idx/build.sh index 6819cced..2472acb1 100755 --- a/platform-nix-idx/build.sh +++ b/platform-nix-idx/build.sh @@ -73,21 +73,23 @@ go env -w GO111MODULE=auto export CGO_CPPFLAGS="-I /usr/include" export CGO_LDFLAGS="-L /usr/lib" -cd ../calculations -go mod tidy -go build -cp calculations ../../bin/ +# avoid compiling go modules as Firebase Studio only currently provides 8GB RAM, not enough for the build + +# you may need a lot of memory to build go drivers, the build may be killed by the system, if necessary add swap, e.g. 8GB RAM + 4GB Swap +#cd ../calculations +#go mod tidy +#go build +#cp calculations ../../bin/ #cd ../i104m #go mod tidy #go build #cp i104m ../../bin/ -# you may need a lot of memory to build this step, the build may be killed by the system, if necessary add swap, e.g. 8GB RAM + 4GB Swap -cd ../plc4x-client -go mod tidy -go build -cp plc4x-client ../../bin/ +#cd ../plc4x-client +#go mod tidy +#go build +#cp plc4x-client ../../bin/ # release some disk space rm -rf ~/.cache From 26948311da7e4095ddfd8263b8f565c31e0c0ac3 Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 15:11:46 -0300 Subject: [PATCH 02/12] Fix maximum definition for IEC101 paramters for mongodb schema validation. --- mongo_seed/b_create-db.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mongo_seed/b_create-db.js b/mongo_seed/b_create-db.js index bfdfa0f4..d308e3e8 100644 --- a/mongo_seed/b_create-db.js +++ b/mongo_seed/b_create-db.js @@ -329,19 +329,19 @@ var protocolConnectionsValidator = { sizeOfCOT: { bsonType: ['double', 'long', 'int', 'null'], minimum: 1, - minimum: 2, + maximum: 2, description: 'Size of cause of transmission field.', }, sizeOfCA: { bsonType: ['double', 'long', 'int', 'null'], minimum: 1, - minimum: 2, + maximum: 2, description: 'Size of cause of common address field.', }, sizeOfIOA: { bsonType: ['double', 'long', 'int', 'null'], minimum: 1, - minimum: 3, + maximum: 3, description: 'Size of cause of information object address field.', }, k: { From 1fec2df9a93c4d68436f361d4cdb08eb88d0adac Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 15:40:41 -0300 Subject: [PATCH 03/12] Update NixOS packages channel to 24.11. --- .idx/dev.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.idx/dev.nix b/.idx/dev.nix index c4a9df7a..a1e5905a 100644 --- a/.idx/dev.nix +++ b/.idx/dev.nix @@ -2,7 +2,7 @@ # see: https://developers.google.com/idx/guides/customize-idx-env { pkgs, ... }: { # Which nixpkgs channel to use. - channel = "stable-23.11"; # or "unstable" + channel = "stable-24.11"; # or "unstable" # Use https://search.nixos.org/packages to find packages packages = [ From 19b0f7babec602fc84570bb08fa7d45cb889e6cd Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 16:15:47 -0300 Subject: [PATCH 04/12] Add log folder to the repo. --- log/README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 log/README.md diff --git a/log/README.md b/log/README.md new file mode 100644 index 00000000..db148254 --- /dev/null +++ b/log/README.md @@ -0,0 +1,4 @@ +# LOG folder + +This folder contains the log files for the system. + From 18eca70632da771bd329eb5e44b329c63f48234f Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 16:23:30 -0300 Subject: [PATCH 05/12] Update postgresql to 17 in NixOS platform. --- .idx/dev.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.idx/dev.nix b/.idx/dev.nix index a1e5905a..2b95f6ef 100644 --- a/.idx/dev.nix +++ b/.idx/dev.nix @@ -7,9 +7,9 @@ # Use https://search.nixos.org/packages to find packages packages = [ pkgs.sudo - pkgs.postgresql_15_jit - pkgs.postgresql15Packages.timescaledb - pkgs.postgresql15Packages.timescaledb_toolkit + pkgs.postgresql_17_jit + pkgs.postgresql17JitPackages.timescaledb + #pkgs.postgresql17JitPackages.timescaledb_toolkit pkgs.util-linux.bin pkgs.dotnet-sdk_8 pkgs.vscode-extensions.ms-dotnettools.csharp From 3d200e6abcb55643be8e90d1fb59d008a2f62ade Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 16:56:02 -0300 Subject: [PATCH 06/12] Update postgresql to 17 in NixOS platform. --- .idx/dev.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.idx/dev.nix b/.idx/dev.nix index 2b95f6ef..78551fbb 100644 --- a/.idx/dev.nix +++ b/.idx/dev.nix @@ -7,9 +7,9 @@ # Use https://search.nixos.org/packages to find packages packages = [ pkgs.sudo - pkgs.postgresql_17_jit - pkgs.postgresql17JitPackages.timescaledb - #pkgs.postgresql17JitPackages.timescaledb_toolkit + pkgs.postgresql_17 + pkgs.postgresql17Packages.timescaledb + #pkgs.postgresql17Packages.timescaledb_toolkit pkgs.util-linux.bin pkgs.dotnet-sdk_8 pkgs.vscode-extensions.ms-dotnettools.csharp From 6e6f22a7c7d9595a06a6adfea723539f5d1315c1 Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 20:08:26 -0300 Subject: [PATCH 07/12] Fallback NixOS packages channel to 23.11. --- .idx/dev.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.idx/dev.nix b/.idx/dev.nix index 78551fbb..ae22085b 100644 --- a/.idx/dev.nix +++ b/.idx/dev.nix @@ -2,14 +2,14 @@ # see: https://developers.google.com/idx/guides/customize-idx-env { pkgs, ... }: { # Which nixpkgs channel to use. - channel = "stable-24.11"; # or "unstable" + channel = "stable-23.11"; # or "unstable" # Use https://search.nixos.org/packages to find packages packages = [ pkgs.sudo pkgs.postgresql_17 pkgs.postgresql17Packages.timescaledb - #pkgs.postgresql17Packages.timescaledb_toolkit + pkgs.postgresql17Packages.timescaledb_toolkit pkgs.util-linux.bin pkgs.dotnet-sdk_8 pkgs.vscode-extensions.ms-dotnettools.csharp From 7ce753fc2cf79dbc8ce2f947aaba34ae99ca2e98 Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Thu, 22 May 2025 20:15:00 -0300 Subject: [PATCH 08/12] Fallback postgresql to 14 in NixOS platform. --- .idx/dev.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.idx/dev.nix b/.idx/dev.nix index ae22085b..9c10454e 100644 --- a/.idx/dev.nix +++ b/.idx/dev.nix @@ -7,9 +7,9 @@ # Use https://search.nixos.org/packages to find packages packages = [ pkgs.sudo - pkgs.postgresql_17 - pkgs.postgresql17Packages.timescaledb - pkgs.postgresql17Packages.timescaledb_toolkit + pkgs.postgresql_14_jit + pkgs.postgresql14Packages.timescaledb + pkgs.postgresql14Packages.timescaledb_toolkit pkgs.util-linux.bin pkgs.dotnet-sdk_8 pkgs.vscode-extensions.ms-dotnettools.csharp From 3a482a1575bd822b9c7a5ffaf01ba44579643ce3 Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Fri, 23 May 2025 10:52:00 -0300 Subject: [PATCH 09/12] Nix platform: update postgresql to version 15. --- .idx/dev.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.idx/dev.nix b/.idx/dev.nix index 9c10454e..c4a9df7a 100644 --- a/.idx/dev.nix +++ b/.idx/dev.nix @@ -7,9 +7,9 @@ # Use https://search.nixos.org/packages to find packages packages = [ pkgs.sudo - pkgs.postgresql_14_jit - pkgs.postgresql14Packages.timescaledb - pkgs.postgresql14Packages.timescaledb_toolkit + pkgs.postgresql_15_jit + pkgs.postgresql15Packages.timescaledb + pkgs.postgresql15Packages.timescaledb_toolkit pkgs.util-linux.bin pkgs.dotnet-sdk_8 pkgs.vscode-extensions.ms-dotnettools.csharp From c169d9dea94a847c1d2b2fad3ebb41adde21ddb9 Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Fri, 23 May 2025 13:52:57 -0300 Subject: [PATCH 10/12] Update NixOS packages channel to 24.11. --- .idx/dev.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.idx/dev.nix b/.idx/dev.nix index c4a9df7a..127c81d4 100644 --- a/.idx/dev.nix +++ b/.idx/dev.nix @@ -2,14 +2,15 @@ # see: https://developers.google.com/idx/guides/customize-idx-env { pkgs, ... }: { # Which nixpkgs channel to use. - channel = "stable-23.11"; # or "unstable" + channel = "stable-24.11"; # or "unstable" # Use https://search.nixos.org/packages to find packages packages = [ pkgs.sudo - pkgs.postgresql_15_jit - pkgs.postgresql15Packages.timescaledb - pkgs.postgresql15Packages.timescaledb_toolkit + pkgs.postgresql_16_jit + pkgs.postgresql16JitPackages.timescaledb + #pkgs.postgresql16JitPackages.timescaledb_toolkit + pkgs.postgresql16JitPackages.pgvector pkgs.util-linux.bin pkgs.dotnet-sdk_8 pkgs.vscode-extensions.ms-dotnettools.csharp @@ -32,7 +33,7 @@ pkgs.mongodb pkgs.mongodb-tools pkgs.mongosh - # pkgs.nodePackages.nodemon + pkgs.nodePackages.nodemon ]; #services.postgres = { From 38a7f55914a173889c4a0bd132960bf49776efe9 Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Fri, 23 May 2025 14:12:27 -0300 Subject: [PATCH 11/12] Remove timescaledb toolkit from NixOS postsgresql config. --- platform-nix-idx/postgresql.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform-nix-idx/postgresql.conf b/platform-nix-idx/postgresql.conf index c6012b07..d2a478e2 100644 --- a/platform-nix-idx/postgresql.conf +++ b/platform-nix-idx/postgresql.conf @@ -814,7 +814,8 @@ default_text_search_config = 'pg_catalog.english' dynamic_library_path = '/usr/lib' -shared_preload_libraries = 'timescaledb,timescaledb_toolkit' +#shared_preload_libraries = 'timescaledb,timescaledb_toolkit' +shared_preload_libraries = 'timescaledb' unix_socket_directories = '/tmp' From 9e161f20e9f649cd80155fa1b0375c0a89325a0b Mon Sep 17 00:00:00 2001 From: Ricardo Olsen Date: Fri, 23 May 2025 14:33:42 -0300 Subject: [PATCH 12/12] Disable Astro telemetry. --- platform-linux/build.sh | 1 + platform-mac/build.sh | 1 + platform-nix-idx/build.sh | 1 + platform-windows/buildupd.bat | 1 + 4 files changed, 4 insertions(+) diff --git a/platform-linux/build.sh b/platform-linux/build.sh index 49bf03fe..1e1085ea 100755 --- a/platform-linux/build.sh +++ b/platform-linux/build.sh @@ -136,6 +136,7 @@ npm install npm run build export NODE_OPTIONS=--max-old-space-size=10000 +export ASTRO_TELEMETRY_DISABLED=1 cd ../../../custom-developments/basic_bargraph npm install diff --git a/platform-mac/build.sh b/platform-mac/build.sh index caa38b9a..adbd0186 100755 --- a/platform-mac/build.sh +++ b/platform-mac/build.sh @@ -136,6 +136,7 @@ npm install npm run build export NODE_OPTIONS=--max-old-space-size=10000 +export ASTRO_TELEMETRY_DISABLED=1 cd ../../../custom-developments/basic_bargraph npm install diff --git a/platform-nix-idx/build.sh b/platform-nix-idx/build.sh index 2472acb1..7b5d8fd2 100755 --- a/platform-nix-idx/build.sh +++ b/platform-nix-idx/build.sh @@ -148,6 +148,7 @@ rm -rf ~/json-scada/src/AdminUI/node_modules #npm run build export NODE_OPTIONS=--max-old-space-size=10000 +export ASTRO_TELEMETRY_DISABLED=1 cd ../custom-developments/basic_bargraph npm install diff --git a/platform-windows/buildupd.bat b/platform-windows/buildupd.bat index b0a0c551..0150b71a 100644 --- a/platform-windows/buildupd.bat +++ b/platform-windows/buildupd.bat @@ -197,6 +197,7 @@ call %NPM% run build call %NPM% prune --omit=dev set NODE_OPTIONS=--max-old-space-size=8000 +set ASTRO_TELEMETRY_DISABLED=1 cd %SRCPATH%\custom-developments\basic_bargraph call %NPM% i --package-lock-only