Merge remote-tracking branch 'origin/main' into 631_select_room

Merge origin/main into room branch

- Update room branch with latest changes from main
- Sync with upstream features and fixes

.github/workflows/flyio.yml

@@ -1,8 +1,9 @@
 name: Deploy to Fly
 
 on:
-  branches:
-    - main
+  push:
+    branches:
+      - main
 
 jobs:
   deploy:

Makefile

@@ -16,7 +16,7 @@ webapp:
 
 .PHONY: webapp-clean
 webapp-clean:
-	rm -r dist
+	rm -r static/dist
 
 .PHONY: clean
 clean: webapp-clean

webapp/components/layout.tsx

@@ -46,6 +46,29 @@ export default function Layout(props: { meetingId: string }) {
     setMeetingJoined(false)
   }
 
+  useEffect(() => {
+    const cleanup = () => {
+      delStream(props.meetingId, localStreamId)
+    }
+    // NOTE:
+    // https://github.com/binbat/woom/pull/27
+    // https://developer.mozilla.org/en-US/docs/Web/API/Window/unload_event
+    // `unload` event is Deprecated, But Firefox need `unload`
+    //
+    // event                        | Chrome                    | Firefox                   | Safari
+    // ---------------------------- | ------------------------- | ------------------------- | -----
+    // `beforeunload`               | ok                        | console error, no request | console error, request ok
+    // `unload`                     | console error, no request | ok                        | console no request log, no request
+    // `beforeunload` + `keepalive` | ok                        | console error, no request | console error, request ok
+    // `unload` +  `keepalive`      | console error, request ok | ok                        | console no request log, request ok
+    window.addEventListener('beforeunload', cleanup)
+    window.addEventListener('unload', cleanup)
+    return () => {
+      window.removeEventListener('beforeunload', cleanup)
+      window.removeEventListener('unload', cleanup)
+    }
+  }, [props.meetingId, localStreamId])
+
   //useEffect(() => {
   //  let shareScreenId = ""
   //  const setShareScreenId = (id: string) => shareScreenId = id

webapp/lib/api.ts

@@ -114,6 +114,7 @@ async function delStream(roomId: string, streamId: string): Promise<any> {
       'Authorization': `Bearer ${token}`,
     },
     method: 'DELETE',
+    keepalive: true,
   })
 }
 

webapp/lib/device.ts

@@ -26,9 +26,9 @@ async function asyncGetVideoStream(deviceId: string): Promise<MediaStream> {
   if (deviceId === 'none') {
     /* empty */
   } else if (deviceId === 'screen') {
-    stream = await navigator.mediaDevices.getDisplayMedia({ audio: false, video: { width: 640 } })
+    stream = await navigator.mediaDevices.getDisplayMedia({ audio: false, video: { height: 720 } })
   } else {
-    stream = await navigator.mediaDevices.getUserMedia({ audio: false, video: { width: 320, deviceId: deviceId } })
+    stream = await navigator.mediaDevices.getUserMedia({ audio: false, video: { height: 480, deviceId: deviceId } })
   }
   return stream
 }