wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-22 00:10:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into staging

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2024-12-05 22:49:31 +07:00
commit efc0e02676
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/src/client.ts
View File

@ -85,7 +85,7 @@ export interface ClientConnection extends Storage, FulltextStorage, BackupClient
isConnected: () => boolean
close: () => Promise<void>
onConnect?: (event: ClientConnectEvent) => Promise<void>
onConnect?: (event: ClientConnectEvent, data: any) => Promise<void>
// If hash is passed, will return LoadModelResponse
loadModel: (last: Timestamp, hash?: string) => Promise<Tx[] | LoadModelResponse>
@ -264,11 +264,11 @@ export async function createClient (
txHandler(...txBuffer)
txBuffer = undefined
const oldOnConnect: ((event: ClientConnectEvent) => Promise<void>) | undefined = conn.onConnect
conn.onConnect = async (event) => {
const oldOnConnect: ((event: ClientConnectEvent, data: any) => Promise<void>) | undefined = conn.onConnect
conn.onConnect = async (event, data) => {
console.log('Client: onConnect', event)
if (event === ClientConnectEvent.Maintenance) {
await oldOnConnect?.(ClientConnectEvent.Maintenance)
await oldOnConnect?.(ClientConnectEvent.Maintenance, data)
return
}
// Find all new transactions and apply
@ -282,7 +282,7 @@ export async function createClient (
model = new ModelDb(hierarchy)
await ctx.with('build-model', {}, (ctx) => buildModel(ctx, loadModelResponse, modelFilter, hierarchy, model))
await oldOnConnect?.(ClientConnectEvent.Upgraded)
await oldOnConnect?.(ClientConnectEvent.Upgraded, data)
// No need to fetch more stuff since upgrade was happened.
return
@ -290,7 +290,7 @@ export async function createClient (
if (event === ClientConnectEvent.Connected) {
// No need to do anything here since we connected.
await oldOnConnect?.(event)
await oldOnConnect?.(event, data)
return
}
@ -318,10 +318,10 @@ export async function createClient (
if (atxes.length < transactionThreshold && !needFullRefresh) {
console.log('applying input transactions', atxes.length)
txHandler(...atxes)
await oldOnConnect?.(ClientConnectEvent.Reconnected)
await oldOnConnect?.(ClientConnectEvent.Reconnected, data)
} else {
// We need to trigger full refresh on queries, etc.
await oldOnConnect?.(ClientConnectEvent.Refresh)
await oldOnConnect?.(ClientConnectEvent.Refresh, data)
}
}

8
plugins/client-resources/src/connection.ts
View File

@ -101,6 +101,8 @@ class Connection implements ClientConnection {
private helloRecieved: boolean = false
onConnect?: (event: ClientConnectEvent, data: any) => Promise<void>
rpcHandler = new RPCHandler()
constructor (
@ -130,6 +132,8 @@ class Connection implements ClientConnection {
this.sessionId = generateId()
}
this.onConnect = opt?.onConnect
this.scheduleOpen(this.ctx, false)
}
@ -261,7 +265,7 @@ class Connection implements ClientConnection {
if (resp.id === -1) {
this.delay = 0
if (resp.result?.state === 'upgrading') {
void this.opt?.onConnect?.(ClientConnectEvent.Maintenance, resp.result.stats)
void this.onConnect?.(ClientConnectEvent.Maintenance, resp.result.stats)
this.upgrading = true
this.delay = 3
return
@ -302,7 +306,7 @@ class Connection implements ClientConnection {
v.reconnect?.()
}
void this.opt?.onConnect?.(
void this.onConnect?.(
(resp as HelloResponse).reconnect === true ? ClientConnectEvent.Reconnected : ClientConnectEvent.Connected,
this.sessionId
)

4
plugins/client-resources/src/index.ts
View File

@ -118,14 +118,14 @@ export default async () => {
reject(new Error(`Connection timeout, and no connection established to ${endpoint}`))
}
}, connectTimeout)
newOpt.onConnect = (event) => {
newOpt.onConnect = async (event, data) => {
// Any event is fine, it means server is alive.
clearTimeout(connectTO)
resolve()
}
})
}
const clientConnection = connect(url, upgradeHandler, tokenPayload.workspace, tokenPayload.email, newOpt)
const clientConnection = connect(url, upgradeHandler, tokenPayload.workspace, tokenPayload.email, opt)
if (connectPromise !== undefined) {
await connectPromise
}

2
plugins/client/src/index.ts
View File

@ -62,7 +62,7 @@ export interface ClientFactoryOptions {
onUpgrade?: () => void
onUnauthorized?: () => void
onArchived?: () => void
onConnect?: (event: ClientConnectEvent, data: any) => void
onConnect?: (event: ClientConnectEvent, data: any) => Promise<void>
ctx?: MeasureContext
onDialTimeout?: () => void | Promise<void>
}

2
plugins/guest-resources/src/connect.ts
View File

@ -125,7 +125,7 @@ export async function connect (title: string): Promise<Client | undefined> {
})
},
// We need to refresh all active live queries and clear old queries.
onConnect: (event: ClientConnectEvent, data: any) => {
onConnect: async (event: ClientConnectEvent, data: any) => {
console.log('WorkbenchClient: onConnect', event)
try {
if (event === ClientConnectEvent.Connected) {

2
plugins/workbench-resources/src/connect.ts
View File

@ -212,7 +212,7 @@ export async function connect (title: string): Promise<Client | undefined> {
})
},
// We need to refresh all active live queries and clear old queries.
onConnect: (event: ClientConnectEvent, data: any) => {
onConnect: async (event: ClientConnectEvent, data: any): Promise<void> => {
console.log('WorkbenchClient: onConnect', event)
if (event === ClientConnectEvent.Maintenance) {
if (data != null && data.total !== 0) {

2
services/github/pod-github/src/client.ts
View File

@ -18,7 +18,7 @@ import config from './config'
export async function createPlatformClient (
workspace: string,
timeout: number,
reconnect?: (event: ClientConnectEvent) => void
reconnect?: (event: ClientConnectEvent, data: any) => Promise<void>
): Promise<Client> {
setMetadata(client.metadata.ClientSocketFactory, (url) => {
return new WebSocket(url, {

2
services/github/pod-github/src/worker.ts
View File

@ -1560,7 +1560,7 @@ export class GithubWorker implements IntegrationManager {
ctx.info('Connecting to', { workspace: workspace.workspaceUrl, workspaceId: workspace.workspaceName })
let client: Client | undefined
try {
client = await createPlatformClient(workspace.name, 30000, (event: ClientConnectEvent) => {
client = await createPlatformClient(workspace.name, 30000, async (event: ClientConnectEvent) => {
reconnect(workspace.name, event)
})