diff --git a/api/controllers/console/socketio/workflow.py b/api/controllers/console/socketio/workflow.py index 72f924b5ac..0bcf940018 100644 --- a/api/controllers/console/socketio/workflow.py +++ b/api/controllers/console/socketio/workflow.py @@ -45,14 +45,10 @@ def socket_connect(sid, environ, auth): with sio.app.app_context(): user = AccountService.load_logged_in_account(account_id=user_id) if not user: - logging.warning( - "Socket connect rejected: user not found (user_id=%s, sid=%s)", user_id, sid - ) + logging.warning("Socket connect rejected: user not found (user_id=%s, sid=%s)", user_id, sid) return False if not user.has_edit_permission: - logging.warning( - "Socket connect rejected: no edit permission (user_id=%s, sid=%s)", user_id, sid - ) + logging.warning("Socket connect rejected: no edit permission (user_id=%s, sid=%s)", user_id, sid) return False collaboration_service.save_session(sid, user) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 7f8760bd64..5fcd3afedf 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -826,7 +826,7 @@ services: APP_API_URL: ${APP_API_URL:-} AMPLITUDE_API_KEY: ${AMPLITUDE_API_KEY:-} NEXT_PUBLIC_COOKIE_DOMAIN: ${NEXT_PUBLIC_COOKIE_DOMAIN:-} - NEXT_PUBLIC_SOCKET_URL: ${NEXT_PUBLIC_SOCKET_URL:-} + NEXT_PUBLIC_SOCKET_URL: ${NEXT_PUBLIC_SOCKET_URL:-ws://localhost} SENTRY_DSN: ${WEB_SENTRY_DSN:-} NEXT_TELEMETRY_DISABLED: ${NEXT_TELEMETRY_DISABLED:-0} TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000} diff --git a/web/package.json b/web/package.json index 2745f3d49e..caa6f8290c 100644 --- a/web/package.json +++ b/web/package.json @@ -115,7 +115,7 @@ "lamejs": "1.2.1", "lexical": "0.38.2", "line-clamp": "1.0.0", - "loro-crdt": "^1.8.2", + "loro-crdt": "1.8.2", "mermaid": "11.11.0", "mime": "4.1.0", "mitt": "3.0.1", @@ -150,7 +150,7 @@ "scheduler": "0.27.0", "semver": "7.7.3", "sharp": "0.33.5", - "socket.io-client": "^4.8.1", + "socket.io-client": "4.8.1", "sortablejs": "1.15.6", "string-ts": "2.3.1", "tailwind-merge": "2.6.0",