Merge branch 'main' of https://github.com/bbc/bug

Author: geoffhouse

.github/dependabot.yml

@@ -0,0 +1,37 @@
+version: 2
+updates:
+    - package-ecosystem: "npm"
+      directory: "/"
+      schedule:
+          interval: "weekly"
+      open-pull-requests-limit: 20
+      groups:
+          other-updates:
+              patterns:
+                  - "*"
+              update-types:
+                  - "major"
+
+    - package-ecosystem: "npm"
+      directory: "/src/client"
+      schedule:
+          interval: "weekly"
+      open-pull-requests-limit: 20
+      groups:
+          other-updates:
+              patterns:
+                  - "*"
+              update-types:
+                  - "major"
+
+    - package-ecosystem: "github-actions"
+      directory: "/"
+      schedule:
+          interval: "weekly"
+      open-pull-requests-limit: 20
+      groups:
+          other-updates:
+              patterns:
+                  - "*"
+              update-types:
+                  - "major"

.github/workflows/dependabot-auto-approve.yml

@@ -0,0 +1,44 @@
+name: Dependabot Auto Approve
+
+on:
+    pull_request_target:
+        types:
+            - opened
+            - synchronize
+            - reopened
+            - ready_for_review
+
+permissions:
+    contents: read
+    pull-requests: write
+
+jobs:
+    auto-approve:
+        if: github.actor == 'dependabot[bot]'
+        runs-on: ubuntu-latest
+        steps:
+            - name: Fetch Dependabot metadata
+              id: metadata
+              uses: dependabot/fetch-metadata@v2
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Auto-approve minor and patch updates
+              if: >-
+                  steps.metadata.outputs.update-type == 'version-update:semver-minor' ||
+                  steps.metadata.outputs.update-type == 'version-update:semver-patch'
+              uses: actions/github-script@v7
+              with:
+                  github-token: ${{ secrets.GITHUB_TOKEN }}
+                  script: |
+                      try {
+                          await github.rest.pulls.createReview({
+                              owner: context.repo.owner,
+                              repo: context.repo.repo,
+                              pull_number: context.payload.pull_request.number,
+                              event: 'APPROVE',
+                              body: 'Auto-approved because this is a Dependabot semver minor/patch update.'
+                          });
+                      } catch (error) {
+                          core.warning(`Approval skipped: ${error.message}`);
+                      }

.github/workflows/deploy.yml

@@ -9,6 +9,10 @@ on:
             - completed
     workflow_dispatch:
 
+concurrency:
+    group: deploy-${{ github.ref }}
+    cancel-in-progress: false
+
 permissions:
     contents: read
     packages: write

.github/workflows/test-module-container.yml

@@ -11,6 +11,7 @@ on:
             - "src/modules/**"
             - "src/server/core/**"
             - ".github/workflows/test-module-container.yml"
+    workflow_dispatch:
 
 jobs:
     discover-modules:

.github/workflows/versioning.yml

@@ -12,6 +12,10 @@ on:
             - main
     workflow_dispatch:
 
+concurrency:
+    group: version-bump-${{ github.ref }}
+    cancel-in-progress: false
+
 permissions:
     actions: read
     contents: write

.gitignore

@@ -20,6 +20,7 @@ Dockerfile*
 !/src/server/Dockerfile
 !/src/server/Dockerfile.dev
 !/src/server/Dockerfile.test
+!/src/modules/*/container/Dockerfile*
 !/src/server/services/dockerfile-write.js
 
 # global environment files

package-lock.json

@@ -133,14 +133,14 @@
         "react-sparklines": "^1.6.0",
         "react-table": "^7.7.0",
         "react-textfit": "^1.1.1",
-        "recharts": "^3.6.0",
+        "recharts": "^3.8.1",
         "rgb-hex": "^4.0.1",
         "serve-favicon": "^2.5.0",
         "socket.io": "^4.5.1",
         "socket.io-client": "^4.0.1",
         "swagger-jsdoc": "^6.2.1",
         "swagger-ui-express": "^4.4.0",
-        "systeminformation": "^5.16.1",
+        "systeminformation": "^5.31.7",
         "tar": "^7.5.13",
         "text-hex": "^1.0.0",
         "timezones.json": "^1.6.1",

package.json

@@ -0,0 +1,6 @@
+FROM node:22-alpine
+WORKDIR /home/node/module
+COPY src/server/core ./core
+COPY src/modules/appear-x/container ./
+RUN npm install
+CMD ["npm", "run", "development"]

src/modules/appear-x/container/Dockerfile

@@ -16,15 +16,15 @@ module.exports = async ({ aristaApi, mongoSingle, interfacesCollection, workerDa
         });
 
         // fetch leases once
-        const leases = await mongoSingle.get("leases") || [];
-        const leasesByMac = Object.fromEntries(leases.map(lease => [lease.mac, lease]));
+        const leases = (await mongoSingle.get("leases")) || [];
+        const leasesByMac = Object.fromEntries(leases.map((lease) => [lease.mac, lease]));
 
         // process ARP / FDB-like info
         const arpByInterface = {};
-        (arpResult?.ipV4Neighbors || []).forEach(eachArp => {
+        (arpResult?.ipV4Neighbors || []).forEach((eachArp) => {
             const mac = parseHex(eachArp.hwAddress).toUpperCase();
             const interfaceArray = eachArp.interface.split(", ");
-            interfaceArray.forEach(iface => {
+            interfaceArray.forEach((iface) => {
                 if (!arpByInterface[iface]) arpByInterface[iface] = [];
                 arpByInterface[iface].push(leasesByMac[mac] || { mac });
             });
@@ -35,8 +35,8 @@ module.exports = async ({ aristaApi, mongoSingle, interfacesCollection, workerDa
             updateOne: {
                 filter: { interfaceId },
                 update: { $set: { fdb: data } },
-                upsert: false
-            }
+                upsert: false,
+            },
         }));
         if (arpOps.length) await interfacesCollection.bulkWrite(arpOps);
         logger.debug(`updated db with arp details for ${arpOps.length} interface(s)`);
@@ -53,7 +53,7 @@ module.exports = async ({ aristaApi, mongoSingle, interfacesCollection, workerDa
 
         // process LLDP info
         const lldpByInterface = {};
-        (lldpResult?.lldpNeighbors || []).forEach(eachNeighbor => {
+        (lldpResult?.lldpNeighbors || []).forEach((eachNeighbor) => {
             const interfaceId = eachNeighbor.port;
             if (!lldpByInterface[interfaceId]) lldpByInterface[interfaceId] = {};
 
@@ -72,20 +72,39 @@ module.exports = async ({ aristaApi, mongoSingle, interfacesCollection, workerDa
             }
         });
 
-        // bulk update LLDP info
-        const lldpOps = Object.entries(lldpByInterface).map(([interfaceId, data]) => ({
-            updateOne: {
-                filter: { interfaceId },
-                update: { $set: { lldp: data } },
-                upsert: false
-            }
-        }));
-        if (lldpOps.length) await interfacesCollection.bulkWrite(lldpOps);
-        logger.debug(`updated db with lldp details for ${lldpOps.length} interface(s)`);
+        const activeInterfaceIds = Object.keys(lldpByInterface);
+        const lldpClearFilter = {
+            lldp: { $exists: true },
+        };
 
+        if (activeInterfaceIds.length) {
+            lldpClearFilter.interfaceId = { $nin: activeInterfaceIds };
+        }
 
+        // bulk update LLDP info
+        const lldpOps = [
+            {
+                updateMany: {
+                    filter: lldpClearFilter,
+                    update: {
+                        $unset: {
+                            lldp: "",
+                        },
+                    },
+                },
+            },
+            ...Object.entries(lldpByInterface).map(([interfaceId, data]) => ({
+                updateOne: {
+                    filter: { interfaceId },
+                    update: { $set: { lldp: data } },
+                    upsert: false,
+                },
+            })),
+        ];
+        await interfacesCollection.bulkWrite(lldpOps, { ordered: false });
+        logger.debug(`updated db with lldp details for ${activeInterfaceIds.length} interface(s)`);
     } catch (err) {
         logger.error(`failed: ${err.message}`);
         throw err;
     }
-};
+};