feat: add storage adapter for hulylake

Signed-off-by: Alexander Onnikov <[email protected]>

Author: aonnikov

common/config/rush/pnpm-lock.yaml

@@ -274,7 +274,7 @@
     "electron-updater": "^6.3.4",
     "livekit-client": "^2.15.6",
     "@hcengineering/server-backup": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.3",
     "ws": "^8.18.2"
   },
   "productName": "Huly Desktop",

desktop/package.json

@@ -1,4 +1,4 @@
-STORAGE_CONFIG="datalake|http://huly.local:4030"
+STORAGE_CONFIG="hulylake|http://huly.local:8096"
 MONGO_URL=mongodb://mongodb:27017?compressors=snappy
 DB_URL_PG=postgresql://postgres:example@postgres:5432
 BACKUP_STORAGE_CONFIG="minio|minio?accessKey=minioadmin&secretKey=minioadmin"

dev/.env

@@ -50,7 +50,7 @@
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/platform": "^0.7.3",
     "@hcengineering/server-core": "^0.7.0",
-    "@hcengineering/server-storage": "^0.7.0",
+    "@hcengineering/server-storage": "^0.7.1",
     "@hcengineering/server-token": "^0.7.0",
     "@hcengineering/server-tool": "^0.7.0",
     "@hcengineering/server-client": "^0.7.0",

dev/doc-import-tool/package.json

@@ -261,10 +261,11 @@ services:
       - SERVER_SECRET=secret
       - ACCOUNTS_URL=http://huly.local:3000
       - STATS_URL=http://huly.local:4900
-      - FILES_URL=http://huly.local:4030/blob/:workspace/:blobId/:filename
-      - UPLOAD_URL=http://huly.local:4030/upload/form-data/:workspace
+      # - FILES_URL=http://huly.local:4030/blob/:workspace/:blobId/:filename
+      - UPLOAD_URL=/files
+      # - UPLOAD_URL=http://huly.local:4030/upload/form-data/:workspace
       - PREVIEW_URL=http://huly.local:4040
-      - PREVIEW_CONFIG=image|http://huly.local:4030/image/fit=cover,width=:width,height=:height,dpr=:dpr/:workspace/:blobId;video|http://huly.local:4030/meta/:workspace/:blobId
+      # - PREVIEW_CONFIG=image|http://huly.local:4030/image/fit=cover,width=:width,height=:height,dpr=:dpr/:workspace/:blobId;video|http://huly.local:4030/meta/:workspace/:blobId
       - GMAIL_URL=http://huly.local:8093
       - CALENDAR_URL=http://huly.local:8095
       - TELEGRAM_URL=http://huly.local:8086

dev/docker-compose.yaml

@@ -12,6 +12,7 @@
   "PUBLIC_SCHEDULE_URL": "https://schedule.hc.engineering",
   "CALDAV_SERVER_URL": "https://caldav.hc.engineering",
   "BACKUP_URL": "https://front.hc.engineering/api/backup",
+  "HULYLAKE_URL": "https://lake.hc.engineering",
   "PULSE_URL": "wss://pulse.hc.engineering/ws",
   "COMMUNICATION_API_ENABLED": "true",
   "FILES_URL": "https://datalake.hc.engineering/blob/:workspace/:blobId/:filename"

dev/prod/public/config-dev.json

@@ -102,7 +102,7 @@
     "@hcengineering/server-collaboration-resources": "^0.7.0",
     "@hcengineering/server-backup": "^0.7.0",
     "@hcengineering/backup-service": "^0.7.0",
-    "@hcengineering/server-storage": "^0.7.0",
+    "@hcengineering/server-storage": "^0.7.1",
     "@hcengineering/server-calendar": "^0.7.0",
     "@hcengineering/server-calendar-resources": "^0.7.0",
     "@hcengineering/server-card": "^0.7.0",
@@ -182,7 +182,7 @@
     "@hcengineering/kafka": "^0.7.0",
     "@hcengineering/api-client": "^0.7.3",
     "@faker-js/faker": "^8.4.1",
-    "@hcengineering/hulylake-client": "^0.7.3",
-    "@hcengineering/communication-types": "^0.7.2"
+    "@hcengineering/hulylake-client": "^0.7.4",
+    "@hcengineering/communication-types": "^0.7.3"
   }
 }

dev/tool/package.json

@@ -12,7 +12,7 @@
 // limitations under the License.
 
 import { type Workspace } from '@hcengineering/account'
-import { type HulylakeClient, type JsonPatch } from '@hcengineering/hulylake-client'
+import { type HulylakeWorkspaceClient, type JsonPatch } from '@hcengineering/hulylake-client'
 import type postgres from 'postgres'
 import {
   generateUuid,
@@ -60,7 +60,7 @@ export async function migrateWorkspaceMessages (
   ws: Workspace,
   card: CardID | undefined,
   db: postgres.Sql,
-  hulylake: HulylakeClient,
+  hulylake: HulylakeWorkspaceClient,
   accountClient: AccountClient,
   personUuidBySocialId: Map<PersonId, PersonUuid>
 ): Promise<void> {
@@ -72,7 +72,7 @@ async function migrateMessages (
   ws: Workspace,
   card: CardID | undefined,
   db: postgres.Sql,
-  hulylake: HulylakeClient,
+  hulylake: HulylakeWorkspaceClient,
   accountClient: AccountClient,
   personUuidBySocialId: Map<PersonId, PersonUuid>
 ): Promise<void> {
@@ -105,7 +105,7 @@ async function migrateMessages (
 async function migrateMessagesBatch (
   ctx: MeasureContext,
   cardId: CardID,
-  hulylake: HulylakeClient,
+  hulylake: HulylakeWorkspaceClient,
   accountClient: AccountClient,
   personUuidBySocialId: Map<PersonId, PersonUuid>,
   messages: OldMessage[]
@@ -161,7 +161,11 @@ async function migrateMessagesBatch (
   }
 }
 
-async function getGroups (ctx: MeasureContext, hulylake: HulylakeClient, cardId: CardID): Promise<MessagesGroup[]> {
+async function getGroups (
+  ctx: MeasureContext,
+  hulylake: HulylakeWorkspaceClient,
+  cardId: CardID
+): Promise<MessagesGroup[]> {
   const res = await hulylake.getJson<MessagesGroupsDoc>(`${cardId}/messages/groups`, {
     maxRetries: 3,
     isRetryable: () => true,

dev/tool/src/communication.ts

@@ -56,7 +56,7 @@ import {
   type Account as OldAccount,
   type Workspace as OldWorkspace
 } from '@hcengineering/account-service'
-import { getClient as getHulylakeClient } from '@hcengineering/hulylake-client'
+import { getWorkspaceClient as getHulylakeClient } from '@hcengineering/hulylake-client'
 import {
   getDBClient,
   createPostgreeDestroyAdapter,

dev/tool/src/index.ts

@@ -37,7 +37,7 @@
     "@hcengineering/card": "^0.7.0",
     "@hcengineering/communication": "^0.7.0",
     "@hcengineering/communication-resources": "^0.7.0",
-    "@hcengineering/communication-types": "^0.7.2",
+    "@hcengineering/communication-types": "^0.7.3",
     "@hcengineering/contact": "^0.7.0",
     "@hcengineering/core": "^0.7.3",
     "@hcengineering/model": "^0.7.3",