Merge branch 'master' of git.koptilnya.xyz:opti1337/chad

Reviewed-on: #7

.gitea/workflows/deploy-client.yml

@@ -2,16 +2,15 @@ name: Deploy
 
 on:
   push:
-    branches:
-      - release
     # tags:
-    # - "v[0-9]+.[0-9]+.[0-9]+"
-    paths:
-      - ".gitea/workflows/deploy-client.yml"
-      - "client/**"
+    #   - "v[0-9]+.[0-9]+.[0-9]+"
+
+    # paths:
+    #   - ".gitea/workflows/deploy-client.yml"
+    #   - "client/**"
 
 jobs:
-  publish-web:
+  publish-windows:
     runs-on: ubuntu-latest
 
     steps:
@@ -27,48 +26,57 @@ jobs:
           persist-credentials: false
 
       - name: Build
-        run: docker build -t chad-client ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }}
-
-      - name: Stop old container
-        run: docker rm -f chad-client || true
-
-      - name: Run
         run: |
-          docker run -d \
-            --name chad-client \
-            --network traefik \
-            --label "traefik.enable=true" \
-            --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \
-            --label "traefik.http.routers.chad-client.entrypoints=websecure" \
-            --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \
-            --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
-            chad-client:latest
+          docker build \
+            -t chad-client-windows-builder \
+            -f ./client/Dockerfile.windows \
+            ./client \
+            --build-arg COMMIT_SHA=${{ gitea.sha }} \
+            --build-arg API_BASE_URL=${{ vars.API_BASE_URL }} \
+            --build-arg TAURI_SIGNING_PRIVATE_KEY=${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
 
-  publish-tauri:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v4
+          docker create --name chad-client-windows-container chad-client-windows-builder
+          mkdir -p artifacts
+          docker cp chad-client-windows-container:/artifacts artifacts/
+          docker rm chad-client-windows-container
+          ls -la artifacts
 
-      - name: setup node
-        uses: actions/setup-node@v4
+      - name: Publish
+        uses: akkuman/gitea-release-action@v1
         with:
-          node-version: lts/*
+          files: |
+            artifacts/**
+          draft: true
 
-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
+  # publish-web:
+  #   runs-on: ubuntu-latest
 
-      - name: install frontend dependencies
-        run: yarn install
+  #   steps:
+  #     - name: Keyscan
+  #       run: |
+  #         ssh-keyscan git.koptilnya.xyz >> ~/.ssh/known_hosts
 
-      - uses: tauri-apps/tauri-action@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
-        with:
-          tagName: app-v__VERSION__
-          releaseName: "App v__VERSION__"
-          releaseBody: "See the assets to download this version and install."
-          releaseDraft: true
-          projectPath: "./client"
-          githubBaseUrl: "https://git.koptilnya.xyz/api/v1"
-          isGitea: true
-          prerelease: false
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
+  #         ssh-strict: false
+  #         persist-credentials: false
+
+  #     - name: Build
+  #       run: docker build -t chad-client -f ./client/Dockerfile.web ./client --build-arg COMMIT_SHA=${{ gitea.sha }} --build-arg API_BASE_URL=${{ vars.API_BASE_URL }}
+
+  #     - name: Stop old container
+  #       run: docker rm -f chad-client || true
+
+  #     - name: Run
+  #       run: |
+  #         docker run -d \
+  #           --name chad-client \
+  #           --network traefik \
+  #           --label "traefik.enable=true" \
+  #           --label "traefik.http.routers.chad-client.rule=Host(\`chad.koptilnya.xyz\`)" \
+  #           --label "traefik.http.routers.chad-client.entrypoints=websecure" \
+  #           --label "traefik.http.routers.chad-client.tls.certresolver=myresolver" \
+  #           --label "traefik.http.services.chad-client.loadbalancer.server.port=80" \
+  #           chad-client:latest

client/.gitattributes

@@ -0,0 +1,2 @@
+/.yarn/releases/** binary
+/.yarn/plugins/** binary

client/.gitignore

@@ -23,6 +23,7 @@ logs
 .env.*
 !.env.example
 
+.pnp.*
 .yarn/*
 !.yarn/patches
 !.yarn/plugins
@@ -31,4 +32,6 @@ logs
 !.yarn/versions
 
 scripts/release.ps1
-.tauri
+.tauri
+
+updater.json

client/.yarnrc.yml

@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.12.0.cjs

client/Dockerfile.windows

@@ -0,0 +1,48 @@
+# === Build ===
+FROM node:lts AS builder
+
+WORKDIR /app
+
+# RUN corepack enable yarn && yarn set version stable
+
+COPY package.json yarn.lock .yarnrc.yml ./
+COPY .yarn ./.yarn
+
+RUN yarn install --immutable
+COPY . .
+
+ARG COMMIT_SHA=unknown
+ARG API_BASE_URL
+ARG TAURI_SIGNING_PRIVATE_KEY
+
+ENV COMMIT_SHA=$COMMIT_SHA \
+    API_BASE_URL=$API_BASE_URL \
+    TAURI_SIGNING_PRIVATE_KEY=$TAURI_SIGNING_PRIVATE_KEY \
+    TAURI_SIGNING_PRIVATE_KEY_PASSWORD=
+
+RUN apt update && apt install -y --no-install-recommends \
+    nsis \
+    clang \
+    lld \
+    llvm \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+ENV PATH=/root/.cargo/bin:$PATH
+
+RUN rustup target add x86_64-pc-windows-msvc
+
+RUN cargo install --locked cargo-xwin
+
+RUN yarn tauri build --runner cargo-xwin --target x86_64-pc-windows-msvc
+
+RUN node scripts/generate-updater.mjs
+
+# === Artifacts ===
+FROM scratch AS artifacts
+
+COPY --from=builder /app/updater.json ./artifacts
+COPY --from=builder /app/src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/ ./artifacts
+
+CMD ["true"]

client/app/components.d.ts

@@ -13,7 +13,6 @@ declare module 'vue' {
     PrimeButton: typeof import('primevue/button')['default']
     PrimeButtonGroup: typeof import('primevue/buttongroup')['default']
     PrimeCard: typeof import('primevue/card')['default']
-    PrimeFieldset: typeof import('primevue/fieldset')['default']
     PrimeFloatLabel: typeof import('primevue/floatlabel')['default']
     PrimeInputText: typeof import('primevue/inputtext')['default']
     PrimeMenu: typeof import('primevue/menu')['default']

client/app/layouts/default.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="grid grid-cols-2 h-screen">
     <div class="flex flex-col shadow-xl shadow-surface-950 overflow-y-hidden">
-      <AppHeader title="Сиськи отвалились">
+      <AppHeader title="Шальные сиськи 18+">
         <template #right>
           <PrimeButtonGroup class="ml-auto">
             <PrimeButton

client/latest.json

@@ -1,11 +0,0 @@
-{
-  "pub_date": "2025-10-19T23:31:56Z",
-  "version": "0.2.4",
-  "platforms": {
-    "windows-x86_64": {
-      "url": "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/chad_0.2.4_x64-setup.exe",
-      "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVUMHdwTUN1SnhESjA5ekxpMGNPQURBSWVYekdEb3kxZ2tKVUNyMVRmcG9vckpsT1Fhcm9PTFp4ZVdDdEtvdWVDYWY0bkJBWjZOby9QNkNNWFJUT1VBY0tRZVNXUVl6eVEwPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzYwOTE2NzE1CWZpbGU6Y2hhZF8wLjIuNF94NjQtc2V0dXAuZXhlCitPYjR2QjNxNk9HdjV1WmdnUFFWRWxraDJzUFZrd1p2bGwrcEpaWjEzZExaQUJvWWNjL1VWWFZlVG4yR2hIeDFSNzJTRk1MMDVtdGo4NGE0ckp0bERBPT0K"
-    }
-  },
-  "notes": ""
-}

client/package.json

@@ -29,7 +29,7 @@
     "vue": "^3.5.22",
     "vue-router": "^4.5.1"
   },
-  "packageManager": "yarn@4.10.3",
+  "packageManager": "yarn@4.12.0",
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",
     "@primevue/nuxt-module": "^4.4.0",

client/scripts/generate-updater.mjs

@@ -0,0 +1,41 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+const TAURI_CONF = path.resolve(__dirname, '../src-tauri/tauri.conf.json')
+const OUTPUT = path.resolve(__dirname, '../updater.json')
+
+const PLATFORM = 'windows-x86_64'
+const BASE_URL = 'https://git.koptilnya.xyz/opti1337/chad/releases/download/latest'
+
+const tauriConfRaw = fs.readFileSync(TAURI_CONF, 'utf8')
+const tauriConf = JSON.parse(tauriConfRaw)
+const version = tauriConf.version
+
+const SIG_FILE = path.resolve(
+  __dirname,
+  `../src-tauri/target/x86_64-pc-windows-msvc/release/bundle/nsis/chad_${version}_x64-setup.exe.sig`,
+)
+
+const signature = fs.readFileSync(SIG_FILE, 'utf8').trim()
+
+const installerName = `chad_${version}_x64-setup.exe`
+
+const updater = {
+  pub_date: new Date().toISOString(),
+  version,
+  platforms: {
+    [PLATFORM]: {
+      url: `${BASE_URL}/${installerName}`,
+      signature,
+    },
+  },
+  notes: '',
+}
+
+fs.writeFileSync(OUTPUT, JSON.stringify(updater, null, 2), 'utf8')
+
+console.log('updater.json generated')

client/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "chad",
-  "version": "0.2.5-rc.2",
+  "version": "0.2.7",
   "identifier": "xyz.koptilnya.chad",
   "build": {
     "frontendDist": "../.output/public",
@@ -44,9 +44,9 @@
   },
   "plugins": {
     "updater": {
-      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDI3NDM5Q0I4MDI5M0MyRjQKUldUMHdwTUN1SnhESjBoUFpuWkJxRzFqcWJxdTY4UkNvMmUzcHFnZnJtbSs3WmJoUmhxQ3R5bWYK",
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEU3MzkxMzM3RkQ3NTg4QUQKUldTdGlIWDlOeE01NStIak9VbmZTTm9HY2NyNUQrVXB5ZEdIN1BkK2lhYW9zWkNCQnZQSjRmelIK",
       "endpoints": [
-        "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/latest.json"
+        "https://git.koptilnya.xyz/opti1337/chad/releases/download/latest/updater.json"
       ]
     }
   }

yarn.lock

@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-