UBERF-9367: Use domain hash (#7897)

Signed-off-by: Andrey Sobolev <[email protected]>
hcengineering · Feb 4, 2025 · 8a62327 · 8a62327
1 parent 98330cf
commit 8a62327
Show file tree

Hide file tree

Showing 20 changed files with 211 additions and 78 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -294,7 +294,7 @@
       "name": "Debug backup tool",
       "type": "node",
       "request": "launch",
-      "args": ["src/__start.ts", "backup-restore", "../../../hardware/dump/alex-staff-agency", "w-haiodo-alex-staff-c-673ee7ab-87df5406ea-2b8b4d", "--skip", "blob"],
+      "args": ["src/__start.ts", "backup", "../../../hardware/dump/githubcr", "w-haiodo-githubcr-67403799-de2a46aa46-beb3b2"],
       "env": {
         "MINIO_ACCESS_KEY": "minioadmin",
         "MINIO_SECRET_KEY": "minioadmin",
@@ -304,12 +304,14 @@
         "ACCOUNTS_URL": "http://localhost:3000",
         "TELEGRAM_DATABASE": "telegram-service"
       },
+      "smartStep": true,
+      "sourceMapRenames": true,
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "sourceMaps": true,
       "cwd": "${workspaceRoot}/dev/tool",
       "protocol": "inspector",
       "outputCapture": "std",
-      "runtimeVersion": "20",
+      "runtimeVersion": "22",
       "showAsyncStacks": true
     },
     {
@@ -399,7 +401,7 @@
         "SECRET": "secret",
         "REGION": "cockroach",
         "BUCKET_NAME":"backups",
-        "INTERVAL":"43200"
+        "INTERVAL":"0"
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "showAsyncStacks": true,

diff --git a/packages/core/src/__tests__/client.test.ts b/packages/core/src/__tests__/client.test.ts
@@ -24,7 +24,7 @@ import { ModelDb, TxDb } from '../memdb'
 import { TxOperations } from '../operations'
 import type { DocumentQuery, FindResult, SearchOptions, SearchQuery, SearchResult, TxResult } from '../storage'
 import { Tx, TxFactory, TxProcessor } from '../tx'
-import { fillConfiguration, pluginFilterTx } from '../utils'
+import { fillConfiguration, generateId, pluginFilterTx } from '../utils'
 import { connect } from './connection'
 import { genMinModel } from './minmodel'
 
@@ -142,6 +142,10 @@ describe('client', () => {
           finished: true
         })
 
+        async getDomainHash (domain: Domain): Promise<string> {
+          return generateId()
+        }
+
         async closeChunk (idx: number): Promise<void> {}
         async loadDocs (domain: Domain, docs: Ref<Doc>[]): Promise<Doc[]> {
           return []

diff --git a/packages/core/src/__tests__/connection.ts b/packages/core/src/__tests__/connection.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { ClientConnectEvent, DocChunk } from '..'
+import { ClientConnectEvent, DocChunk, generateId } from '..'
 import type { Account, Class, Doc, Domain, Ref, Timestamp } from '../classes'
 import { ClientConnection } from '../client'
 import core from '../component'
@@ -82,6 +82,10 @@ export async function connect (handler: (tx: Tx) => void): Promise<ClientConnect
       }
     }
 
+    async getDomainHash (domain: Domain): Promise<string> {
+      return generateId()
+    }
+
     async closeChunk (idx: number): Promise<void> {}
     async loadDocs (domain: Domain, docs: Ref<Doc>[]): Promise<Doc[]> {
       return []

diff --git a/packages/core/src/backup.ts b/packages/core/src/backup.ts
@@ -26,5 +26,7 @@ export interface BackupClient {
   upload: (domain: Domain, docs: Doc[]) => Promise<void>
   clean: (domain: Domain, docs: Ref<Doc>[]) => Promise<void>
 
+  getDomainHash: (domain: Domain) => Promise<string>
+
   sendForceClose: () => Promise<void>
 }
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
@@ -182,6 +182,10 @@ class ClientImpl implements AccountClient, BackupClient {
     return await this.conn.loadChunk(domain, idx)
   }
 
+  async getDomainHash (domain: Domain): Promise<string> {
+    return await this.conn.getDomainHash(domain)
+  }
+
   async closeChunk (idx: number): Promise<void> {
     await this.conn.closeChunk(idx)
   }

diff --git a/packages/core/src/server.ts b/packages/core/src/server.ts
@@ -102,6 +102,8 @@ export interface LowLevelStorage {
     query: DocumentQuery<T>,
     options?: Pick<FindOptions<T>, 'sort' | 'limit' | 'projection'>
   ) => Promise<Iterator<T>>
+
+  getDomainHash: (ctx: MeasureContext, domain: Domain) => Promise<string>
 }
 
 export interface Iterator<T extends Doc> {

diff --git a/packages/query/src/__tests__/connection.ts b/packages/query/src/__tests__/connection.ts
@@ -28,6 +28,7 @@ import core, {
   FindOptions,
   FindResult,
   FulltextStorage,
+  generateId,
   Hierarchy,
   LoadModelResponse,
   ModelDb,
@@ -126,6 +127,10 @@ FulltextStorage & {
       }
     }
 
+    async getDomainHash (domain: Domain): Promise<string> {
+      return generateId()
+    }
+
     async loadModel (lastTxTime: Timestamp): Promise<Tx[]> {
       return txes
     }

diff --git a/plugins/client-resources/src/connection.ts b/plugins/client-resources/src/connection.ts
@@ -802,6 +802,10 @@ class Connection implements ClientConnection {
     return this.sendRequest({ method: 'loadChunk', params: [domain, idx] })
   }
 
+  async getDomainHash (domain: Domain): Promise<string> {
+    return await this.sendRequest({ method: 'getDomainHash', params: [domain] })
+  }
+
   closeChunk (idx: number): Promise<void> {
     return this.sendRequest({ method: 'closeChunk', params: [idx] })
   }