@reactoo/watchtogether-sdk-js 2.6.77 → 2.6.79

package/example/bulk_join_room/affiliation/premier-league-club/affiliation-data.json

@@ -0,0 +1,393 @@
+[
+  {
+    "order": 0,
+    "search": [
+      "london",
+      "holloway",
+      "arsenal",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "gunners",
+      "emirates",
+      "stadium",
+      "fc"
+    ],
+    "id": "arsenal",
+    "group": null,
+    "name": "Arsenal"
+  },
+  {
+    "order": 1,
+    "search": [
+      "birmingham",
+      "aston",
+      "villa",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "villans",
+      "lions",
+      "park",
+      "fc"
+    ],
+    "id": "aston_villa",
+    "group": null,
+    "name": "Aston Villa"
+  },
+  {
+    "order": 2,
+    "search": [
+      "bournemouth",
+      "afc",
+      "the",
+      "cherries",
+      "dean",
+      "court"
+    ],
+    "id": "afc_bournemouth",
+    "group": null,
+    "name": "AFC Bournemouth"
+  },
+  {
+    "order": 3,
+    "search": [
+      "london",
+      "brentford",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "bees",
+      "gtech",
+      "community",
+      "england",
+      "stadium",
+      "fc"
+    ],
+    "id": "brentford",
+    "group": null,
+    "name": "Brentford"
+  },
+  {
+    "order": 4,
+    "search": [
+      "falmer",
+      "brighton",
+      "&",
+      "hove",
+      "albion",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "seagulls",
+      "stadium",
+      "and",
+      "fc"
+    ],
+    "id": "brighton_and_hove_albion",
+    "group": null,
+    "name": "Brighton & Hove Albion"
+  },
+  {
+    "order": 5,
+    "search": [
+      "burnley",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "clarets",
+      "turf",
+      "moor",
+      "fc"
+    ],
+    "id": "burnley",
+    "group": null,
+    "name": "Burnley"
+  },
+  {
+    "order": 6,
+    "search": [
+      "london",
+      "fulham",
+      "chelsea",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "blues",
+      "stamford",
+      "bridge",
+      "fc"
+    ],
+    "id": "chelsea",
+    "group": null,
+    "name": "Chelsea"
+  },
+  {
+    "order": 7,
+    "search": [
+      "london",
+      "selhurst",
+      "crystal",
+      "palace",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "eagles",
+      "glaziers",
+      "park",
+      "fc"
+    ],
+    "id": "crystal_palace",
+    "group": null,
+    "name": "Crystal Palace"
+  },
+  {
+    "order": 8,
+    "search": [
+      "liverpool",
+      "walton",
+      "everton",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "blues",
+      "toffees",
+      "people",
+      "s",
+      "school",
+      "of",
+      "science",
+      "goodison",
+      "park",
+      "fc"
+    ],
+    "id": "everton",
+    "group": null,
+    "name": "Everton"
+  },
+  {
+    "order": 9,
+    "search": [
+      "london",
+      "fulham",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "cottagers",
+      "craven",
+      "cottage",
+      "fc"
+    ],
+    "id": "fulham",
+    "group": null,
+    "name": "Fulham"
+  },
+  {
+    "order": 10,
+    "search": [
+      "liverpool",
+      "anfield",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "reds",
+      "fc"
+    ],
+    "id": "liverpool",
+    "group": null,
+    "name": "Liverpool"
+  },
+  {
+    "order": 11,
+    "search": [
+      "luton",
+      "town",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "hatters",
+      "kenilworth",
+      "road",
+      "fc"
+    ],
+    "id": "luton_town",
+    "group": null,
+    "name": "Luton Town"
+  },
+  {
+    "order": 12,
+    "search": [
+      "manchester",
+      "bradford",
+      "city",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "citizens",
+      "cityzens",
+      "blues",
+      "sky",
+      "of",
+      "stadium",
+      "man",
+      "fc"
+    ],
+    "id": "manchester_city",
+    "group": null,
+    "name": "Manchester City"
+  },
+  {
+    "order": 13,
+    "search": [
+      "manchester",
+      "old",
+      "trafford",
+      "united",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "red",
+      "devils",
+      "man",
+      "utd",
+      "fc"
+    ],
+    "id": "manchester_united",
+    "group": null,
+    "name": "Manchester United"
+  },
+  {
+    "order": 14,
+    "search": [
+      "newcastle",
+      "upon",
+      "tyne",
+      "united",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "magpies",
+      "st",
+      "james",
+      "park",
+      "fc"
+    ],
+    "id": "newcastle_united",
+    "group": null,
+    "name": "Newcastle United"
+  },
+  {
+    "order": 15,
+    "search": [
+      "west",
+      "bridgford",
+      "nottingham",
+      "forest",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "reds",
+      "tricky",
+      "trees",
+      "garibaldi",
+      "city",
+      "ground",
+      "fc"
+    ],
+    "id": "nottingham_forest",
+    "group": null,
+    "name": "Nottingham Forest"
+  },
+  {
+    "order": 16,
+    "search": [
+      "sheffield",
+      "united",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "blades",
+      "bramall",
+      "lane",
+      "sufc",
+      "fc"
+    ],
+    "id": "sheffield_united",
+    "group": null,
+    "name": "Sheffield United"
+  },
+  {
+    "order": 17,
+    "search": [
+      "london",
+      "tottenham",
+      "hotspur",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "lilywhites",
+      "stadium",
+      "spurs",
+      "fc"
+    ],
+    "id": "tottenham_hotspur",
+    "group": null,
+    "name": "Tottenham Hotspur"
+  },
+  {
+    "order": 18,
+    "search": [
+      "london",
+      "stratford",
+      "west",
+      "ham",
+      "united",
+      "f.c.",
+      "football",
+      "club",
+      "the",
+      "irons",
+      "hammers",
+      "stadium",
+      "fc"
+    ],
+    "id": "west_ham_united",
+    "group": null,
+    "name": "West Ham United"
+  },
+  {
+    "order": 19,
+    "search": [
+      "wolverhampton",
+      "wanderers",
+      "f.c.",
+      "football",
+      "club",
+      "wolves",
+      "the",
+      "molineux",
+      "stadium",
+      "fc"
+    ],
+    "id": "wolverhampton_wanderers",
+    "group": null,
+    "name": "Wolverhampton Wanderers"
+  }
+]

package/example/bulk_join_room/bulk_join_room_2.html

@@ -101,6 +101,20 @@
             <button type="button" onclick="disableEmojiSparking()">Disable Emoji Sparking</button>
             <button type="button" onclick="burstEmojiSparking()">Burst Emoji Sparking</button>
         </div>
+
+        <div class="heading --advanced">Affiliation</div>
+        <div class="form-group --advanced">
+            <button type="button" onclick="assignRandomCountry()">Assign Random Country</button>
+            <button type="button" onclick="assignRandomCountry('asia')">Assign Random Country (Asia)</button>
+            <button type="button" onclick="assignRandomCountry('europe')">Assign Random Country (Europe)</button>
+            <button type="button" onclick="assignRandomCountry('africa')">Assign Random Country (Africa)</button>
+            <button type="button" onclick="assignRandomCountry('north_america')">Assign Random Country (North America)</button>
+            <button type="button" onclick="assignRandomCountry('south_america')">Assign Random Country (South America)</button>
+            <button type="button" onclick="assignRandomCountry('oceania')">Assign Random Country (Oceania)</button>
+        </div>
+        <div class="form-group --advanced">
+            <button type="button" onclick="assignRandomPremierLeagueClub()">Assign Random Premier League Club</button>
+        </div>
     </div>
 
     <div class="participants-list-container">
@@ -772,6 +786,35 @@
         });
     }
 
+    function assignRandomCountry(continent = null) {
+        fetch('./affiliation/country/affiliation-data.json').then(response => response.json())
+            .then(countries => {
+                participants.filter(p => p).forEach(participant => {
+                    const continentCountries = continent ? countries.filter(country => country.continent === continent) : countries;
+                    const randomCountry = continentCountries[Math.floor(Math.random()*continentCountries.length)];
+
+                    participant.sdkInstance.user.getUserSelf()
+                        .then(response => {
+                            participant.sdkInstance.user.updateUserSelf({customAttributes: {...response.data.customAttributes, country: randomCountry.id}});
+                        });
+                });
+            });
+    }
+
+    function assignRandomPremierLeagueClub() {
+        fetch('./affiliation/premier-league-club/affiliation-data.json').then(response => response.json())
+            .then(premierLeagueClubs => {
+                participants.filter(p => p).forEach(participant => {
+                    const randomPremierLeagueClubs = premierLeagueClubs[Math.floor(Math.random()*premierLeagueClubs.length)];
+
+                    participant.sdkInstance.user.getUserSelf()
+                        .then(response => {
+                            participant.sdkInstance.user.updateUserSelf({customAttributes: {...response.data.customAttributes, premierLeagueClub: randomPremierLeagueClubs.id}});
+                        });
+                });
+            });
+    }
+
     // ====================== Initialization ==============================
 
     document.addEventListener("DOMContentLoaded", function() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactoo/watchtogether-sdk-js",
-  "version": "2.6.77",
+  "version": "2.6.79",
   "description": "Javascript SDK for Reactoo",
   "main": "src/index.js",
   "unpkg": "dist/watchtogether-sdk.min.js",

package/src/modules/wt-iot.js

@@ -204,14 +204,8 @@ class Iot {
                     event === "video_uploaded" ||
                     event === "change_user_devices" ||
                     event === "queue" ||
-                    event === "title_changed"
-                ) {
-                    this.emit('message', {event, ...payload, roomId})
-                }
-                else if(event === 'joined' || event === 'leaving') {
-                    this.emit('message', {event, ...payload, isObserver:!!payload.isObserver, roomId});
-                }
-                else if(
+                    event === "title_changed" ||
+                    event === "videowall_changed" ||
                     event === 'left' || //user removed room a.k.a. left the room
                     event === 'kicked' ||
                     event === 'banned' ||
@@ -222,12 +216,15 @@ class Iot {
                     event === 'messageRemoved' ||
                     event === 'messageReported' ||
                     event === 'chatClear' ||
-                    event === 'handRaised' || event === 'handLowered' || event === 'handsCleared'
+                    event === 'handRaised' ||
+                    event === 'handLowered' ||
+                    event === 'handsCleared' ||
+                    event === 'volume_set'
                 ) {
-                    this.emit('message', {event, ...payload});
+                    this.emit('message', {event, ...payload, roomId})
                 }
-                else if(event === 'volume_set') {
-                    this.emit('message', {event, ...payload});
+                else if(event === 'joined' || event === 'leaving') {
+                    this.emit('message', {event, ...payload, isObserver:!!payload.isObserver, roomId});
                 }
             }
             else if(topic[1] === 'instanceroom') { // instance

package/src/modules/wt-room.js

@@ -1646,7 +1646,8 @@ class RoomSession {
 										.then(() => {
 											p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
 										})
-										.catch(() => {
+										.catch((e) => {
+											this._log('switch failed:', e);
 											this._resetStats(p.handleId, mid);
 
 											if(!p.webrtcStuff.simulcastSwitchFailedAttempts[mid]) {
@@ -1665,7 +1666,8 @@ class RoomSession {
 										.then(() => {
 											p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 0
 										})
-										.catch(() => {
+										.catch((e) => {
+											this._log('switch failed:', e);
 											this._resetStats(p.handleId, mid);
 											if(!p.webrtcStuff.simulcastSwitchFailedAttempts[mid]) {
 												p.webrtcStuff.simulcastSwitchFailedAttempts[mid] = 1;