diff --git a/package.json b/package.json index 7b8be3a4fb..32dab59cbf 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@milkdown/react": "7.3.3", "@milkdown/transformer": "7.3.3", "@milkdown/utils": "7.3.3", - "@mx-space/api-client": "1.8.0-beta.0", + "@mx-space/api-client": "1.8.0-beta.1", "@prosemirror-adapter/react": "0.2.6", "@radix-ui/react-dialog": "1.0.5", "@radix-ui/react-label": "2.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aeb5bee433..ae8f211126 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,8 +72,8 @@ dependencies: specifier: 7.3.3 version: 7.3.3(@milkdown/core@7.3.3)(@milkdown/ctx@7.3.3)(@milkdown/prose@7.3.3)(@milkdown/transformer@7.3.3) '@mx-space/api-client': - specifier: 1.8.0-beta.0 - version: 1.8.0-beta.0 + specifier: 1.8.0-beta.1 + version: 1.8.0-beta.1 '@prosemirror-adapter/react': specifier: 0.2.6 version: 0.2.6(react-dom@18.2.0)(react@18.2.0) @@ -2529,8 +2529,8 @@ packages: tslib: 2.6.2 dev: false - /@mx-space/api-client@1.8.0-beta.0: - resolution: {integrity: sha512-etZ3UzgVl0XtExBjvsvajthnfy9tHmcbWuqivLxZd7BVZ7MaKKfVgIti8kOt/ir1HJ05FYoBATUAsrOe1kUBmA==} + /@mx-space/api-client@1.8.0-beta.1: + resolution: {integrity: sha512-WsPLbXbQsV6Ji8+aR6F2JOtKxLwGLftT0mzQXvaL/G6c62PfiCQK7cVayI6XWogv/cq1ll6qrRcKPo412HEwSQ==} dev: false /@mx-space/webhook@0.2.2: diff --git a/src/app/(app)/web-dev/page.tsx b/src/app/(app)/web-dev/page.tsx index 018621aeb8..4035eea798 100644 --- a/src/app/(app)/web-dev/page.tsx +++ b/src/app/(app)/web-dev/page.tsx @@ -18,7 +18,7 @@ import { apiClient } from '~/lib/request' import { usePageScrollLocation } from '~/providers/root/page-scroll-info-provider' import { queries } from '~/queries/definition' import { socketClient } from '~/socket' -import { EventTypes, SocketEmitEnum } from '~/types/events' +import { SocketEmitEnum } from '~/types/events' export default () => { const roomName = useMemo(() => `article-${111112222}`, []) @@ -44,22 +44,10 @@ export default () => { roomName, }) - const handler = (e: any) => { - console.log(e, 'EventTypes.ACTIVITY_UPDATE_PRESENCE') - } - window.addEventListener( - `event:${EventTypes.ACTIVITY_UPDATE_PRESENCE}`, - handler, - ) - return () => { socketClient.emit(SocketEmitEnum.Leave, { roomName, }) - window.removeEventListener( - `event:${EventTypes.ACTIVITY_UPDATE_PRESENCE}`, - handler, - ) } }, [roomName, identity, socketIsConnected]) diff --git a/src/components/modules/activity/Presence.tsx b/src/components/modules/activity/Presence.tsx index fe2cb0fd91..d73e4c59e3 100644 --- a/src/components/modules/activity/Presence.tsx +++ b/src/components/modules/activity/Presence.tsx @@ -130,15 +130,6 @@ const ReadPresenceTimeline = () => { const { roomName } = useRoomContext() const activityPresenceIdsCurrentRoom = useActivityPresenceByRoomName(roomName) - // console.log(activityPresenceIdsCurrentRoom, 'activityPresenceIdsCurrentRoom') - // console.log( - - // activityPresence, - // 'activityPresence', - // sessionId, - // useActivityPresence(), - // ) - return (
@@ -181,7 +172,7 @@ const TimelineItem: FC = memo(({ type, identity }) => { if (typeof position !== 'number') return null const readingDuration = presence - ? formatSeconds((presence.operationTime - presence.connectedAt) / 1000) + ? formatSeconds((presence.operationTime - presence.joinedAt) / 1000) : '' return ( diff --git a/src/socket/socket-client.ts b/src/socket/socket-client.ts index 74589c78d6..4a27b5f35e 100644 --- a/src/socket/socket-client.ts +++ b/src/socket/socket-client.ts @@ -60,6 +60,7 @@ class SocketClient { this.socket.close() this.socket.open() + setSocketIsConnect(this.socket.connected) this.socket.on( 'message', (payload: string | Record<'type' | 'data', any>) => {