Ensure connections are closed

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed0e0d816a9b4ed912b9c8462f7a304113a8e6f0..050f21369839c70b8d4dc827710e6ee8c6f44526 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,14 @@
 # Changelog
 
 # 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
 
 
 - 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
 
 - Added this changelog
 - Added Firefox extension configuration

diff --git a/extension/manifest.json b/extension/manifest.json
index efdc2a51d56d96886c8243032bcf150c7f789d4c..dd71d123756db916d7e14f70b1981aa73e81377f 100644 (file)
--- a/extension/manifest.json
+++ b/extension/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Junction",
 {
   "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",
 
   "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 416053aa7e65dda87ad70397f643224dc4378fab..ae60ec905c7f3bda3a311ea3a7766ec63e381a16 100644 (file)
--- a/extension/media.js
+++ b/extension/media.js
@@ -17,7 +17,7 @@ export async function stopMedia() {
     return;
   }
 
     return;
   }
 

-  for (const track of internals.mediaStream.getAudioTracks()) {
+  for (const track of internals.mediaStream.getTracks()) {

     track.stop();
   }
 
     track.stop();
   }
 

diff --git a/extension/package.json b/extension/package.json
index 33a582b274e9245169120ed95f25b6281882a9af..53ebbedb2732349204860f9938891beeb37fbb9a 100644 (file)
--- a/extension/package.json
+++ b/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "junction-extension",
 {
   "name": "junction-extension",

-  "version": "1.0.1",
+  "version": "1.0.2",

   "description": "",
   "main": "junction.js",
   "scripts": {
   "description": "",
   "main": "junction.js",
   "scripts": {

diff --git a/extension/peers.js b/extension/peers.js
index fced1085277c85649c6f551fbc84ecba440af091..5ba5c487b20533ba1c0cbb3f76e5c1056c2fe793 100644 (file)
--- a/extension/peers.js
+++ b/extension/peers.js
@@ -98,6 +98,9 @@ export function countPeers() {
 }
 
 export function resetPeers() {
 }
 
 export function resetPeers() {

+  for (const connection of Object.values(internals.peers)) {
+    connection.close();
+  }

   internals.peers = {};
   document
     .querySelectorAll(".junction-call-audio")
   internals.peers = {};
   document
     .querySelectorAll(".junction-call-audio")

diff --git a/safari/Junction.xcodeproj/project.pbxproj b/safari/Junction.xcodeproj/project.pbxproj
index 3b5e98f4dbc9902d24a1acebc837bcf79f034161..2f63fa291a432e6f44c094bcae0b5f4c42edfa07 100644 (file)
--- 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;
                        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;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -587,7 +587,7 @@
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;

-                               MARKETING_VERSION = 1.0.1;
+                               MARKETING_VERSION = 1.0.2;

                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,
                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,


@@ -605,7 +605,7 @@
                        buildSettings = {
                                CODE_SIGN_ENTITLEMENTS = "Junction Extension/Junction_Extension.entitlements";
                                CODE_SIGN_STYLE = Automatic;
                        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;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -618,7 +618,7 @@
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                        "@executable_path/../../../../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;

-                               MARKETING_VERSION = 1.0.1;
+                               MARKETING_VERSION = 1.0.2;

                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,
                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,


@@ -640,7 +640,7 @@
                                CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
                                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;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -654,7 +654,7 @@
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;

-                               MARKETING_VERSION = 1.0.1;
+                               MARKETING_VERSION = 1.0.2;

                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,
                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,


@@ -677,7 +677,7 @@
                                CODE_SIGN_ENTITLEMENTS = Junction/Junction.entitlements;
                                CODE_SIGN_STYLE = Automatic;
                                COMBINE_HIDPI_IMAGES = YES;
                                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;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                ENABLE_HARDENED_RUNTIME = YES;
                                GENERATE_INFOPLIST_FILE = YES;


@@ -691,7 +691,7 @@
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;
                                        "@executable_path/../Frameworks",
                                );
                                MACOSX_DEPLOYMENT_TARGET = 10.14;

-                               MARKETING_VERSION = 1.0.1;
+                               MARKETING_VERSION = 1.0.2;

                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,
                                OTHER_LDFLAGS = (
                                        "-framework",
                                        SafariServices,


@@ -711,11 +711,11 @@
                                ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
                                BUNDLE_LOADER = "$(TEST_HOST)";
                                CODE_SIGN_STYLE = Automatic;
                                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;
                                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;
                                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;
                                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;
                                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;
                                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;
                        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;
                                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;
                                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;
                        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;
                                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;
                                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 3e873700c0b69c47327e573b5affe0d647153ec8..4eff412ce4aca1221297b1b8e61ded41217b404c 100644 (file)
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 96b489fdc68c1656dba3b3538634066d78c0e721..a931ef25a9910e97ba58eb7e71356f0c6ed080ff 100644 (file)
--- 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">
   <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
     </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 3d2c20c7ce43434ecd754e0380ca0270a36202a1..abd9218585e153084a9b3b669ee7f43280c2ec9a 100644 (file)
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "junction-server",
 {
   "name": "junction-server",

-  "version": "1.0.1",
+  "version": "1.0.2",

   "description": "",
   "main": "index.js",
   "scripts": {
   "description": "",
   "main": "index.js",
   "scripts": {