From 7a0cf5e9b3903c5de0c0c728aecf0f9ca20dcb84 Mon Sep 17 00:00:00 2001 From: Kraiem Taha Yassine Date: Tue, 29 Jun 2021 18:37:29 +0200 Subject: [PATCH] Assist (#67) * feat(api): assist peerJS server * feat(api): install assist_server dependencies and start it with the API * feat(api): assist: list live sessions * feat(nginx): expose assist_server and block peers listing * feat(api): merged sourcemaps reader and assist-server feat(api): change image definition feat(api): changed service start command feat(utilities): created full server & image definition feat(nginx): reset chalice configuration * feat(utilities): utilities.yaml * feat(nginx): utilities URL * feat(utilities): utilities template * feat(ci): Adding utilities GH action. Signed-off-by: Rajesh Rajendran * feat(utilities): build script * feat(utilities): build script fix image name * feat(utilities): tag and push image as latest * feat(api): tag and push image as latest * feat(api): extract peers host * feat(api): fixed utilities URL * feat(api): assist logs * feat(api): assist: fixed peerjs URL * feat(api): log peers URL * feat(api): assit: get all durations, even if it is not null * feat(api): assit: include peerId in response * feat(api): return project_key with session's details * feat(assist): fix peerJS error * feat(api): fix typo Co-authored-by: Rajesh Rajendran --- api/chalicelib/core/sessions.py | 2 +- utilities/servers/peerjs-server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index 8f8a7cd3d..64004e7a0 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -54,7 +54,7 @@ def get_by_id2_pg(project_id, session_id, user_id, full_data=False, include_fav_ f"""\ SELECT s.*, - s.session_id::text AS session_id,, + s.session_id::text AS session_id, (SELECT project_key FROM public.projects WHERE project_id = %(project_id)s LIMIT 1) AS project_key {"," if len(extra_query) > 0 else ""}{",".join(extra_query)} {(",json_build_object(" + ",".join([f"'{m}',p.{m}" for m in metadata._get_column_names()]) + ") AS project_metadata") if group_metadata else ''} diff --git a/utilities/servers/peerjs-server.js b/utilities/servers/peerjs-server.js index df08e8407..20c18f998 100644 --- a/utilities/servers/peerjs-server.js +++ b/utilities/servers/peerjs-server.js @@ -5,7 +5,7 @@ var peerRouter = express.Router(); const extractPeerId = (peerId) => { let splited = peerId.split("-"); if (splited.length !== 2) { - console.error(`cannot split peerId: ${client.id}`); + console.error(`cannot split peerId: ${peerId}`); return {}; } return {projectKey: splited[0], sessionId: splited[1]};