added updated submodules

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## [1.3.3] - 2022-04-07
+
+- fixed share sc
+
 ## [1.3.2] - 2022-03-21
 ### Added 
 - japanese translation

backend/server.js

@@ -8,7 +8,7 @@ const app = express()
 const path = require('path')
 const configureSSL = require('./configure-ssl.js')
 
- var server = configureSSL(app)
+var server = configureSSL(app)
 
 //
 // TURN server access
@@ -16,7 +16,7 @@ var twilio = require('twilio')
 
 //console.log('process', process.env)
 
-if(process.env.TWILIO_SID) {
+if (process.env.TWILIO_SID) {
   var twilio_client = new twilio(process.env.TWILIO_SID, process.env.TWILIO_AUTH)
 }
 
@@ -38,11 +38,11 @@ var socketFromUser = {}
 
 // new connection to websocket server
 io.on('connection', function (socket) {
-  //console.log('new connection', socket.id)
+  // console.log('new connection', socket.id)
   var thisRoom = null
   socket.on('join', function (room, _userData) {
     thisRoom = room
-  //  console.log('user', JSON.stringify(_userData))
+    console.log('user', JSON.stringify(_userData))
     if (_userData.uuid) {
       userFromSocket[socket.id] = _userData.uuid
       socketFromUser[_userData.uuid] = socket.id
@@ -54,24 +54,24 @@ io.on('connection', function (socket) {
 
     io.of('/').in(room).clients(function (error, clients) {
       if (error) throw error
-   //   console.log(clients) // => [Anw2LatarvGVVXEIAAAD]
+      //   console.log(clients) // => [Anw2LatarvGVVXEIAAAD]
     })
 
     var peerUuids = peers.map(socketId => userFromSocket[socketId])
 
     // Send them to the client
-  //  socket.emit('ready', socket.id, peerUuids)
+    //  socket.emit('ready', socket.id, peerUuids)
-    if(twilio_client) {
+    if (twilio_client) {
       twilio_client.api.accounts(process.env.TWILIO_SID).tokens
-      .create({})
+        .create({})
-      .then((token) => {
+        .then((token) => {
           //  console.log(token.iceServers)
-            socket.emit('ready', {
+          socket.emit('ready', {
-              id: socket.id,
+            id: socket.id,
-              peers: peerUuids,
+            peers: peerUuids,
-              servers: token.iceServers
+            servers: token.iceServers
-            })
           })
+        })
     } else {
       socket.emit('ready', {
         id: socket.id,
@@ -86,12 +86,12 @@ io.on('connection', function (socket) {
     // io.sockets.emit('peers', peerUuids);
     socket.to(thisRoom).emit('new peer', _userData.uuid)
 
-  //  console.log('user', JSON.stringify(Object.keys(socketFromUser)))
+    //  console.log('user', JSON.stringify(Object.keys(socketFromUser)))
   })
 
   socket.on('broadcast', function (data) {
     // io.sockets.emit('broadcast', data)
-  //  console.log('broadcasting', data, socket.room)
+    //  console.log('broadcasting', data, socket.room)
     //  io.sockets.in(socket.room).emit('broadcast', data)
     socket.to(thisRoom).emit('broadcast', data)
   })
@@ -108,7 +108,7 @@ io.on('connection', function (socket) {
   })
 
   socket.on('signal', function (data) {
-   // console.log('forwarding signal ' + JSON.stringify(data))
+    // console.log('forwarding signal ' + JSON.stringify(data))
     var client = io.sockets.connected[socketFromUser[data.id]]
     client && client.emit('signal', {
       id: userFromSocket[socket.id],

frontend/web-editor/src/lib/patch-bay/pb-live.js

@@ -24,6 +24,7 @@ PBLive.prototype.init = function (stream, opts) {
     stream: stream
   }
 
+  console.log('initializing patch-bay', stream, opts)
   this.makeGlobal = opts.makeGlobal || true
   this.setPageTitle = opts.setTitle || true
 
@@ -104,7 +105,7 @@ PBLive.prototype.handleNewPeer = function (peer) {
 
 PBLive.prototype.list = function () {
   var l = Object.keys(this.idFromNick)
-  //console.log(l)
+  console.log(l)
   return Object.keys(this.idFromNick)
 }
 

frontend/web-editor/src/lib/patch-bay/rtc-patch-bay.js

@@ -44,6 +44,7 @@ var PatchBay = function (options) {
 
   // emit 'join' event to signalling server
   this.signaller.emit('join', this._room, {uuid: this.id})
+  console.log('emitting join')
 
   this.signaller.on('new peer', this._newPeer.bind(this))
 }
@@ -134,7 +135,7 @@ PatchBay.prototype._newPeer = function (peer){
 // // Once the new peer receives a list of connected peers from the server,
 // // creates new simple peer object for each connected peer.
 PatchBay.prototype._readyForSignalling = function ({ peers, servers }) {
-//  console.log("received peer list", _t, this.peers)
+console.log("received peer list", _t, this.peers)
 
   peers.forEach((peer) => {
     this._newPeer(peer)

frontend/web-editor/src/views/Hydra.js

@@ -28,7 +28,7 @@ module.exports = class Hydra extends Component {
     this.hydra = hydra
      osc().out()
 
-     pb.init(hydra.captureStream, {
+    pb.init(hydra.captureStream, {
       server: window.location.origin,
       room: 'iclc'
     })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hydra",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "",
   "main": "server.js",
   "scripts": {