v3.8 sync

.env.example

@@ -0,0 +1,21 @@
+# Copy to .env and adjust for local embedded dev (npm run dev:embedded).
+
+NODE_ENV=development
+
+# EdgeOps Console static embed (npm run build:console → dev/console/build)
+EDGEOPS_CONSOLE_PATH=dev/console/build  # must be absolute path
+EDGEOPS_CONSOLE_VERSION=1.0.0
+# EDGEOPS_CONSOLE_REPO=https://github.com/Datasance/edgeops-console
+# EDGEOPS_CONSOLE_FLAVOR=datasance
+
+CONSOLE_PORT=8008
+CONTROLLER_PUBLIC_URL=http://localhost:51121
+CONSOLE_URL=http://localhost:8008
+
+# Avoid sudo for file logging during local dev
+LOG_DIRECTORY=dev/logs
+
+# Embedded OIDC (optional — see docs/external-oidc-client-setup.md)
+# AUTH_MODE=embedded
+# OIDC_BOOTSTRAP_ADMIN_USERNAME=admin
+# OIDC_BOOTSTRAP_ADMIN_PASSWORD=changeme

.github/workflows/ci.yaml

@@ -1,156 +1,171 @@
 name: CI
+
 on:
   push:
     branches:
       - main
-    tags: [v*]
+      - develop
+    tags:
+      - v*
     paths-ignore:
       - README.md
       - CHANGELOG.md
       - LICENSE
   pull_request:
-    # Sequence of patterns matched against refs/heads
-    branches:
-      - main
     paths-ignore:
       - README.md
       - CHANGELOG.md
       - LICENSE
-env:
-  IMAGE_NAME: 'controller'
-
 
+env:
+  IMAGE_NAME: controller
 
 jobs:
-  Build:
-    runs-on: ubuntu-22.04  
-    permissions:
-      actions: write
-      checks: write
-      contents: write
-      deployments: write
-      id-token: write
-      issues: write
-      discussions: write
-      packages: write
-      pages: write
-      pull-requests: write
-      repository-projects: write
-      security-events: write
-      statuses: write
-    name: Preflight
+  preflight:
+    name: Lint, test, audit
+    runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 24
-    - name: Replace values
-      shell: bash
-      env: 
-          PAT: ${{ secrets.PAT }}
-      run: |
-        sed -i.back "s|PAT|${PAT}|g" .npmrc
-    - run: npm config set @datasance:registry https://npm.pkg.github.com/    
-    - run: npm install --build-from-source --force
-    - run: npm run standard
-    - run: |
-        npm i -g better-npm-audit
-        npx better-npm-audit audit -p
-
-  Publish:
-    needs: [Build]
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 24
+          cache: npm
+
+      - name: Install dependencies
+        run: npm ci --legacy-peer-deps
+
+      - name: Lint
+        run: npm run standard
+
+      - name: Unit test
+        run: npm test
+
+      - name: Audit production dependencies
+        run: npx --yes better-npm-audit audit -p
+
+  docker:
+    name: Docker build
+    needs: preflight
     runs-on: ubuntu-22.04
     permissions:
-      actions: write
-      checks: write
-      contents: write
-      deployments: write
-      id-token: write
-      issues: write
-      discussions: write
+      contents: read
       packages: write
-      pages: write
-      pull-requests: write
-      repository-projects: write
-      security-events: write
-      statuses: write 
-    name: Publish Controller
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 24
-    - name: Replace values
-      shell: bash
-      env: 
-          PAT: ${{ secrets.PAT }}
-      run: |
-        sed -i.back "s|PAT|${PAT}|g" .npmrc
-    - run: npm config set @datasance:registry https://npm.pkg.github.com/ 
-    - run: npm install --build-from-source --force
-
-    - name: npm version
-      id: package-version
-      uses: martinbeentjes/npm-get-version-action@v1.3.1
-
-    - name: package version
-      shell: bash
-      id: version
-      run: |
-        if [[ ${{ github.ref_name }} =~ ^v.* ]] ; then
-          echo "pkg_version=${{ steps.package-version.outputs.current-version}}" >> "${GITHUB_OUTPUT}"
-        else
-           echo "pkg_version=${{ steps.package-version.outputs.current-version}}-${{ github.run_number }}" >> "${GITHUB_OUTPUT}"
-        fi
-
-    - name: npm pack with version from package version
-      run: |
-        npm pack
-        npm publish --registry=https://npm.pkg.github.com/
-
-    - name: 'Get Previous tag'
-      id: previoustag
-      uses: "WyriHaximus/github-action-get-previous-tag@v1"
-      with:
-        fallback: 0.0.0
-    - name: Set image tag
-      shell: bash
-      id: tags
-      run: |
-        if [[ ${{ github.ref_name }} =~ ^v.* ]] ; then
-          VERSION=${{ github.ref_name }}
-          echo "VERSION=${VERSION:1}" >> "${GITHUB_OUTPUT}"
-        else
-            VERSION=${{ steps.previoustag.outputs.tag }}
-            echo "VERSION=${VERSION:1}-${{ github.run_number }}" >> "${GITHUB_OUTPUT}"
-        fi
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
-      with:
-        version: v0.29.1      
-
-
-    - name: Login to Github Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: "ghcr.io"
-        username: ${{ github.actor }}
-        password: ${{ secrets.PAT }}
-
-    - name: Build and Push to ghcr
-      uses: docker/build-push-action@v3
-      id: build_push_ghcr
-      with:
-        file: Dockerfile
-        context: .
-        platforms: linux/amd64, linux/arm64 
-        push: true
-        outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Controller
-        build-args: GITHUB_TOKEN=${{ secrets.PAT }}
-        tags: |
-          ghcr.io/datasance/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.VERSION }}
-          ghcr.io/datasance/${{ env.IMAGE_NAME }}:latest
-          ghcr.io/datasance/${{ env.IMAGE_NAME }}:main
+      - uses: actions/checkout@v4
+
+      - name: Package version
+        id: package-version
+        uses: martinbeentjes/npm-get-version-action@v1.3.1
+
+      - name: Set build versions
+        id: version
+        shell: bash
+        run: |
+          PKG="${{ steps.package-version.outputs.current-version }}"
+          if [[ "${{ github.ref_name }}" =~ ^v.* ]]; then
+            echo "pkg_version=${PKG}" >> "${GITHUB_OUTPUT}"
+            echo "image_tag=${PKG}" >> "${GITHUB_OUTPUT}"
+          else
+            echo "pkg_version=${PKG}-${{ github.run_number }}" >> "${GITHUB_OUTPUT}"
+            echo "image_tag=${PKG}-${{ github.run_number }}" >> "${GITHUB_OUTPUT}"
+          fi
+
+      - name: Set EdgeOps Console build args
+        shell: bash
+        run: |
+          VERSION="${{ vars.EDGEOPS_CONSOLE_VERSION }}"
+          if [ -z "$VERSION" ]; then VERSION="1.0.0"; fi
+          echo "EDGEOPS_CONSOLE_VERSION=$VERSION" >> "${GITHUB_ENV}"
+
+          REPO="${{ vars.EDGEOPS_CONSOLE_REPO }}"
+          FLAVOR="${{ vars.EDGEOPS_CONSOLE_FLAVOR }}"
+          if [ -z "$REPO" ] || [ -z "$FLAVOR" ]; then
+            case "${{ github.repository }}" in
+              eclipse-iofog/Controller|eclipse-iofog/controller)
+                REPO="${REPO:-https://github.com/eclipse-iofog/edgeops-console}"
+                FLAVOR="${FLAVOR:-iofog}"
+                ;;
+              *)
+                REPO="${REPO:-https://github.com/Datasance/edgeops-console}"
+                FLAVOR="${FLAVOR:-datasance}"
+                ;;
+            esac
+          fi
+          echo "EDGEOPS_CONSOLE_REPO=$REPO" >> "${GITHUB_ENV}"
+          echo "EDGEOPS_CONSOLE_FLAVOR=$FLAVOR" >> "${GITHUB_ENV}"
+
+      - name: Set image registry and OCI source
+        shell: bash
+        run: |
+          REGISTRY="${{ vars.IMAGE_REGISTRY }}"
+          OCI_SOURCE="${{ vars.OCI_SOURCE_REPO }}"
+          if [ -z "$REGISTRY" ] || [ -z "$OCI_SOURCE" ]; then
+            case "${{ github.repository }}" in
+              eclipse-iofog/Controller|eclipse-iofog/controller)
+                REGISTRY="${REGISTRY:-ghcr.io/eclipse-iofog}"
+                OCI_SOURCE="${OCI_SOURCE:-https://github.com/eclipse-iofog/Controller}"
+                ;;
+              *)
+                REGISTRY="${REGISTRY:-ghcr.io/datasance}"
+                OCI_SOURCE="${OCI_SOURCE:-https://github.com/Datasance/Controller}"
+                ;;
+            esac
+          fi
+          echo "IMAGE_REGISTRY=$REGISTRY" >> "${GITHUB_ENV}"
+          echo "OCI_SOURCE_REPO=$OCI_SOURCE" >> "${GITHUB_ENV}"
+
+      - name: Set controller flavor build args
+        shell: bash
+        run: |
+          DISTRIBUTION="${{ vars.CONTROLLER_DISTRIBUTION }}"
+          RBAC_API="${{ vars.RBAC_API_VERSION }}"
+          if [ -z "$DISTRIBUTION" ] || [ -z "$RBAC_API" ]; then
+            case "${{ github.repository }}" in
+              eclipse-iofog/Controller|eclipse-iofog/controller)
+                DISTRIBUTION="${DISTRIBUTION:-iofog}"
+                RBAC_API="${RBAC_API:-iofog.org/v3}"
+                ;;
+              *)
+                DISTRIBUTION="${DISTRIBUTION:-datasance}"
+                RBAC_API="${RBAC_API:-datasance.com/v3}"
+                ;;
+            esac
+          fi
+          echo "CONTROLLER_DISTRIBUTION=$DISTRIBUTION" >> "${GITHUB_ENV}"
+          echo "RBAC_API_VERSION=$RBAC_API" >> "${GITHUB_ENV}"
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          tags: |
+            ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.image_tag }}
+            ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:main
+            ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          build-args: |
+            PKG_VERSION=${{ steps.version.outputs.pkg_version }}
+            EDGEOPS_CONSOLE_REPO=${{ env.EDGEOPS_CONSOLE_REPO }}
+            EDGEOPS_CONSOLE_VERSION=${{ env.EDGEOPS_CONSOLE_VERSION }}
+            EDGEOPS_CONSOLE_FLAVOR=${{ env.EDGEOPS_CONSOLE_FLAVOR }}
+            IMAGE_REGISTRY=${{ env.IMAGE_REGISTRY }}
+            OCI_SOURCE_REPO=${{ env.OCI_SOURCE_REPO }}
+            CONTROLLER_DISTRIBUTION=${{ env.CONTROLLER_DISTRIBUTION }}
+            RBAC_API_VERSION=${{ env.RBAC_API_VERSION }}

.gitignore

@@ -19,6 +19,9 @@ diagnostic/
 iofog-iofogcontroller-*.tgz
 .npmrc
 .env
+dev/edgeops-console/
+dev/console/
+dev/logs/
 src/iofog-controller.pid
 mcp-controller-server/
 .cursor/

.mocharc.json

@@ -1,5 +1,6 @@
 {
   "require": "test/support/setup.js",
   "ui": "bdd-lazy-var/global",
-  "recursive": true
+  "timeout": 15000,
+  "exit": true
 }

.npmrc

@@ -1,2 +1,2 @@
 //npm.pkg.github.com/:_authToken=PAT
-@Datasance:registry=https://npm.pkg.github.com/
+@Eclipse-iofog:registry=https://npm.pkg.github.com/

.nsprc

@@ -1,5 +1 @@
-{
-  "1112030": {
-    "notes": ""
-  }
-}
+{}