Merge branch 'staging'

Signed-off-by: Andrey Sobolev <[email protected]>

Author: haiodo

.github/workflows/baseimage.yaml

@@ -0,0 +1,67 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Docker base image
+
+concurrency:
+  group: 'service-base'
+  cancel-in-progress: true
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version tag for the images'
+        required: false
+        default: 'latest'
+        type: string
+
+jobs:
+  docker-build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Configure docker
+        uses: crazy-max/ghaction-setup-docker@v3
+        with:
+          daemon-config: |
+            {
+              "features": {
+                "containerd-snapshotter": true
+              }
+            }
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          filter: tree:0
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+      - uses: pnpm/action-setup@v4
+        with:
+          version: latest
+      - name: Docker build
+        run: |
+          cd ./dev/base-image
+          ./build.sh
+        env:
+          DOCKER_CLI_HINTS: false
+          DOCKER_EXTRA: --platform=linux/amd64,linux/arm64
+          VERSION: ${{ inputs.version }}
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: hardcoreeng
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      - name: Publish base image
+        env:
+          DOCKER_CLI_HINTS: false
+          DOCKER_EXTRA: --platform=linux/amd64,linux/arm64
+          VERSION: ${{ inputs.version }}
+        run: |
+          echo Pushing base image
+          cd ./dev/base-image
+          ./push.sh
+

.github/workflows/main.yml

@@ -628,7 +628,7 @@ jobs:
           node ../common/scripts/install-run-rushx.js dist --linux --windows --x64
           node ../common/scripts/install-run-rushx.js dist-signed --macos --x64 --arm64
           ./scripts/copy-publish-artifacts.sh ${{ env.PublishTempFolder}}
-      - name: Publish distribution assets
+      - name: Publish distribution assets and version
         uses: ryand56/r2-upload-action@latest
         with:
           r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
@@ -637,29 +637,23 @@ jobs:
           r2-bucket: desktop-distro
           source-dir: desktop-package/${{ env.PublishTempFolder}}
           destination-dir: ./
-      - name: Publish distribution version
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
-        run: |
-          ./desktop-package/scripts/publish-version.sh
       - name: Upload MacOS
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Huly-MacOS-x64
           path: ./desktop-package/deploy/Huly-macos-*-x64.dmg
       - name: Upload MacOS arm64
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Huly-MacOS-arm64
           path: ./desktop-package/deploy/Huly-macos-*-arm64.dmg
       - name: Upload Windows
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Huly-Windows
           path: ./desktop-package/deploy/Huly-windows-*.zip
       - name: Upload Linux
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Huly-Linux
           path: ./desktop-package/deploy/Huly-linux-*.zip

.gitignore

@@ -107,3 +107,5 @@ dump
 **/logs/**
 dev/tool/history.json
 .aider*
+/combined_dependencies
+.tmp

.nvmrc

@@ -1 +1 @@
-v20.13
+v22

.vscode/launch.json

@@ -40,6 +40,7 @@
         // "DB_URL": "mongodb://localhost:27017",
         // "DB_URL": "postgresql://postgres:example@localhost:5432",
         "DB_URL": "postgresql://[email protected]:26257/defaultdb?sslmode=disable",
+        "GREEN_URL": "http://host.docker.internal:6767?token=secret",
         "SERVER_PORT": "3332",
         "APM_SERVER_URL2": "http://localhost:8200",
         "METRICS_CONSOLE": "false",
@@ -54,7 +55,7 @@
         "MODEL_JSON": "${workspaceRoot}/models/all/bundle/model.json",
         // "SERVER_PROVIDER":"uweb"
         "SERVER_PROVIDER":"ws",
-        "MODEL_VERSION": "0.6.382",
+        "MODEL_VERSION": "0.6.421",
         // "VERSION": "0.6.289",
         "ELASTIC_INDEX_NAME": "local_storage_index",
         "UPLOAD_URL": "/files",
@@ -165,7 +166,7 @@
         "MINIO_ACCESS_KEY": "minioadmin",
         "MINIO_SECRET_KEY": "minioadmin",
         "MINIO_ENDPOINT": "localhost",
-        "MODEL_VERSION": "v0.6.382",
+        "MODEL_VERSION": "v0.6.421",
         "WS_OPERATION": "all+backup",
         "BACKUP_STORAGE": "minio|minio?accessKey=minioadmin&secretKey=minioadmin",
         "BACKUP_BUCKET": "dev-backups",
@@ -188,6 +189,7 @@
         // "DB_URL": "mongodb://localhost:27017",
         // "DB_URL": "postgresql://postgres:example@localhost:5432",
         "DB_URL": "postgresql://[email protected]:26257/defaultdb?sslmode=disable",
+        "FULLTEXT_URL": "http://host.docker.internal:4702",
         "REGION": "cockroach",
         "SERVER_SECRET": "secret",
         "TRANSACTOR_URL": "ws://localhost:3332",
@@ -197,7 +199,7 @@
         "MINIO_ACCESS_KEY": "minioadmin",
         "MINIO_SECRET_KEY": "minioadmin",
         "MINIO_ENDPOINT": "localhost",
-        "MODEL_VERSION": "v0.6.382",
+        "MODEL_VERSION": "0.6.421",
         "WS_OPERATION": "all+backup",
         "BACKUP_STORAGE": "minio|minio?accessKey=minioadmin&secretKey=minioadmin",
         "BACKUP_BUCKET": "dev-backups",
@@ -255,6 +257,7 @@
         "MINIO_SECRET_KEY": "minioadmin",
         "MINIO_ENDPOINT": "localhost"
       },
+      "runtimeVersion": "20",
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "sourceMaps": true,
       "cwd": "${workspaceRoot}/pods/collaborator",
@@ -325,7 +328,7 @@
         "ACCOUNTS_URL": "http://localhost:3000",
         "TELEGRAM_DATABASE": "telegram-service",
         "REKONI_URL": "http://localhost:4004",
-        "MODEL_VERSION": "0.6.382"
+        "MODEL_VERSION": "0.6.421"
       },
       "runtimeVersion": "20",
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
@@ -352,7 +355,7 @@
         "MONGO_URL": "mongodb://localhost:27017",
         "TELEGRAM_DATABASE": "telegram-service",
         "REKONI_URL": "http://localhost:4004",
-        "MODEL_VERSION": "0.6.382"
+        "MODEL_VERSION": "0.6.421"
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "sourceMaps": true,
@@ -394,9 +397,9 @@
         "DB_URL": "mongodb://localhost:27017",
         "MODEL_JSON": "${workspaceRoot}/models/all/bundle/model.json",
         "SECRET": "secret",
-        "REGION": "pg",
+        "REGION": "cockroach",
         "BUCKET_NAME":"backups",
-        "INTERVAL":"30"
+        "INTERVAL":"43200"
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "showAsyncStacks": true,
@@ -453,6 +456,7 @@
       "sourceMaps": true,
       "cwd": "${workspaceRoot}/services/github/pod-github",
       "protocol": "inspector",
+      "attachSimplePort": 0,
       "outputCapture": "std"
     },
     {
@@ -589,6 +593,7 @@
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "sourceMaps": true,
+      "runtimeVersion": "20",
       "cwd": "${workspaceRoot}/services/ai-bot/pod-ai-bot",
       "protocol": "inspector",
       "outputCapture": "std"

README.md

@@ -233,5 +233,5 @@ node ./common/scripts/bump.js -p projectName
 
 This project is tested with BrowserStack.
 
-<sub><sup>&copy; 2024 <a href="https://hardcoreeng.com">Hardcore Engineering Inc</a>.</sup></sub>
+<sub><sup>&copy; 2025 <a href="https://hardcoreeng.com">Hardcore Engineering Inc</a>.</sup></sub>
 

common/config/rush/command-line.json

@@ -202,7 +202,7 @@
       "name": "docker:build",
       "phases": ["_phase:build", "_phase:bundle", "_phase:package", "_phase:docker-build"],
       "enableParallelism": true,
-      "incremental": true
+      "incremental": true      
     },
     {
       "summary": "docker:rebuild",
@@ -238,7 +238,7 @@
       "summary": "Build docker with platform",
       "description": "use to build all docker containers required for platform",
       "safeForSimultaneousRushProcesses": true,
-      "shellCommand": "rush docker:build -p 20 --to @hcengineering/pod-server --to @hcengineering/pod-front --to @hcengineering/prod --to @hcengineering/pod-account --to @hcengineering/pod-workspace --to @hcengineering/pod-collaborator --to @hcengineering/tool --to @hcengineering/pod-print --to @hcengineering/pod-sign --to @hcengineering/pod-analytics-collector --to @hcengineering/rekoni-service --to @hcengineering/pod-ai-bot --to @hcengineering/import-tool --to @hcengineering/pod-stats --to @hcengineering/pod-fulltext --to @hcengineering/pod-love"
+      "shellCommand": "rush docker:build -p 20 --to @hcengineering/pod-server --to @hcengineering/pod-front --to @hcengineering/prod --to @hcengineering/pod-account --to @hcengineering/pod-workspace --to @hcengineering/pod-collaborator --to @hcengineering/tool --to @hcengineering/pod-print --to @hcengineering/pod-sign --to @hcengineering/pod-analytics-collector --to @hcengineering/rekoni-service --to @hcengineering/pod-ai-bot --to @hcengineering/import-tool --to @hcengineering/pod-stats --to @hcengineering/pod-fulltext --to @hcengineering/pod-love --to @hcengineering/green"
     },
     {
       "commandKind": "global",