Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: get rid of cyclic dep between patch-db and api service

Browse Source 
Signed-off-by: waterplea <alexander@inkin.ru>
This commit is contained in:
waterplea
2024-06-21 15:51:04 +05:00
parent 07104b18f5
commit e6abf4e33b
6 changed files with 70 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
web/projects/ui/src/app/services/api/embassy-live-api.service.ts
View File

@@ -7,6 +7,7 @@ import {
RpcError,
RPCOptions,
} from '@start9labs/shared'
import { PATCH_CACHE } from 'src/app/services/patch-db/patch-db-source'
import { ApiService } from './embassy-api.service'
import { RR } from './api.types'
import { parsePropertiesPermissive } from 'src/app/util/properties.util'
@@ -16,7 +17,7 @@ import { Observable, filter, firstValueFrom } from 'rxjs'
import { AuthService } from '../auth.service'
import { DOCUMENT } from '@angular/common'
import { DataModel } from '../patch-db/data-model'
import { PatchDB, pathFromArray } from 'patch-db-client'
import { Dump, pathFromArray } from 'patch-db-client'
@Injectable()
export class LiveApiService extends ApiService {
@@ -25,7 +26,7 @@ export class LiveApiService extends ApiService {
private readonly http: HttpService,
private readonly config: ConfigService,
private readonly auth: AuthService,
private readonly patch: PatchDB<DataModel>,
@Inject(PATCH_CACHE) private readonly cache$: Observable<Dump<DataModel>>,
) {
super()
; (window as any).rpcClient = this
@@ -482,7 +483,7 @@ export class LiveApiService extends ApiService {
const patchSequence = res.headers.get('x-patch-sequence')
if (patchSequence)
await firstValueFrom(
this.patch.cache$.pipe(filter(({ id }) => id >= Number(patchSequence))),
this.cache$.pipe(filter(({ id }) => id >= Number(patchSequence))),
)
return body.result