unraid · elibosley · Mar 4, 2025 · Feb 12, 2025 · Feb 12, 2025 · Feb 12, 2025
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,19 +12,25 @@ concurrency:
 
 jobs:
   release-please:
+    name: Release Please
     # Only run release-please on pushes to main
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+
       - id: release
         uses: googleapis/release-please-action@v4
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     outputs:
-      releases_created: ${{ steps.release.outputs.releases_created }}
-      tag_name: ${{ steps.release.outputs.tag_name }}
+      releases_created: ${{ steps.release.outputs.releases_created || 'false' }}
+      tag_name: ${{ steps.release.outputs.tag_name || '' }}
   test-api:
+    name: Test API
     defaults:
       run:
         working-directory: api
@@ -73,7 +79,7 @@ jobs:
         run: pnpm run coverage
 
   build-api:
-    name: Build and Test API
+    name: Build API
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -136,13 +142,16 @@ jobs:
           export API_VERSION
 
       - name: Build
-        run: pnpm run build-and-pack
+        run: |
+          pnpm run build:release
+
+          tar -czf deploy/unraid-api.tgz -C deploy/pack/ .
 
       - name: Upload tgz to Github artifacts
         uses: actions/upload-artifact@v4
         with:
           name: unraid-api
-          path: ${{ github.workspace }}/api/deploy/release/*.tgz
+          path: ${{ github.workspace }}/api/deploy/unraid-api.tgz
 
   build-unraid-ui-webcomponents:
     name: Build Unraid UI Library (Webcomponent Version)
@@ -196,13 +205,11 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: unraid-wc-ui
-          path: unraid-ui/dist/
+          path: unraid-ui/dist-wc/
 
   build-web:
     # needs: [build-unraid-ui]
     name: Build Web App
-    environment:
-      name: production
     defaults:
       run:
         working-directory: web
@@ -214,10 +221,10 @@ jobs:
       - name: Create env file
         run: |
           touch .env
-          echo VITE_ACCOUNT=${{ vars.VITE_ACCOUNT }} >> .env
-          echo VITE_CONNECT=${{ vars.VITE_CONNECT }} >> .env
-          echo VITE_UNRAID_NET=${{ vars.VITE_UNRAID_NET }} >> .env
-          echo VITE_CALLBACK_KEY=${{ vars.VITE_CALLBACK_KEY }} >> .env
+          echo VITE_ACCOUNT=${{ secrets.VITE_ACCOUNT }} >> .env
+          echo VITE_CONNECT=${{ secrets.VITE_CONNECT }} >> .env
+          echo VITE_UNRAID_NET=${{ secrets.VITE_UNRAID_NET }} >> .env
+          echo VITE_CALLBACK_KEY=${{ secrets.VITE_CALLBACK_KEY }} >> .env
           cat .env
 
       - name: Install Node
@@ -273,9 +280,13 @@ jobs:
           path: web/.nuxt/nuxt-custom-elements/dist/unraid-components
 
   build-plugin:
-    needs: [build-api, build-web, build-unraid-ui-webcomponents]
-    outputs:
-      tag: ${{ steps.build-plugin.outputs.tag }}
+    name: Build and Deploy Plugin
+    needs:
+      - release-please
+      - build-api
+      - build-web
+      - build-unraid-ui-webcomponents
+      - test-api
     defaults:
       run:
         working-directory: plugin
@@ -298,7 +309,6 @@ jobs:
       - uses: pnpm/action-setup@v4
         name: Install pnpm
         with:
-
           run_install: false
 
       - name: Get pnpm store directory
@@ -320,148 +330,99 @@ jobs:
           cd ${{ github.workspace }}
           pnpm install --frozen-lockfile --filter @unraid/connect-plugin
 
+      - name: Download Unraid UI Components
+        uses: actions/download-artifact@v4
+        with:
+          name: unraid-wc-ui
+          path: ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/uui
+          merge-multiple: true
       - name: Download Unraid Web Components
         uses: actions/download-artifact@v4
         with:
-          pattern: unraid-wc-*
-          path: ./plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components
+          pattern: unraid-wc-rich
+          path: ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/nuxt
           merge-multiple: true
       - name: Download Unraid API
         uses: actions/download-artifact@v4
         with:
           name: unraid-api
-          path: /tmp/unraid-api/
-      - name: Extract Unraid API and Build Plugin
+          path: ${{ github.workspace }}/plugin/api/
+      - name: Extract Unraid API
+        run: |
+          mkdir -p ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/unraid-api
+          tar -xzf ${{ github.workspace }}/plugin/api/unraid-api.tgz -C ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/unraid-api
+      - name: Build Plugin and TXZ Based on Event and Tag
         id: build-plugin
         run: |
-          tar -xzf /tmp/unraid-api/unraid-api.tgz -C ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/unraid-api
           cd ${{ github.workspace }}/plugin
+          pnpm run build:txz
 
           if [ -n "${{ github.event.pull_request.number }}" ]; then
-            export TAG=PR${{ github.event.pull_request.number }}
-            # Put tag into github env
-            echo "TAG=${TAG}" >> $GITHUB_OUTPUT
+            TAG="PR${{ github.event.pull_request.number }}"
+            BUCKET_PATH="unraid-api/tag/${TAG}"
+          else
+            TAG=""
+            BUCKET_PATH="unraid-api"
           fi
 
-          pnpm run build
-      - name: Upload binary txz and plg to Github artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: connect-files
-          path: |
-            plugin/deploy/release/plugins/
-            plugin/deploy/release/archive/*.txz
-          retention-days: 5
-          if-no-files-found: error
-
-  release-pull-request:
-    if: |
-      github.event_name == 'pull_request'
-    runs-on: ubuntu-latest
-    needs: [test-api, build-plugin]
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
+          if [ "${{ needs.release-please.outputs.releases_created }}" == 'true' ]; then
+            BASE_URL="https://stable.dl.unraid.net/unraid-api"
+          else
+            BASE_URL="https://preview.dl.unraid.net/unraid-api"
+          fi
 
-      - name: Make PR Release Folder
-        run: mkdir pr-release/
+          echo "BUCKET_PATH=${BUCKET_PATH}" >> $GITHUB_OUTPUT
+          echo "TAG=${TAG}" >> $GITHUB_OUTPUT
 
-      - name: Download plugin binary tgz
-        uses: actions/download-artifact@v4
-        with:
-          name: connect-files
+          pnpm run build:plugin --tag="${TAG}" --base-url="${BASE_URL}"
 
-      - name: Copy other release files to pr-release
+      - name: Ensure Plugin Files Exist
         run: |
-          cp archive/*.txz pr-release/
-          cp plugins/pr/dynamix.unraid.net.plg pr-release/dynamix.unraid.net.plg
-
-      - name: Upload to Cloudflare
-        uses: jakejarvis/s3-sync-action@v0.5.1
-        env:
-          AWS_S3_ENDPOINT: ${{ secrets.CF_ENDPOINT }}
-          AWS_S3_BUCKET: ${{ secrets.CF_BUCKET_PREVIEW }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
-          AWS_REGION: "auto"
-          SOURCE_DIR: pr-release
-          DEST_DIR: unraid-api/tag/${{ needs.build-plugin.outputs.tag }}
-      - name: Comment URL
-        uses: thollander/actions-comment-pull-request@v3
-        with:
-          comment-tag: prlink
-          mode: recreate
-          message: |
-            This plugin has been deployed to Cloudflare R2 and is available for testing.
-            Download it at this URL:
-            ```
-            https://preview.dl.unraid.net/unraid-api/tag/${{ needs.build-plugin.outputs.tag }}/dynamix.unraid.net.plg
-            ```
-
-  release-staging:
-    environment:
-      name: staging
-    # Only release if this is a push to the main branch
-    if: startsWith(github.ref, 'refs/heads/main')
-    runs-on: ubuntu-latest
-    needs: [test-api, build-plugin]
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Make Staging Release Folder
-        run: mkdir staging-release/
+          if [ ! -f ./deploy/*.plg ]; then
+            echo "Error: .plg file not found in plugin/deploy/"
+            exit 1
+          fi
 
-      - name: Download plugin binary tgz
-        uses: actions/download-artifact@v4
+          if [ ! -f ./deploy/*.txz ]; then
+            echo "Error: .txz file not found in plugin/deploy/"
+            exit 1
+          fi
+      - name: Upload to GHA
+        uses: actions/upload-artifact@v4
         with:
-          name: connect-files
-
-      - name: Copy Files for Staging Release
-        run: |
-          cp archive/*.txz staging-release/
-          cp plugins/staging/dynamix.unraid.net.plg staging-release/dynamix.unraid.net.plg
-          ls -al staging-release
-
-      - name: Upload Staging Plugin to Cloudflare Bucket
-        uses: jakejarvis/s3-sync-action@v0.5.1
+          name: unraid-plugin
+          path: plugin/deploy/
+      - name: Upload to Cloudflare
+        if: github.event_name == 'pull_request' || startsWith(github.ref, 'refs/heads/main')
         env:
-          AWS_S3_ENDPOINT: ${{ secrets.CF_ENDPOINT }}
-          AWS_S3_BUCKET: ${{ secrets.CF_BUCKET_PREVIEW }}
           AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_SECRET_ACCESS_KEY }}
-          AWS_REGION: "auto"
-          SOURCE_DIR: staging-release
-          DEST_DIR: unraid-api
-
-  create-draft-release:
-    # Only run if release-please created a release
-    if: needs.release-please.outputs.releases_created == 'true'
-    runs-on: ubuntu-latest
-    needs: [release-please, test-api, build-plugin]
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Download plugin binary tgz
-        uses: actions/download-artifact@v4
-        with:
-          name: connect-files
-
-      - name: Move Files to Release Folder
+          AWS_DEFAULT_REGION: auto
         run: |
-          mkdir -p release/
-          mv plugins/production/dynamix.unraid.net.plg release/
-          mv archive/*.txz release/
+          # Sync the deploy directory to the Cloudflare bucket - CRC32 is required for the checksum-algorithm on cloudflare (ref. https://community.cloudflare.com/t/an-error-occurred-internalerror-when-calling-the-putobject-operation/764905/8)
+          aws s3 sync deploy/ s3://${{ secrets.CF_BUCKET_PREVIEW }}/${{ steps.build-plugin.outputs.BUCKET_PATH }} --endpoint-url ${{ secrets.CF_ENDPOINT }} --checksum-algorithm CRC32
 
       - name: Upload Release Assets
+        if: needs.release-please.outputs.releases_created == 'true'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           release_name=$(gh release list --repo ${{ github.repository }} --json name,isDraft --jq '.[] | select(.isDraft == true) | .name' | head -n 1)
           # For each file in release directory
-          for file in release/*; do
+          for file in deploy/*; do
             echo "Uploading $file to release..."
             gh release upload "${release_name}" "$file" --clobber
           done
+
+      - name: Comment URL
+        if: github.event_name == 'pull_request'
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          comment-tag: prlink
+          mode: recreate
+          message: |
+            This plugin has been deployed to Cloudflare R2 and is available for testing.
+            Download it at this URL:
+            ```
+            https://preview.dl.unraid.net/unraid-api/tag/${{ steps.build-plugin.outputs.tag }}/dynamix.unraid.net.plg
+            ```
diff --git a/api/Dockerfile b/api/Dockerfile
@@ -42,4 +42,4 @@ ENV NODE_ENV=production
 
 COPY . .
 
-CMD ["pnpm", "run", "build-and-pack"]
+CMD ["pnpm", "run", "build:release"]
diff --git a/api/package.json b/api/package.json
@@ -20,8 +20,9 @@
         "// Build and Deploy": "",
         "build": "vite build --mode=production",
         "postbuild": "chmod +x dist/main.js && chmod +x dist/cli.js",
+        "build:watch": "vite build --mode=production --watch",
         "build:docker": "./scripts/dc.sh run --rm builder",
-        "build-and-pack": "tsx ./scripts/build.ts",
+        "build:release": "tsx ./scripts/build.ts",
         "preunraid:deploy": "pnpm build",
         "unraid:deploy": "./scripts/deploy-dev.sh",
         "// GraphQL Codegen": "",

diff --git a/api/scripts/build.ts b/api/scripts/build.ts
@@ -45,12 +45,6 @@ try {
     // chmod the cli
     await $`chmod +x ./dist/cli.js`;
     await $`chmod +x ./dist/main.js`;
-
-    // Create the tarball
-    await $`tar -czf ../release/unraid-api.tgz ./`;
-
-    // Clean up
-    cd('..');
 } catch (error) {
     // Error with a command
     if (Object.keys(error).includes('stderr')) {

diff --git a/package.json b/package.json
@@ -4,6 +4,7 @@
   "version": "4.1.3",
   "scripts": {
     "build": "pnpm -r build",
+    "build:watch": "pnpm -r build:watch",
     "dev": "pnpm -r dev",
     "unraid:deploy": "pnpm -r unraid:deploy",
     "test": "pnpm -r test",

diff --git a/plugin/.dockerignore b/plugin/.dockerignore
@@ -5,4 +5,4 @@ deploy/*
 .github/*
 .vscode/*
 .DS_Store
-node_modules
+node_modules/*
diff --git a/plugin/Dockerfile b/plugin/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22-bookworm-slim AS builder
+FROM node:22-bookworm-slim AS plugin-builder
 
 # Install build tools and dependencies
 RUN apt-get update -y && apt-get install -y \
@@ -18,8 +18,17 @@ WORKDIR /app
 
 COPY package.json ./
 
-RUN npm install --include=dev
+RUN corepack enable && pnpm install
 
-COPY . .
+# Install a simple http server
+RUN npm install -g http-server
 
-CMD ["npm", "run", "build"]
+# Expose port 8080
+EXPOSE 8080
+
+COPY scripts/entrypoint.sh /start.sh
+RUN chmod +x /start.sh
+
+ENTRYPOINT [ "/start.sh" ]
+
+CMD [ "pnpm", "run", "build:watcher" ]
-COPY scripts/entrypoint.sh /start.sh
-RUN chmod +x /start.sh
-
-ENTRYPOINT [ "/start.sh" ]
-
-CMD [ "pnpm", "run", "build:watcher" ]
+# Copy container startup script that initializes the environment
+COPY scripts/entrypoint.sh /start.sh
+RUN chmod +x /start.sh
+
+# Use entrypoint script to handle initialization and environment setup
+ENTRYPOINT [ "/start.sh" ]
+
+# Default command runs the watcher for development hot-reloading
+CMD [ "pnpm", "run", "build:watcher" ]
-COPY scripts/entrypoint.sh /start.sh
-RUN chmod +x /start.sh
-
-ENTRYPOINT [ "/start.sh" ]
-
-CMD [ "pnpm", "run", "build:watcher" ]
+# Copy container startup script that initializes the environment
+COPY scripts/entrypoint.sh /start.sh
+RUN chmod +x /start.sh
+
+# Use entrypoint script to handle initialization and environment setup
+ENTRYPOINT [ "/start.sh" ]
+
+# Default command runs the watcher for development hot-reloading
+CMD [ "pnpm", "run", "build:watcher" ]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -42,4 +42,4 @@ ENV NODE_ENV=production

		COPY . .

		CMD ["pnpm", "run", "build-and-pack"]
		CMD ["pnpm", "run", "build:release"]