Replace providerRef with outer ref reference and update test.yml

Author: bensohh

.github/workflows/test.yml

@@ -30,13 +30,15 @@ jobs:
           USER_SERVICE_URL: ${{ vars.USER_SERVICE_URL }}
           MATCHING_SERVICE_URL: ${{ vars.MATCHING_SERVICE_URL }}
           HISTORY_SERVICE_URL: ${{ vars.HISTORY_SERVICE_URL }}
+          SIGNALLING_SERVICE_URL: ${{ vars.SIGNALLING_SERVICE_URL }}
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
           QUESTION_FIREBASE_CREDENTIAL_PATH: ${{ vars.QUESTION_SERVICE_FIREBASE_CREDENTIAL_PATH }}
           HISTORY_FIREBASE_CREDENTIAL_PATH: ${{ vars.HISTORY_SERVICE_FIREBASE_CREDENTIAL_PATH }}
           DB_CLOUD_URI: ${{ secrets.USER_SERVICE_DB_CLOUD_URI }}
           USER_SERVICE_PORT: ${{ vars.USER_SERVICE_PORT }}
           MATCHING_SERVICE_PORT: ${{ vars.MATCHING_SERVICE_PORT }}
           HISTORY_SERVICE_PORT: ${{ vars.HISTORY_SERVICE_PORT }}
+          SIGNALLING_SERVICE_PORT: ${{ vars.SIGNALLING_SERVICE_PORT }}
           MATCHING_SERVICE_TIMEOUT: ${{ vars.MATCHING_SERVICE_TIMEOUT }}
           REDIS_URL: ${{ vars.REDIS_URL }}
           QUESTION_SERVICE_GRPC_URL: ${{ vars.QUESTION_SERVICE_GPRC_URL }}
@@ -46,6 +48,7 @@ jobs:
           echo "NEXT_PUBLIC_USER_SERVICE_URL=$USER_SERVICE_URL" >> .env
           echo "NEXT_PUBLIC_MATCHING_SERVICE_URL=$MATCHING_SERVICE_URL" >> .env
           echo "NEXT_PUBLIC_HISTORY_SERVICE_URL=$HISTORY_SERVICE_URL" >> .env
+          echo "NEXT_PUBLIC_SIGNALLING_SERVICE_URL=$SIGNALLING_SERVICE_URL" >> .env
 
           cd ../question-service
           echo "FIREBASE_CREDENTIAL_PATH=$QUESTION_FIREBASE_CREDENTIAL_PATH" >> .env
@@ -67,6 +70,9 @@ jobs:
           echo "FIREBASE_CREDENTIAL_PATH=$HISTORY_FIREBASE_CREDENTIAL_PATH" >> .env
           echo "PORT=$HISTORY_SERVICE_PORT" >> .env
 
+          cd ../signalling-service
+          echo "PORT=$SIGNALLING_SERVICE_PORT" >> .env
+
       - name: Create Database Credential Files
         env:
           QUESTION_FIREBASE_JSON: ${{ secrets.QUESTION_SERVICE_FIREBASE_CREDENTIAL }}
@@ -101,6 +107,7 @@ jobs:
           QUESTION_SERVICE_URL: ${{ vars.QUESTION_SERVICE_URL }}
           MATCHING_SERVICE_URL: ${{ vars.MATCHING_SERVICE_URL }}
           HISTORY_SERVICE_URL: ${{ vars.HISTORY_SERVICE_URL }}
+          SIGNALLING_SERVICE_URL: ${{ vars.SIGNALLING_SERVICE_URL }}
         run: |
           echo "Testing Question Service..."
           curl -sSL -o /dev/null $QUESTION_SERVICE_URL && echo "Question Service is up"
@@ -117,5 +124,10 @@ jobs:
             echo "WebSocket for Matching Service is live"
           fi
           # Add in test for matching service in the future
-
+          echo "Testing Signalling Service..."
+          if ! (echo "Hello" | websocat $SIGNALLING_SERVICE_URL); then
+            echo "WebSocket for Signalling Service is not live"
+          else
+            echo "WebSocket for Signalling Service is live"
+          fi
           # We can add more tests here

apps/frontend/src/app/collaboration/[id]/page.tsx

@@ -399,7 +399,7 @@ export default function CollaborationPage(props: CollaborationProps) {
                     language={selectedLanguage}
                     setMatchedUser={setMatchedUser}
                     handleCloseCollaboration={handleCloseCollaboration}
-                    // providerRef={providerRef}
+                    providerRef={providerRef}
                     matchedUser={matchedUser}
                     onCodeChange={handleCodeChange}
                   />

apps/frontend/src/components/CollaborativeEditor/CollaborativeEditor.tsx

@@ -32,7 +32,7 @@ interface CollaborativeEditorProps {
   language: string;
   setMatchedUser: Dispatch<SetStateAction<string>>;
   handleCloseCollaboration: (type: string) => void;
-  //   providerRef: MutableRefObject<WebrtcProvider | null>;
+  providerRef: MutableRefObject<WebrtcProvider | null>;
   matchedUser: string;
   onCodeChange: (code: string) => void;
 }
@@ -77,7 +77,7 @@ const CollaborativeEditor = forwardRef(
     ref: ForwardedRef<CollaborativeEditorHandle>
   ) => {
     const editorRef = useRef(null);
-    const providerRef = useRef<WebrtcProvider | null>(null);
+    // const providerRef = useRef<WebrtcProvider | null>(null);
     const [selectedLanguage, setSelectedLanguage] = useState("JavaScript");
     let sessionEndNotified = false;
 
@@ -168,9 +168,9 @@ const CollaborativeEditor = forwardRef(
 
     useImperativeHandle(ref, () => ({
       endSession: () => {
-        if (providerRef.current) {
+        if (props.providerRef.current) {
           // Set awareness state to indicate session ended to notify peer about session ending
-          providerRef.current.awareness.setLocalStateField(
+          props.providerRef.current.awareness.setLocalStateField(
             "sessionEnded",
             true
           );
@@ -191,7 +191,7 @@ const CollaborativeEditor = forwardRef(
         maxConns: 2,
       });
 
-      providerRef.current = provider;
+      props.providerRef.current = provider;
       const ytext = ydoc.getText("codemirror");
       const undoManager = new Y.UndoManager(ytext);
 
@@ -222,8 +222,8 @@ const CollaborativeEditor = forwardRef(
 
               props.handleCloseCollaboration("peer");
               sessionEndNotified = true;
-              if (providerRef.current) {
-                providerRef.current.disconnect();
+              if (props.providerRef.current) {
+                props.providerRef.current.disconnect();
               }
               return;
             }