Merge branch 'release/1.18.3'

jogalanza · Apr 6, 2021 · cb3f141 · cb3f141
2 parents 3c1f20b + 6034869
commit cb3f141
Show file tree

Hide file tree

Showing 9 changed files with 46,111 additions and 11,644 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "briefing",
   "description": "Secure direct video chat",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "private": true,
   "author": {
     "name": "Dirk Holtwick",
@@ -33,13 +33,13 @@
     "electron >= 8"
   ],
   "dependencies": {
-    "@sentry/browser": "^6.2.3",
-    "@sentry/integrations": "^6.2.3",
+    "@sentry/browser": "^6.2.5",
+    "@sentry/integrations": "^6.2.5",
     "@tensorflow-models/body-pix": "^2.0.5",
     "@tensorflow/tfjs-converter": "^1.7.4",
     "@tensorflow/tfjs-core": "^1.7.4",
     "clipboard-copy": "^4.0.1",
-    "core-js": "^3.9.1",
+    "core-js": "^3.10.0",
     "custom-electron-titlebar": "^3.2.6",
     "debug": "^4.3.1",
     "lodash": "^4.17.21",
@@ -51,9 +51,9 @@
     "vue-template-compiler": "^2.6.12"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.11",
-    "@vue/cli-plugin-pwa": "^4.5.11",
-    "@vue/cli-service": "^4.5.11",
+    "@vue/cli-plugin-babel": "^4.5.12",
+    "@vue/cli-plugin-pwa": "^4.5.12",
+    "@vue/cli-service": "^4.5.12",
     "jest": "^26.6.3",
     "node-sass": "^5.0.0",
     "prettier": "^2.2.1",

diff --git a/app/src/components/app-settings.vue b/app/src/components/app-settings.vue
@@ -125,6 +125,8 @@
       </div>
     </div>
     <div class="release-info">
+      <a href="#" @click.prevent="showInfo = !showInfo">Server Info</a>
+      |
       <a
         href="https://github.com/holtwick/briefing"
         target="_blank"
@@ -133,15 +135,33 @@
         >{{ release }}</a
       >
     </div>
+    <div v-if="showInfo">
+      <div class="form-group settings-group">
+        <label class="form-labelx"><b>Signal Server</b></label>
+        <div>{{ signalStatus }} {{ SIGNAL_SERVER_URL }}</div>
+        <div>
+          <a href="#" @click.prevent="doCheckSignal">Check Connectivity</a>
+        </div>
+      </div>
+      <div class="form-group settings-group">
+        <label class="form-labelx"><b>STUN Server</b></label>
+        <div>{{ ICE_CONFIG.iceServers[0].urls }}</div>
+      </div>
+      <div class="form-group settings-group">
+        <label class="form-labelx"><b>TURN Server</b></label>
+        <div>{{ ICE_CONFIG.iceServers[1].urls }}</div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import { messages } from "../lib/emitter"
 import SeaSwitch from "../ui/sea-switch"
-import { RELEASE } from "../config"
+import { RELEASE, SIGNAL_SERVER_URL, ICE_CONFIG } from "../config"
 import { isAllowedBugTracking, setAllowedBugTracking } from "../bugs"
 import { setBackgroundImage } from "../logic/background"
+import { WebRTC } from "../logic/webrtc"
 
 const log = require("debug")("app:app-settings")
 
@@ -155,6 +175,10 @@ export default {
       enableSubscribe: false,
       iOS: window.iOS,
       iPhone: window.iPhone,
+      SIGNAL_SERVER_URL,
+      ICE_CONFIG,
+      signalStatus: "",
+      showInfo: false,
     }
   },
   computed: {
@@ -208,6 +232,10 @@ export default {
         }
       }
     },
+    async doCheckSignal() {
+      let result = await WebRTC.checkStatus()
+      this.signalStatus = result.ok ? "✅" : "❌"
+    },
   },
   // async mounted() {
   //   if (!this.state.backgroundImageURL) {
@@ -246,5 +274,8 @@ export default {
       messages.emit("subscribePush")
     },
   },
+  mounted() {
+    // this.doCheckSignal()
+  },
 }
 </script>
diff --git a/app/src/logic/webrtc.js b/app/src/logic/webrtc.js
@@ -1,6 +1,7 @@
 // Copyright (c) 2020 Dirk Holtwick. All rights reserved. https://holtwick.de/copyright
 
 import io from "socket.io-client"
+import { UUID } from "../../../internal/briefing-internal/src/lib/uuid.js"
 import { SIGNAL_SERVER_URL } from "../config"
 import { assert } from "../lib/assert"
 import { Emitter } from "../lib/emitter"
@@ -18,6 +19,21 @@ export class WebRTC extends Emitter {
     return WebRTCPeer.isSupported()
   }
 
+  static async checkStatus() {
+    let socket = io(SIGNAL_SERVER_URL, {
+      // transports: ['websocket'],
+    })
+
+    return new Promise((resolve) => {
+      let id = UUID()
+      let result = socket.emit("status", { ping: id }, (result) => {
+        log("status", result)
+        result.ok = result.pong === id
+        resolve(result)
+      })
+    })
+  }
+
   constructor({
     wrtc, // wrtc is used for unit testing via node.js
     room = null,

diff --git a/app/src/state.js b/app/src/state.js
@@ -11,6 +11,7 @@ import {
 import { trackException, trackSilentException } from "./bugs"
 import { PRODUCTION, ROOM_PATH } from "./config"
 import { normalizeName } from "./lib/names"
+
 const log = require("debug")("app:state")
 
 const screenshots = false