nanakura/moeka-project
1
0
Fork 0
Code Issues Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix(server-sdk): reconnect implemented

Browse Source
This commit is contained in:
Neko Ayaka
2025-03-21 11:42:39 +08:00
parent 900f72267b
commit f96cb55417
4 changed files with 165 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/stage-web/src/pages/settings/memory/index.vue
+9
View File
@@ -1,9 +1,18 @@
<script setup lang="ts">
// import { useServerStore } from '@proj-airi/stage-ui/stores'
// import { storeToRefs } from 'pinia'
// import { onMounted } from 'vue'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
const router = useRouter()
const { t } = useI18n()
// const { server } = storeToRefs(useServerStore())
// onMounted(() => {
// server.value?.connect()
// })
</script>
<template>
packages/memory-pgvector/src/index.ts
+10 -1
View File
@@ -1,3 +1,4 @@
import process from 'node:process'
import { Format, LogLevel, setGlobalFormat, setGlobalLogLevel } from '@guiiai/logg'
import { Client } from '@proj-airi/server-sdk'
import { runUntilSignal } from '@proj-airi/server-sdk/utils/node'
@@ -6,9 +7,17 @@ setGlobalFormat(Format.Pretty)
setGlobalLogLevel(LogLevel.Log)
async function main() {
const _client = new Client<{ connectionString: string }>({ name: 'memory-pgvector' })
const client = new Client<{ connectionString: string }>({
name: 'memory-pgvector',
})
client.onEvent('module:configure', (_event) => {
})
runUntilSignal()
process.on('SIGINT', () => client.close())
process.on('SIGTERM', () => client.close())
}
main()
packages/server-runtime/src/index.ts
+26 -9
View File
@@ -9,7 +9,7 @@ import { createApp, createRouter, defineWebSocketHandler } from 'h3'
setGlobalFormat(Format.Pretty)
setGlobalLogLevel(LogLevel.Log)
function send(peer: Peer, event: WebSocketEvent) {
function send(peer: Peer, event: WebSocketEvent<Record<string, unknown>>) {
peer.send(JSON.stringify(event))
}
@@ -58,20 +58,37 @@ function main() {
peers.set(peer.id, { peer, authenticated: true, name: event.data.name })
return
case 'ui:configure':
peers.forEach((p) => {
if (event.data.moduleName === '') {
send(peer, { type: 'error', data: { message: 'the field \'moduleName\' can\'t be empty for event \'ui:configure\'' } })
return
}
if (typeof event.data.moduleIndex !== 'undefined' && typeof event.data.moduleIndex !== 'number') {
send(peer, { type: 'error', data: { message: 'the field \'moduleIndex\' must be a number for event \'ui:configure\'' } })
return
}
if (typeof event.data.moduleIndex !== 'undefined' && event.data.moduleIndex < 0) {
send(peer, { type: 'error', data: { message: 'the field \'moduleIndex\' must be a positive number for event \'ui:configure\'' } })
return
}
for (const [_id, p] of peers.entries()) {
if (p.name === '') {
return
continue
}
if ((typeof p.index !== 'undefined' && typeof event.data.moduleIndex !== 'undefined' && p.name === event.data.moduleName && p.index === event.data.moduleIndex)) {
return
}
if (p.name !== event.data.moduleName) {
if (p.name === event.data.moduleName) {
if ((typeof p.index !== 'undefined' && typeof event.data.moduleIndex !== 'undefined' && p.index === event.data.moduleIndex)) {
send(p.peer, { type: 'module:configure', data: { config: event.data.config } })
return
}
send(p.peer, { type: 'module:configure', data: { config: event.data.config } })
return
}
p.peer.send(JSON.stringify({ type: 'module:configure', data: { config: event.data.config } } as WebSocketEvent))
})
continue
}
send(peer, { type: 'error', data: { message: 'module not found, it haven\'t announced it or the name was wrong' } })
return
}
if (!peers.get(peer.id)?.authenticated) {
packages/server-sdk/src/client.ts
+120 -44
View File
@@ -22,7 +22,8 @@ export class Client<C = undefined> {
private websocket: WebSocket
private eventListeners: Map<keyof WebSocketEvents, Array<(data: WebSocketBaseEvent<keyof WebSocketEvents<C>, WebSocketEvents<C>[keyof WebSocketEvents<C>]>) => void | Promise<void>>> = new Map()
private authenticateAttempts = 0
private reconnectAttempts = 0
private shouldClose = false
constructor(options: ClientOptions<C>) {
this.opts = defu<Required<ClientOptions<C>>, Required<Omit<ClientOptions<C>, 'name' | 'token'>>[]>(
@@ -38,53 +39,113 @@ export class Client<C = undefined> {
)
if (this.opts.autoConnect) {
this.connect()
try {
this.connect()
}
catch (err) {
console.error(err)
}
}
}
connect() {
if (this.connected)
async retryWithExponentialBackoff(fn: () => void | Promise<void>, attempts = 0, maxAttempts = -1) {
if (maxAttempts !== -1 && attempts >= maxAttempts) {
console.error(`Maximum retry attempts (${maxAttempts}) reached`)
return
}
this.websocket = new WebSocket(this.opts.url)
try {
await fn()
}
catch (err) {
console.error('Encountered an error when retrying', err)
await sleep(2 ** attempts * 1000)
await this.retryWithExponentialBackoff(fn, attempts++, maxAttempts)
}
}
this.onEvent('module:authenticated', async (event) => {
const auth = event.data.authenticated
if (!auth) {
this.authenticateAttempts++
await sleep(2 ** this.authenticateAttempts * 1000)
this.tryAuthenticate()
async tryReconnectWithExponentialBackoff() {
await this.retryWithExponentialBackoff(() => this._connect(), this.reconnectAttempts)
}
private _connect() {
return new Promise<void>((resolve, reject) => {
if (this.shouldClose) {
resolve()
return
}
else {
this.tryAnnounce()
if (this.connected) {
resolve()
return
}
this.websocket = new WebSocket(this.opts.url)
this.onEvent('module:authenticated', async (event) => {
const auth = event.data.authenticated
if (!auth) {
this.retryWithExponentialBackoff(() => this.tryAuthenticate())
}
else {
this.tryAnnounce()
}
})
this.websocket.onerror = (event) => {
this.opts.onError?.(event)
if ('error' in event && event.error instanceof Error) {
if (event.error.message === 'Received network error or non-101 status code.') {
this.connected = false
if (!this.opts.autoReconnect) {
this.opts.onError?.(event)
this.opts.onClose?.()
reject(event.error)
return
}
reject(event.error)
}
}
}
this.websocket.onclose = () => {
this.opts.onClose?.()
this.connected = false
if (!this.opts.autoReconnect) {
this.opts.onClose?.()
}
else {
this.tryReconnectWithExponentialBackoff()
}
}
this.websocket.onmessage = (event) => {
this.handleMessage(event)
}
this.websocket.onopen = () => {
this.reconnectAttempts = 0
if (this.opts.token) {
this.tryAuthenticate()
}
else {
this.tryAnnounce()
}
this.connected = true
resolve()
}
})
}
this.websocket.onerror = (event) => {
this.opts.onError?.(event)
}
this.websocket.onmessage = this.handleMessage.bind(this)
this.websocket.onopen = () => {
if (this.opts.token) {
this.tryAuthenticate()
}
else {
this.tryAnnounce()
}
this.connected = true
}
this.websocket.onclose = () => {
this.connected = false
this.authenticateAttempts = 0
this.opts.onClose?.()
if (this.opts.autoReconnect) {
this.connect()
}
}
async connect() {
await this.tryReconnectWithExponentialBackoff()
}
private tryAnnounce() {
@@ -104,13 +165,19 @@ export class Client<C = undefined> {
}
private async handleMessage(event: any) {
const data = JSON.parse(event.data) as WebSocketEvent<C>
const listeners = this.eventListeners.get(data.type)
if (!listeners)
return
try {
const data = JSON.parse(event.data) as WebSocketEvent<C>
const listeners = this.eventListeners.get(data.type)
if (!listeners)
return
for (const listener of listeners)
await listener(data)
for (const listener of listeners)
await listener(data)
}
catch (err) {
console.error('Failed to parse message:', err)
this.opts.onError?.(err)
}
}
onEvent<E extends keyof WebSocketEvents<C>>(
@@ -133,4 +200,13 @@ export class Client<C = undefined> {
sendRaw(data: string | ArrayBufferLike | ArrayBufferView): void {
this.websocket.send(data)
}
close(): void {
this.shouldClose = true
if (this.connected && this.websocket) {
this.websocket.close()
this.connected = false
}
}
}