Merge branch 'staging-new' of https://github.com/hcengineering/platform

Signed-off-by: Artem Savchenko <armisav@gmail.com>

Author: ArtyomSavchenko

.github/actions/set-package-versions/action.yml

@@ -0,0 +1,22 @@
+# Reusable action: set all @hcengineering package versions from a v tag ref
+# (e.g. refs/tags/v0.7.370 → 0.7.370) using common/scripts/bump.js.
+# Call only when github.ref is a v* tag (e.g. if: startsWith(github.ref, 'refs/tags/v')).
+name: 'Set package versions'
+description: 'Set all @hcengineering package versions from a v tag ref using bump.js'
+inputs:
+  ref:
+    description: 'Git ref for the tag (e.g. github.ref, e.g. refs/tags/v0.7.370)'
+    required: true
+outputs:
+  version:
+    description: 'Semver version derived from the tag (e.g. 0.7.370)'
+runs:
+  using: 'composite'
+  steps:
+    - id: bump
+      run: |
+        VERSION="${INPUT_REF#refs/tags/v}"
+        echo "version=$VERSION" >> $GITHUB_OUTPUT
+        echo "VERSION=$VERSION" >> $GITHUB_ENV
+        node common/scripts/bump.js "$VERSION"
+      shell: bash

.github/workflows/main.yml

@@ -2,6 +2,9 @@
 
 name: CI
 
+permissions:
+  contents: read
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -19,6 +22,16 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+    inputs:
+      ref:
+        description: 'Ref to run as (e.g. refs/tags/v0.7.370 to test release flow)'
+        required: false
+        default: 'refs/heads/develop'
+      skip_publish:
+        description: 'Skip all publishing (npm, Docker, R2) when testing release flow'
+        required: false
+        default: false
+        type: boolean
 
 env:
   CacheFolders: |
@@ -57,12 +70,18 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
+          ref: ${{ github.event.inputs.ref || github.ref }}
           fetch-depth: 0
           filter: tree:0
           submodules: recursive
       - uses: actions/setup-node@v6
         with:
           node-version-file: '.nvmrc'
+      - name: Set package versions
+        if: startsWith(github.event.inputs.ref || github.ref, 'refs/tags/v')
+        uses: ./.github/actions/set-package-versions
+        with:
+          ref: ${{ github.event.inputs.ref || github.ref }}
       - name: Cache node modules
         uses: actions/cache@v5
         env:
@@ -74,6 +93,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pnpm-lock.yaml') }}
 
+      - name: Installing...
+        run: |
+          REF="${{ github.event.inputs.ref || github.ref }}"
+          if [[ "$REF" == refs/tags/v* ]]; then
+            node common/scripts/install-run-rush.js update
+          else
+            node common/scripts/install-run-rush.js install
+          fi
+
       # - name: Cheking model is updated...
       #   run: node common/scripts/check_model_version.js
 
@@ -83,9 +111,6 @@ jobs:
       - name: Checking for mis-matching transitive dependencies...
         run: node common/scripts/check-versions.js
 
-      - name: Installing...
-        run: node common/scripts/install-run-rush.js install
-
       - name: Model version from git tags
         run: node common/scripts/install-run-rush.js model-version
 
@@ -698,12 +723,12 @@ jobs:
       #   if: ${{ github.ref == 'refs/heads/main' }}
       #   run: node common/scripts/install-run-rush.js docker:staging -v
       - name: Docker push tag
-        if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/s') }}
+        if: ${{ (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/s')) && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_publish != 'true') }}
         run: |
           echo Pushing release of tag ${{ github.ref }}
           node common/scripts/install-run-rush.js docker:push -v
       - name: Docker push love-agent
-        if: ${{ startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/s') }}
+        if: ${{ (startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/s')) && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_publish != 'true') }}
         run: |
           echo Pushing love-agent release of tag ${{ github.ref }}
           cd ./services/ai-bot/love-agent
@@ -782,6 +807,7 @@ jobs:
           node ../common/scripts/install-run-rushx.js dist-signed --macos --x64 --arm64
           ./scripts/copy-publish-artifacts.sh ${{ env.PublishTempFolder}}
       - name: Publish distribution assets and version
+        if: github.event_name != 'workflow_dispatch' || github.event.inputs.skip_publish != 'true'
         uses: ryand56/r2-upload-action@latest
         with:
           r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
@@ -884,6 +910,7 @@ jobs:
           node ../common/scripts/install-run-rushx.js dist-signed --macos --x64 --arm64
           ./scripts/copy-publish-artifacts.sh ${{ env.PublishTempFolder}}
       - name: Publish distribution assets and version
+        if: github.event_name != 'workflow_dispatch' || github.event.inputs.skip_publish != 'true'
         uses: ryand56/r2-upload-action@latest
         with:
           r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
@@ -912,3 +939,34 @@ jobs:
         with:
           name: TraceX-Linux
           path: ./qms-desktop-package/deploy/TraceX-linux-*.zip
+
+  publish-npm:
+    if: startsWith(github.event.inputs.ref || github.ref, 'refs/tags/v') && (github.event_name != 'workflow_dispatch' || github.event.inputs.skip_publish != 'true')
+    needs: build
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event.inputs.ref || github.ref }}
+          fetch-depth: 0
+      - uses: actions/setup-node@v6
+        with:
+          node-version-file: '.nvmrc'
+      - name: Cache node modules
+        uses: actions/cache@v5
+        env:
+          cache-name: cache-node-platform
+        with:
+          path: common/temp
+          key: ${{ runner.os }}-build-cache-node-platform-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: ${{ runner.os }}-build-cache-node-platform-
+      - name: Installing...
+        run: node common/scripts/install-run-rush.js install
+      - name: Publish to npm
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          REF="${{ github.event.inputs.ref || github.ref }}"
+          VERSION="${REF#refs/tags/v}"
+          node common/scripts/bump.js "$VERSION" --publish

common/scripts/bump.js

@@ -1,35 +1,51 @@
 const fs = require('fs')
+const path = require('path')
 const execSync = require('child_process').execSync
 const repo = '@hcengineering'
 
 const packages = {}
 const pathes = {}
 const jsons = {}
+const repoRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf-8' }).trim()
 
 function fillPackages (config) {
-  for (const package of config.projects) {
-    if (!package.name.startsWith(repo)) continue
+  for (const project of config.projects) {
+    const packageName = project.name ?? project.packageName
+    if (typeof packageName !== 'string' || !packageName.startsWith(repo)) continue
+    const projectPath = project.path ?? project.projectFolder ?? path.relative(repoRoot, project.fullPath ?? '')
+    if (typeof projectPath !== 'string' || projectPath.length === 0) continue
+    const fullProjectPath = path.resolve(repoRoot, projectPath)
+
+    packages[packageName] = {
+      version: project.version,
+      path: fullProjectPath
+    }
+    pathes[fullProjectPath] = packageName
 
-    packages[package.name] = {
-      version: package.version,
-      path: package.path
+    const file = path.join(fullProjectPath, 'package.json')
+    if (!fs.existsSync(file)) {
+      console.log('skip, package.json not found:', file)
+      continue
     }
-    pathes[package.path] = package.name
 
-   const file = package.path + '/package.json'
-   const raw = fs.readFileSync(file)
-   jsons[package.name] = JSON.parse(raw)
+    const raw = fs.readFileSync(file)
+    jsons[packageName] = JSON.parse(raw)
   }
 }
 
 function bumpPackage (name, newVersion) {
   const json = jsons[name]
 
+  if (json === undefined) return
   json.version = newVersion
-  if (typeof json.dependencies === 'object') {
-    for (const [dependency] of Object.entries(json.dependencies)) {
+  const depTypes = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies']
+  for (const depType of depTypes) {
+    if (typeof json[depType] !== 'object') continue
+    for (const [dependency, currentVersion] of Object.entries(json[depType])) {
       if (packages[dependency] !== undefined) {
-        json.dependencies[dependency] = `^${newVersion}`
+        json[depType][dependency] = String(currentVersion).startsWith('workspace:')
+          ? `workspace:^${newVersion}`
+          : `^${newVersion}`
       }
     }
   }
@@ -44,7 +60,7 @@ function publish (name) {
   const package = packages[name]
   try {
     console.log('publishing', name)
-    execSync(`cd ${package.path} && npm publish && cd ../..`, { encoding: 'utf-8' })
+    execSync('npm publish', { encoding: 'utf-8', cwd: package.path })
   } catch (err) {
     console.log(err)
   }
@@ -54,7 +70,7 @@ function fix (name) {
   const package = packages[name]
   try {
     console.log('fixing', name)
-    execSync(`cd ${package.path} && npm pkg fix && cd ../..`, { encoding: 'utf-8' })
+    execSync('npm pkg fix', { encoding: 'utf-8', cwd: package.path })
   } catch (err) {
     console.log(err)
   }
@@ -78,7 +94,20 @@ function main () {
 
   console.log('bump version ...', version)
 
-  const config = JSON.parse(execSync('rush list -p --json', { encoding: 'utf-8' }))
+  const output = execSync('node common/scripts/install-run-rush.js list -p --json', { encoding: 'utf-8', cwd: repoRoot })
+  const lines = output.split('\n')
+  let jsonStart = -1
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].trim().startsWith('{')) {
+      jsonStart = i
+      break
+    }
+  }
+  if (jsonStart === -1) {
+    console.error('Could not find JSON output from rush list')
+    process.exit(1)
+  }
+  const config = JSON.parse(lines.slice(jsonStart).join('\n'))
 
   fillPackages(config)
 
@@ -89,7 +118,8 @@ function main () {
 
   for (const packageName of packageNames) {
     const package = packages[packageName]
-    const file = package.path + '/package.json'
+    if (jsons[packageName] === undefined) continue
+    const file = path.join(package.path, 'package.json')
     const res = JSON.stringify(jsons[packageName], undefined, 2)
     fs.writeFileSync(file, res + '\n')
   }

foundations/hulypulse/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "hulypulse"
-version = "0.4.0"
+version = "0.4.1"
 edition = "2024"
 
 [dependencies]
@@ -30,7 +30,7 @@ hulyrs = { git = "https://github.com/hcengineering/hulyrs.git", features = [ "ac
 secrecy = { version = "0.10.3", optional = true }
 
 #redis
-redis = { version = "=0.32.5", features = ["aio", "tokio-comp", "sentinel"], optional = true }
+redis = { version = "=0.32.5", features = ["aio", "tokio-comp", "sentinel"] }
 
 [[bin]]
 name = "hulypulse"
@@ -43,7 +43,6 @@ tokio-tungstenite = { version = "0.21", default-features = false, features = [
 ] }
 
 [features]
-default = ["db-redis","auth"] # lopt
+default = ["auth"] # lopt
 auth = ["regorus", "uuid", "hulyrs", "secrecy"]
 lopt = []
-db-redis = ["redis"]

foundations/hulypulse/Cargo.toml

@@ -190,15 +190,14 @@ Size of data is limited to some reasonable size
     - `{"message":"Del","key":"00000000-0000-0000-0000-000000000001/foo/bar"}`
 
 ## Special options in config/default.toml
-    - ```memory_mode = true``` Use native memory storage instead Redis
+    - ```backend = "memory"``` Use native memory storage instead Redis
     - ```max_size = 100``` Max value size in bytes
 
 ## Special cargo build options
-    - "db-redis" (default) - use Redis (Memory instead)
     - "auth" (default) - use huly-authorization
-    Disable both:
+    Disable auth:
         cargo build --no-default-features
-    Enable one:
+    Enable auth:
         cargo build --no-default-features --features "auth"
 
 ## Running
@@ -207,7 +206,17 @@ Pre-build docker images is available at: hardcoreeng/service_hulypulse:{tag}.
 
 You can use the following command to run the image locally:
 ```bash
-docker run -p 8095:8095 -it --rm hardcoreeng/service_hulypulse:{tag}"
+docker run -p 8095:8095 -it --rm hardcoreeng/service_hulypulse:{tag}
+```
+
+Run from source using Redis:
+```bash
+HULY_REDIS_URLS=redis://huly.local:6379 cargo run
+```
+
+Run from source in in-memory mode:
+```bash
+HULY_BACKEND=memory cargo run
 ```
 
 If you want to run the service as a part of local huly development environment use the following command:
@@ -228,6 +237,7 @@ The following environment variables are used to configure hulypulse:
    - ```HULY_BIND_HOST```: host to bind the server to (default: 0.0.0.0)
    - ```HULY_BIND_PORT```: port to bind the server to (default: 8094)
    - ```HULY_TOKEN_SECRET```: secret used to sign JWT tokens (default: secret)
+   - ```HULY_BACKEND```: storage backend "redis" or "memory" (default: "redis")
    - ```HULY_REDIS_URLS```: redis connection string (default: redis://huly.local:6379)
    - ```HULY_REDIS_PASSWORD```: redis password (default: "<invalid>")
    - ```HULY_REDIS_MODE```: redis mode "direct" or "sentinel" (default: "direct")