Merge branch 'release/1.15.1'

vorons · Dec 17, 2020 · 37dbe22 · 37dbe22
2 parents a58849c + 1a57848
commit 37dbe22
Show file tree

Hide file tree

Showing 33 changed files with 13,417 additions and 4,333 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ tmp
 ios/Briefing/Briefing.xcodeproj/project.xcworkspace/xcuserdata/dirk.xcuserdatad/UserInterfaceState.xcuserstate
 ios/Briefing/Briefing.xcodeproj/xcuserdata/dirk.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
 ios/Briefing/Briefing.xcodeproj/xcuserdata/dirk.xcuserdatad/xcschemes/xcschememanagement.plist
+app/public/faces
diff --git a/app/.editorconfig b/app/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+max_line_length = 80
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
diff --git a/app/.prettierignore b/app/.prettierignore
@@ -0,0 +1,4 @@
+dist
+node_modules
+build
+tmp
diff --git a/app/babel.config.js b/app/babel.config.js
@@ -1,5 +1,3 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
+  presets: ["@vue/cli-plugin-babel/preset"],
 }
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.15.0",
+  "version": "1.15.1",
   "private": true,
   "author": {
     "name": "Dirk Holtwick",
@@ -26,9 +26,8 @@
     "build": "vue-cli-service build",
     "build:ios": "VUE_APP_TARGET=ios vue-cli-service build",
     "test": "jest",
-    "format": "prettier --write 'src/**/*.{ts,tsx,js,jsx,vue}'",
+    "format": "prettier --write .",
     "ncu": "ncu -u -x /tensorflow/ && npm i",
-    "x": "echo \"Open browser at https://turn01.brie.fi\" && ssh -R 8080:localhost:8080 signal",
     "x:localhost": "ssh -R 80:localhost:8080 ssh.localhost.run",
     "x:lt": "lt --port 8080",
     "x:ngrok": "ngrok http 8080"
@@ -39,16 +38,16 @@
     "electron >= 8"
   ],
   "dependencies": {
-    "@sentry/browser": "^5.29.0",
-    "@sentry/integrations": "^5.29.0",
+    "@sentry/browser": "^5.29.1",
+    "@sentry/integrations": "^5.29.1",
     "@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.8.1",
     "custom-electron-titlebar": "^3.2.5",
     "debug": "^4.3.1",
-    "register-service-worker": "^1.7.1",
+    "register-service-worker": "^1.7.2",
     "simple-peer": "^9.9.3",
     "socket.io-client": "<3",
     "uuid": "^8.3.2",
@@ -60,7 +59,7 @@
     "@vue/cli-service": "^4.5.9",
     "jest": "^26.6.3",
     "node-sass": "^5.0.0",
-    "prettier": "^1.19.1",
+    "prettier": "^2.2.1",
     "sass-loader": "^10.1.0",
     "vue-template-compiler": "^2.6.12",
     "wrtc": "^0.4.6"

diff --git a/app/public/index.html b/app/public/index.html
@@ -1,45 +1,64 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="content-type" content="text/html; charset=utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport"
-          content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, viewport-fit=cover">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, viewport-fit=cover"
+    />
 
     <title>Briefing - Secure direct video conferencing</title>
 
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-    <meta name="format-detection" content="telephone=no">
-    <meta name="mobile-web-app-capable" content="yes">
+    <meta name="apple-itunes-app" content="app-id=1510803601, app-clip-bundle-id=de.holtwick.Briefing.BriefingAppClip">
 
-    <meta name="msapplication-TileColor" content="#272727">
-    <meta name="theme-color" content="#5EA5FF">
-    <meta name="keywords"
-          content="video,chat,group,conferencing,secure,privacy,webrtc,vue,browser,webapp,app,communication,free,opensource,e2ee,p2p">
-    <meta property="og:description" name="description" content="Briefing - Start a secure anonymous video chat">
-    <meta property="og:url" content="https://brie.fi/ng">
-    <meta property="og:title" content="Briefing - Start a secure video chat">
-    <meta property="og:image" content="https://brie.fi/og-image.png">
-    <meta property="og:image:alt" content="Briefing - Start a secure video chat">
-    <meta name="twitter:creator" content="@holtwick">
-    <meta name="twitter:card" content="summary">
-    <meta property="og:type" content="website">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta
+      name="apple-mobile-web-app-status-bar-style"
+      content="black-translucent"
+    />
+    <meta name="format-detection" content="telephone=no" />
+    <meta name="mobile-web-app-capable" content="yes" />
+
+    <meta name="msapplication-TileColor" content="#272727" />
+    <meta name="theme-color" content="#5EA5FF" />
+    <meta
+      name="keywords"
+      content="video,chat,group,conferencing,secure,privacy,webrtc,vue,browser,webapp,app,communication,free,opensource,e2ee,p2p"
+    />
+    <meta
+      property="og:description"
+      name="description"
+      content="Briefing - Start a secure anonymous video chat"
+    />
+    <meta property="og:url" content="https://brie.fi/ng" />
+    <meta property="og:title" content="Briefing - Start a secure video chat" />
+    <meta property="og:image" content="https://brie.fi/og-image.png" />
+    <meta
+      property="og:image:alt"
+      content="Briefing - Start a secure video chat"
+    />
+    <meta name="twitter:creator" content="@holtwick" />
+    <meta name="twitter:card" content="summary" />
+    <meta property="og:type" content="website" />
 
     <style type="text/css">
-        body {
-            background: #272727;
-            color: white;
-        }
+      body {
+        background: #272727;
+        color: white;
+      }
     </style>
-</head>
-<body>
-<noscript>
-    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
-        Please enable it to continue.</strong>
-</noscript>
-<div id="app"></div>
-<!-- built files will be auto injected -->
-</body>
+  </head>
+  <body>
+    <noscript>
+      <strong
+        >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
+        properly without JavaScript enabled. Please enable it to
+        continue.</strong
+      >
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
 </html>
diff --git a/app/src/bugs/README-BUGTRACKER.md b/app/src/bugs/README-BUGTRACKER.md
@@ -8,12 +8,12 @@ quality and privacy concerns.
 ### Opt-in
 
 It would be sad to loose any bug information if the user is willing to help, but not aware of the feature. A solution
-to this problem is, to ask the user for permission to track errors in the moment they occur. This will not catch all 
+to this problem is, to ask the user for permission to track errors in the moment they occur. This will not catch all
 possible errors, but hopefuly most of them. The user still has the possibility to opt-out in the settings.
 
 ### Lazy Loading
 
-To make sure no 3rd party code is doing anything in the background without the permission of the user, the related 
+To make sure no 3rd party code is doing anything in the background without the permission of the user, the related
 code is only loaded when allowed to. It will not be loaded immediatey but "lazily" on demand.
 
 ---

diff --git a/app/src/bugs/index.js b/app/src/bugs/index.js
@@ -36,7 +36,7 @@ export function setAllowedBugTracking(
   log("setAllowedBugTracking", allowed)
   if (allowed) {
     localStorage.allowSentry = "1"
-    setupBugTracker(_ => {
+    setupBugTracker((_) => {
       log("setupBugTracker", collectedErrors)
       let err
       while ((err = collectedErrors.pop())) {

diff --git a/app/src/components/app-help.vue b/app/src/components/app-help.vue
@@ -8,11 +8,11 @@
       <p>
         Privacy is the driving force behind this project. It uses secure
         technologies like
-        <a href="https://webrtc-security.github.io/">WebRTC</a> to directly
-        connect between participants. The website that provides the web app and
-        mediates the communication stores as few data as possible and does not
-        know anything about the contents of established conversations. No
-        accounts are required. No cookies are used.
+        <a href="https://webrtc-security.github.io/">WebRTC</a>
+        to directly connect between participants. The website that provides the
+        web app and mediates the communication stores as few data as possible
+        and does not know anything about the contents of established
+        conversations. No accounts are required. No cookies are used.
       </p>
       <p>
         The difference between Briefing and most similar projects is, that it
@@ -29,14 +29,17 @@
         however still trust the signaling server for the authenticity of the
         peer-to-peer communications encryption in place.
       </p>
-      <p><strong>FAQ- Some answers to some questions</strong></p>
+      <p>
+        <strong>FAQ- Some answers to some questions</strong>
+      </p>
       <p><em>Why starting another video conf tool?</em></p>
       <p>
         During the Corona pandemic I tried to create a peer-to-peer solution for
-        home schooling called <a href="/goto/peer-school">peer.school</a>.
-        Although the project has been retired for various reasons, I learned so
-        much about WebRTC and video/audio communication, that I did want to
-        reuse this knowledge in this project.
+        home schooling called
+        <a href="/goto/peer-school">peer.school</a>. Although the project has
+        been retired for various reasons, I learned so much about WebRTC and
+        video/audio communication, that I did want to reuse this knowledge in
+        this project.
       </p>
       <p><em>Why is it free and Open Source?</em></p>
       <p>
@@ -51,18 +54,20 @@
           >briefing@holtwick.de</a
         >.
       </p>
-      <p><em>Which servers are actually involved in a call?</em></p>
+      <p>
+        <em>Which servers are actually involved in a call?</em>
+      </p>
       <ul>
         <li>Briefing web site (provides the web app)</li>
         <li>Briefing signaling server (coordinates peers in rooms)</li>
         <li>Briefing STUN/TURN server (helps traversing fire walls)</li>
       </ul>
       <p><em>Feature X is missing! Found bug Y!</em></p>
       <p>
-        Please visit the <a href="/goto/issues">GitHub project</a> to see if
-        your request is already on the list or place a
-        <a href="/goto/bug">new issue</a>. Your contribution is of course
-        welcome as well.
+        Please visit the
+        <a href="/goto/issues">GitHub project</a> to see if your request is
+        already on the list or place a <a href="/goto/bug">new issue</a>. Your
+        contribution is of course welcome as well.
       </p>
       <p><em>How about native apps?</em></p>
       <p>
@@ -73,7 +78,8 @@
       </p>
       <p>---</p>
       <p>
-        (C)opyright 2020 by <a href="/goto/holtwick">Dirk Holtwick</a> |
+        (C)opyright 2020 by
+        <a href="/goto/holtwick">Dirk Holtwick</a> |
         <a href="/goto/privacy">Privacy Policy</a> |
         <a href="/goto/imprint">Imprint</a>
       </p>

diff --git a/app/src/components/app-main.vue b/app/src/components/app-main.vue
@@ -53,7 +53,8 @@
 
         <div class="message-container -error" v-else-if="state.error">
           <div class="message">
-            {{ state.error }} <u @click="doReload">Reload page</u>
+            {{ state.error }}
+            <u @click="doReload">Reload page</u>
           </div>
         </div>
 
@@ -406,7 +407,7 @@ export default {
     if (!this.hasPeers) {
       this.mode = "share"
     }
-    this.fullscreenHandler = ev => {
+    this.fullscreenHandler = (ev) => {
       this.isFullScreen = !!document.fullscreenElement
     }
     document.addEventListener("fullscreenchange", this.fullscreenHandler)

diff --git a/app/src/components/app-settings.vue b/app/src/components/app-settings.vue
@@ -32,23 +32,31 @@
     </div>
     <div class="form-group settings-group">
       <sea-switch v-model="state.fill">{{ l.settings.fill }}</sea-switch>
-      <div class="settings-info">{{ l.settings.fill_info }}</div>
+      <div class="settings-info">
+        {{ l.settings.fill_info }}
+      </div>
     </div>
     <div class="form-group settings-group" v-if="false">
       <sea-switch v-model="state.bandwidth">{{
         l.settings.bandwidth
       }}</sea-switch>
-      <div class="settings-info">{{ l.settings.bandwidth_info }}</div>
+      <div class="settings-info">
+        {{ l.settings.bandwidth_info }}
+      </div>
     </div>
     <div class="form-group settings-group" v-if="false">
       <sea-switch v-model="state.blur">{{ l.settings.blur }}</sea-switch>
-      <div class="settings-info">{{ l.settings.blur_info }}</div>
+      <div class="settings-info">
+        {{ l.settings.blur_info }}
+      </div>
     </div>
     <div class="form-group settings-group" v-if="enableSubscribe">
       <sea-switch v-model="state.subscribe">{{
         l.settings.subscribe
       }}</sea-switch>
-      <div class="settings-info">{{ l.settings.subscribe_info }}</div>
+      <div class="settings-info">
+        {{ l.settings.subscribe_info }}
+      </div>
     </div>
     <div v-if="false" class="form-group settings-group">
       <sea-switch v-model="sentry">{{ l.settings.sentry }}</sea-switch>
@@ -95,9 +103,7 @@
           />
           Photo by
           <a
-            :href="
-              `${state.backgroundURL}?utm_source=briefing&utm_medium=referral`
-            "
+            :href="`${state.backgroundURL}?utm_source=briefing&utm_medium=referral`"
             >{{ state.backgroundAuthor }}</a
           >
           on
@@ -147,7 +153,7 @@ export default {
     }
   },
   computed: {
-    release: _ => RELEASE,
+    release: (_) => RELEASE,
     sentry: {
       set(v) {
         setAllowedBugTracking(v, this.l.settings.sentry_confirm)
@@ -158,7 +164,7 @@ export default {
     },
     video() {
       let videoDevices = this.state.devices.filter(
-        d => d.kind === "videoinput" && d.deviceId !== "default"
+        (d) => d.kind === "videoinput" && d.deviceId !== "default"
       )
       if (navigator?.mediaDevices?.getDisplayMedia) {
         return [
@@ -173,7 +179,7 @@ export default {
     },
     audio() {
       return this.state.devices.filter(
-        d => d.kind === "audioinput" && d.deviceId !== "default"
+        (d) => d.kind === "audioinput" && d.deviceId !== "default"
       )
     },
   },