Merge pull request #293 from skadefro/master

Release 1.5.10

.dockerignore

@@ -5,7 +5,6 @@ temp
 letsencrypt
 .cache
 .npmrc
-.openflowapicache
 .scannerwork
 docker-package.json
 .env
@@ -14,4 +13,5 @@ sonar-scanner.properties
 sonar-project.properties
 crash.log
 .devcontainer.old
-.clinic
+.clinic
+docker-compose.yml

.gitignore

@@ -6,7 +6,6 @@ temp
 letsencrypt
 .cache
 .npmrc
-.openflowapicache
 .scannerwork
 docker-package.json
 .env
@@ -17,4 +16,8 @@ crash.log
 package-lock.json
 *.heapsnapshot
 /proto
-.clinic
+.clinic
+docker-compose.yml
+.aider*
+/public
+/public2

.mocharc.json

@@ -1,4 +1,4 @@
 {
-    "require": "./register.js",
-    "reporter": "dot"
-}
+    "$schema": "https://json.schemastore.org/mocharc.json",
+    "require": ["./register.js","tsx"]
+  }

.npmignore

@@ -2,26 +2,20 @@
 .vscode
 .npmrc
 .cache
-.openflowapicache
+src
 config
 docs
 node_modules
 logs
 package-lock.json
 tsconfig.json
-OpenFlow
-OpenFlowNodeRED
 temp
 letsencrypt
 webpack.config.js
 gulpfile.js
-OpenFlow.code-workspace
 CONTRIBUTING
 Dockerfile
 docker-compose.yml
-docker-compose-toolbox.yml
-docker-compose-traefik.yml
-docker-compose-traefik-letsencrypt.yml
 sonar-project.properties
 .nyc_output
 .scannerwor
@@ -36,4 +30,6 @@ register.js
 docker-package.json
 .dockerignore
 *.heapsnapshot
-.clinic
+.clinic
+/public
+/public2

.nyrc.json

@@ -1,7 +1,7 @@
 {
     "extends": "@istanbuljs/nyc-config-typescript",
     "include": [
-        "OpenFlow/src/**/*.ts"
+        "src/**/*.ts"
     ],
     "exclude": [
         "node_modules/"

.vscode/launch.json

@@ -5,15 +5,15 @@
             "args": [],
             "cwd": "${workspaceRoot}",
             "envFile": "${workspaceFolder}/config/.env",
-            "name": "OpenFlow",
+            "name": "Core",
             "outFiles": [
                 "${workspaceRoot}/dist/**/*",
                 "**/node_modules/@openiap/**/*",
             ],
             "outputCapture": "std",
-            "program": "${workspaceRoot}/OpenFlow/src/index.ts",
+            "program": "${workspaceRoot}/src/index.ts",
             "request": "launch",
-            "preLaunchTask": "tsc: watch - OpenFlow/tsconfig.json",
+            "preLaunchTask": "tsc: watch - tsconfig.json",
             "runtimeArgs": [
                 "--inspect"
             ],
@@ -22,7 +22,8 @@
             "stopOnEntry": false,
             "type": "node",
             "env": {
-                "otel_log_level": "info"
+                "otel_log_level": "info",
+                "GIT_DEBUG": "1"
             },
             "resolveSourceMapLocations": [
                 "${workspaceFolder}/**",
@@ -34,11 +35,11 @@
             "type": "node",
             "request": "attach",
             "name": "Attach to localhost",
-            "preLaunchTask": "tsc: watch - OpenFlow/tsconfig.json",
+            "preLaunchTask": "tsc: watch - tsconfig.json",
             "address": "localhost",
             "port": 5858,
             "localRoot": "${workspaceFolder}/dist",
-            "remoteRoot": "/data"
+            "remoteRoot": "/app/dist"
         }
     ]
 }

.vscode/settings.json

@@ -3,5 +3,6 @@
         "options": [
             "--proto_path=messages"
         ]
-    }
+    },
+    "compile-hero.disable-compile-files-on-did-save-code": true
 }

Dockerfile

@@ -1,32 +1,33 @@
-FROM node:lts-alpine as builder
-# --omit=optional
-RUN npm install gulp typescript browserify tsify -g
+# FROM node:lts-alpine
+# FROM node:22.9.0-alpine3.20 AS base
+# FROM node:lts-alpine3.16
+FROM node:22.9-slim
+# alpine
+# RUN apk add --no-cache bash nano
+# debian
+RUN apt-get update && apt-get install -y nano git curl && rm -rf /var/lib/apt/lists/* 
 
 RUN mkdir /app
 WORKDIR /app
-COPY package*.json /app/
-RUN npm install 
+COPY package.json /app/
+# https://github.com/nodejs/docker-node/issues/1946#issuecomment-2459881919
+# ENV NPM_VERSION=10.3.0
+# RUN npm install -g npm@"${NPM_VERSION}" --omit=dev --production --no-audit --verbose --force
+
+RUN npm install --omit=dev --production --no-audit --verbose --force
 COPY . /app/
-RUN gulp sass
+RUN npm run build
+COPY public /app/dist/public
+COPY public.template /app/dist/public.template
 
-RUN gulp
-RUN tsc --build OpenFlow/tsconfig.json
+WORKDIR /app/dist
 
-FROM node:lts-alpine
-ENV NODE_ENV=production
-RUN apk add --no-cache bash nano
+ENV HOME=.
 EXPOSE 3000
 EXPOSE 5858
-WORKDIR /data
-COPY --from=builder /app/package*.json .
-COPY --from=builder /app/dist/ .
-# RUN npm install --omit=dev 
-# RUN npm install mongodb
-ENV HOME=.
-RUN npm install --omit=dev --production
-
-# ENTRYPOINT ["/usr/local/bin/node", "index.js"]
 ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5858", "index.js"]
 
 # docker buildx build --platform linux/amd64 -t openiap/openflow:edge . --push
-# docker buildx build --platform linux/amd64 -t openiap/openflow:dev . --push
+# docker buildx build --platform linux/amd64 -t openiap/openflow:dev . --push
+
+# docker run -it --rm openiap/openflow:edge /bin/bash