From: Ruben Beltran del Rio <redacted>
Date: Fri, 15 Sep 2023 15:42:59 +0000 (+0200)
Subject: Ensure connections are closed
X-Git-Url: https://git.r.bdr.sh/rbdr/junction/commitdiff_plain/65b2c3feb11adffaccf2a5c49f60f738c146d910?ds=inline

Ensure connections are closed
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed0e0d8..050f213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,14 @@
 # Changelog
 
-1.0.1 2023-09-15
+1.0.2 2023-09-15
+
+- Fixes bug where junction wouldn't close WebRTC connection on hang up
+
+  1.0.1 2023-09-15
 
 - Fixes bug where junction wouldn't work between tabs
 
-1.0.0 2023-09-14
+  1.0.0 2023-09-14
 
 - Added this changelog
 - Added Firefox extension configuration
diff --git a/extension/manifest.json b/extension/manifest.json
index efdc2a5..dd71d12 100644
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Junction",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Jump into an audio call on any URL",
   "author": "Ruben Knol & Rubén Beltrán del Río",
 
diff --git a/extension/media.js b/extension/media.js
index 416053a..ae60ec9 100644
--- a/extension/media.js
+++ b/extension/media.js
@@ -17,7 +17,7 @@ export async function stopMedia() {
     return;
   }
 
-  for (const track of internals.mediaStream.getAudioTracks()) {
+  for (const track of internals.mediaStream.getTracks()) {
     track.stop();
   }
 
diff --git a/extension/package.json b/extension/package.json
index 33a582b..53ebbed 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "junction-extension",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "junction.js",
   "scripts": {
diff --git a/extension/peers.js b/extension/peers.js
index fced108..5ba5c48 100644
--- a/extension/peers.js
+++ b/extension/peers.js
@@ -98,6 +98,9 @@ export function countPeers() {
 }
 
 export function resetPeers() {
+  for (const connection of Object.values(internals.peers)) {
+    connection.close();
+  }
   internals.peers = {};
   document
     .querySelectorAll(".junction-call-audio")
diff --git a/safari/Junction.xcodeproj/project.pbxproj b/safari/Junction.xcodeproj/project.pbxproj
index 3b5e98f..2f63fa2 100644
--- a/safari/Junction.xcodeproj/project.pbxproj
+++ b/safari/Junction.xcodeproj/project.pbxproj
@@ -574,7 +574,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "Junction Extension/Junction_Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -587,7 +587,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -605,7 +605,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "Junction Extension/Junction_Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -618,7 +618,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -640,7 +640,7 @@
 				CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -654,7 +654,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -677,7 +677,7 @@
 				CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -691,7 +691,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -711,11 +711,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = pizza.unlimited.JunctionTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -730,11 +730,11 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				GENERATE_INFOPLIST_FILE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = pizza.unlimited.JunctionTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -748,10 +748,10 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = pizza.unlimited.JunctionUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -765,10 +765,10 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = S68NHQVJXW;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0.1;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = pizza.unlimited.JunctionUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
diff --git a/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate b/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate
index 3e87370..4eff412 100644
Binary files a/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate and b/safari/Junction.xcodeproj/project.xcworkspace/xcuserdata/rbdr.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/safari/Junction/Base.lproj/Main.html b/safari/Junction/Base.lproj/Main.html
index 96b489f..a931ef2 100644
--- a/safari/Junction/Base.lproj/Main.html
+++ b/safari/Junction/Base.lproj/Main.html
@@ -15,7 +15,8 @@
   <body>
     <img src="../Icon.png" width="128" height="128" alt="Junction Icon" />
     <p class="state-unknown">
-      Junction is a Safari Extension and <strong>only works in Safari</strong>. You can turn on Junction’s extension in Safari Extensions preferences.
+      Junction is a Safari Extension and <strong>only works in Safari</strong>.
+      You can turn on Junction’s extension in Safari Extensions preferences.
     </p>
     <p class="state-on">
       Junction’s extension is currently on. You can turn it off in Safari
diff --git a/server/package.json b/server/package.json
index 3d2c20c..abd9218 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "junction-server",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {