[pull] dev from 0xJacky:dev

.air.toml

@@ -7,15 +7,15 @@ tmp_dir = "tmp"
 
 [build]
 # Just plain old shell command. You could use `make` as well.
-cmd = "CGO_ENABLED=1 go build -trimpath -tags=jsoniter,unembed -ldflags=\"-X 'github.com/0xJacky/Nginx-UI/settings.buildTime=$(date +%s)'\" -v -o ./tmp/main ."
+cmd = "CGO_ENABLED=1 go build -tags=jsoniter,unembed,dev -ldflags=\"-X 'github.com/0xJacky/Nginx-UI/settings.buildTime=$(date +%s)'\" -v -o ./tmp/main ."
 # Binary file yields from `cmd`.
 bin = "tmp/main"
 # Customize binary.
 full_bin = "APP_ENV=dev APP_USER=air ./tmp/main"
 # Watch these filename extensions.
 include_ext = ["go", "tpl", "tmpl", "html", "toml", "po", "conf"]
 # Ignore these filename extensions or directories.
-exclude_dir = ["assets", "tmp", "vendor", "app/node_modules", "upload", "docs", "resources", ".idea", "cmd"]
+exclude_dir = ["assets", "tmp", "vendor", "app/node_modules", "upload", "docs", "resources", ".idea", "cmd", ".go", "log-index"]
 # Watch these directories if you specified.
 include_dir = []
 # Exclude files.

.claude/settings.local.json

@@ -0,0 +1,28 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(pnpm typecheck:*)",
+      "Bash(pnpm lint:*)",
+      "Bash(npm run build:*)",
+      "Bash(go build:*)",
+      "Bash(npm run typecheck:*)",
+      "Bash(mkdir:*)",
+      "Bash(mv:*)",
+      "Bash(grep:*)",
+      "Bash(go test:*)",
+      "mcp__context7__resolve-library-id",
+      "mcp__context7__get-library-docs",
+      "Bash(find:*)",
+      "Bash(sed:*)",
+      "Bash(cp:*)",
+      "mcp__eslint__lint-files",
+      "Bash(go generate:*)",
+      "Bash(pnpm eslint:*)",
+      "Read(//workspaces/cosy/settings/**)",
+      "Bash(go doc:*)",
+      "Bash(pnpm exec eslint:*)",
+      "Bash(go:*)"
+    ],
+    "deny": []
+  }
+}

.devcontainer/docker-compose.yml

@@ -4,9 +4,11 @@ services:
     image: nginx-ui-dev
     container_name: nginx-ui
     volumes:
+      - ~/.ssh:/root/.ssh
       - ../..:/workspaces:cached
-      - ./go-path:/root/go
+      - go-modules:/root/go
       - ./data/nginx:/etc/nginx
+      - ./data/nginx-logs:/var/log/nginx
       - /var/run/docker.sock:/var/run/docker.sock
     command: sleep infinity
     environment:
@@ -80,3 +82,6 @@ services:
 
 networks:
   nginxui:
+
+volumes:
+  go-modules:

.devcontainer/start.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# setup git for claude
+git config --global gpg.format ssh
+git config --global user.signingkey ~/.ssh/id_ed25519.pub
+git config --global commit.gpgsign true
+
 # install air
 go install github.com/air-verse/air@latest
 

.github/workflows/build.yml

@@ -41,13 +41,13 @@ on:
 
 jobs:
   build_app:
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up nodejs
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: current
 
@@ -56,29 +56,44 @@ jobs:
           corepack enable
           corepack prepare pnpm@latest --activate
           pnpm install
-        working-directory: app
 
       - name: Check frontend code style
         run: |
-          pnpm run lint
-        working-directory: app
+          pnpm lint
 
       - name: Check frontend types
         run: |
-          pnpm run typecheck
-        working-directory: app
+          pnpm typecheck
 
       - name: Build
         run: |
           npx update-browserslist-db@latest
           pnpm build
-        working-directory: app
+
+      - name: Compress frontend with xz
+        run: |
+          # Create compressed archive of the entire dist directory
+          tar -C app -cf - dist | xz -9 -c > app/dist.tar.xz
+
+          # Verify compression worked and show savings (macOS compatible)
+          ORIGINAL_SIZE=$(find app/dist -type f -exec stat -f%z {} \; | awk '{total += $1} END {print total}')
+          COMPRESSED_SIZE=$(stat -f%z app/dist.tar.xz)
+
+          if [[ $ORIGINAL_SIZE -gt 0 ]]; then
+            SAVINGS=$((100 - COMPRESSED_SIZE * 100 / ORIGINAL_SIZE))
+            echo "Original size: ${ORIGINAL_SIZE} bytes"
+            echo "Compressed size: ${COMPRESSED_SIZE} bytes"
+            echo "Compression savings: ${SAVINGS}%"
+          else
+            echo "Compressed size: ${COMPRESSED_SIZE} bytes"
+          fi
 
       - name: Archive app artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: app-dist
-          path: app/dist
+          path: |
+            app/dist.tar.xz
 
       - name: Prepare publish
         if: github.event_name == 'release'
@@ -97,12 +112,12 @@ jobs:
     needs: build_app
     strategy:
       matrix:
-        goos: [ linux, darwin, windows ]
+        goos: [ linux, windows ]
         goarch: [ amd64, 386, arm64 ]
-        exclude:
-          # Exclude i386 on darwin.
-          - goarch: 386
-            goos: darwin
+        # exclude:
+          # Exclude i386 on windows (if needed)
+          # - goarch: 386
+          #   goos: windows
         include:
           # BEGIN Linux ARM 5 6 7
           - goos: linux
@@ -136,12 +151,12 @@ jobs:
       GOARM: ${{ matrix.goarm }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
-          go-version: ^1.24.5
+          go-version: ^1.25.4
           cache: false
 
       - name: Setup environment
@@ -179,10 +194,10 @@ jobs:
               go-${{ runner.os }}-${{ runner.arch }}-${{ env.CACHE_NAME }}-
 
       - name: Download app artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: app-dist
-          path: app/dist
+          path: app/dist.tar.xz
 
       - name: Generate files
         env:
@@ -206,17 +221,6 @@ jobs:
           echo "CXX=${{ env.ARCH_NAME }}-linux-musl${{ env.ABI }}-g++" >> $GITHUB_ENV
           echo "LD_FLAGS=-w --extldflags '-static'" >> $GITHUB_ENV
 
-      - name: Install darwin cross compiler
-        if: env.GOOS == 'darwin'
-        run: |
-          curl -L https://github.com/Hintay/crossosx/releases/latest/download/crossosx.tar.zst -o crossosx.tar.zst
-          tar xvaf crossosx.tar.zst
-          echo "LD_LIBRARY_PATH=$(pwd)/crossosx/lib/" >> $GITHUB_ENV
-          echo "PATH=$(pwd)/crossosx/bin/:$PATH" >> $GITHUB_ENV
-          echo "CC=${{ env.ARCH_NAME }}-clang" >> $GITHUB_ENV
-          echo "CXX=${{ env.ARCH_NAME }}-clang++" >> $GITHUB_ENV
-          echo "LD_FLAGS=-w" >> $GITHUB_ENV
-
       - name: Setup for Windows
         if: env.GOOS == 'windows'
         run: |
@@ -257,7 +261,7 @@ jobs:
           go build -trimpath -tags=jsoniter -ldflags "$LD_FLAGS -X 'github.com/0xJacky/Nginx-UI/settings.buildTime=$(date +%s)'" -o dist/$BINARY_NAME -v main.go
 
       - name: Archive backend artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ env.ARTIFACT }}
           path: dist/${{ env.BINARY_NAME }}
@@ -295,21 +299,113 @@ jobs:
         run: |
           echo "Uploading ${{ env.DIST }}.tar.gz to R2..."
           aws s3 cp ./${{ env.DIST }}.tar.gz s3://nginx-ui-dev-build/${{ env.DIST }}.tar.gz --endpoint-url=${{ secrets.R2_S3_API_ENDPOINT }}
-          
+
           echo "Uploading ${{ env.DIST }}.tar.gz.digest to R2..."
           aws s3 cp ./${{ env.DIST }}.tar.gz.digest s3://nginx-ui-dev-build/${{ env.DIST }}.tar.gz.digest --endpoint-url=${{ secrets.R2_S3_API_ENDPOINT }}
-
+
+          echo "Upload completed successfully"
+
+  build_macos_native:
+    runs-on: macos-latest
+    needs: build_app
+    strategy:
+      matrix:
+        goarch: [amd64, arm64]
+    env:
+      CGO_ENABLED: 1
+      GOOS: darwin
+      GOARCH: ${{ matrix.goarch }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: ^1.25.4
+          cache: false
+
+      - name: Setup environment
+        id: info
+        run: |
+          export _NAME=$(jq ".darwin[\"$GOARCH\"].name" -r < .github/build/build_info.json)
+          export _ARTIFACT=nginx-ui-darwin-$GOARCH
+          export _BINARY=nginx-ui
+          echo "GOOS: darwin, GOARCH: $GOARCH, RELEASE_NAME: $_NAME, ARTIFACT_NAME: $_ARTIFACT, BINARY_NAME: $_BINARY"
+          echo "CACHE_NAME=$_NAME" >> $GITHUB_ENV
+          echo "DIST=nginx-ui-$_NAME" >> $GITHUB_ENV
+          echo "ARTIFACT=$_ARTIFACT" >> $GITHUB_ENV
+          echo "BINARY_NAME=$_BINARY" >> $GITHUB_ENV
+
+      - name: Setup Go build cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/go/pkg/mod
+            ~/.cache/go-build
+          key: go-${{ runner.os }}-${{ runner.arch }}-${{ env.CACHE_NAME }}-${{ hashFiles('go.mod') }}
+          restore-keys: |
+            go-${{ runner.os }}-${{ runner.arch }}-${{ env.CACHE_NAME }}-
+
+      - name: Download app artifacts
+        uses: actions/download-artifact@v6
+        with:
+          name: app-dist
+          path: app/dist.tar.xz
+
+      - name: Generate files
+        run: go generate cmd/version/generate.go
+
+      - name: Build with native CGO
+        run: |
+          mkdir -p dist
+          go build -trimpath -tags=jsoniter -ldflags "-w -X 'github.com/0xJacky/Nginx-UI/settings.buildTime=$(date +%s)'" -o dist/$BINARY_NAME -v main.go
+
+      - name: Archive backend artifacts
+        uses: actions/upload-artifact@v5
+        with:
+          name: ${{ env.ARTIFACT }}
+          path: dist/${{ env.BINARY_NAME }}
+
+      - name: Prepare publish
+        run: |
+          cp README*.md ./dist
+          cd dist && tar -zcvf ../${{ env.DIST }}.tar.gz .
+          cd ..
+          openssl dgst -sha512 ${{ env.DIST }}.tar.gz | sed 's/([^)]*)//g' | awk '{print $NF}' >> ${{ env.DIST }}.tar.gz.digest
+
+      - name: Publish
+        uses: softprops/action-gh-release@v2
+        if: github.event_name == 'release'
+        with:
+          files: |
+            ${{ env.DIST }}.tar.gz
+            ${{ env.DIST }}.tar.gz.digest
+
+      - name: Upload to R2 using S3 API
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/dev'
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          AWS_REGION: us-east-1
+        run: |
+          echo "Uploading ${{ env.DIST }}.tar.gz to R2..."
+          aws s3 cp ./${{ env.DIST }}.tar.gz s3://nginx-ui-dev-build/${{ env.DIST }}.tar.gz --endpoint-url=${{ secrets.R2_S3_API_ENDPOINT }}
+
+          echo "Uploading ${{ env.DIST }}.tar.gz.digest to R2..."
+          aws s3 cp ./${{ env.DIST }}.tar.gz.digest s3://nginx-ui-dev-build/${{ env.DIST }}.tar.gz.digest --endpoint-url=${{ secrets.R2_S3_API_ENDPOINT }}
+
           echo "Upload completed successfully"
 
   docker-build:
     if: github.event_name != 'pull_request'
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build, build_macos_native]
     env:
       PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/arm/v5
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Docker meta
         id: meta
@@ -326,7 +422,7 @@ jobs:
             type=raw,value=latest,enable=${{ github.event_name == 'release' && !github.event.release.prerelease }}
 
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           path: ./dist
 
@@ -376,11 +472,11 @@ jobs:
 
   update-homebrew:
     runs-on: ubuntu-latest
-    needs: build
+    needs: [build, build_macos_native]
     if: github.event_name == 'release'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Get release info
         id: release
@@ -505,7 +601,7 @@ jobs:
           cat nginx-ui.rb
 
       - name: Checkout homebrew-tools repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: 0xJacky/homebrew-tools
           path: homebrew-tools
@@ -556,11 +652,11 @@ jobs:
 
   publish-winget:
     runs-on: windows-latest
-    needs: build
+    needs: [build, build_macos_native]
     if: github.event_name == 'release'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Publish to WinGet
         uses: vedantmgoyal9/winget-releaser@v2