Enable signaling server for public

This patch enables the signaling server with the test self signed
certificate only for public.
socket.io send does not throw exception. But the message port throws an
exception, which causes a crash when the web app is closed. This commit
also fixes it.

Change-Id: I5b9f05ceae53579bec621d47341009428c8ea715
Signed-off-by: Insoon Kim <is46.kim@samsung.com>

diff --git a/device_home/service.js b/device_home/service.js
index 17cd727b65a29636039a92a48d5249b938f47668..5876d1fc11f518d12b9ff06ff09c9d694e15f026 100644 (file)
--- a/device_home/service.js
+++ b/device_home/service.js
@@ -1,9 +1,16 @@
 const deviceHome = require('./service/service');
+const fs = require('fs');
 
 module.exports.onStart = async function() {
   deviceHome.onStart();
-  // Temporarily remove the signaling server
-  // require('./signaling_server/gen/app');
+  try {
+    if (fs.existsSync(`${__dirname}/signaling_server/gen/key.pem`)) {
+      console.log('Starting signaling server...');
+      require('./signaling_server/gen/app');
+    }
+  } catch (err) {
+    console.warn('Failed to start signaling server. ' + err);
+  }
 };
 
 module.exports.onStop = function() {

diff --git a/device_home/signaling_server/gen/app.js b/device_home/signaling_server/gen/app.js
index 44998f09ce397c2d9a9335f0594d1c7432247ff5..b85fc8e3e1bf4465557a33663cbb685b80f1dfcc 100644 (file)
--- a/device_home/signaling_server/gen/app.js
+++ b/device_home/signaling_server/gen/app.js
@@ -350,6 +350,10 @@ if (supportMessagePort) {
       startServer();
     } else {
       const socket = sockets.get(id);
+      if (!socket) {
+        console.warn(TAG, `socket does not exist. id:${id}, event:${event}`);
+        return;
+      }
       socket.handleEvents(event, value.data);
     }
   });

diff --git a/device_home/signaling_server/gen/socket-tizen.js b/device_home/signaling_server/gen/socket-tizen.js
index bb1f7266b3ac4b636874b094613e5d92ec0e6c26..d5f503e7471a8526ca22765ef15eb1c952c66f1e 100644 (file)
--- a/device_home/signaling_server/gen/socket-tizen.js
+++ b/device_home/signaling_server/gen/socket-tizen.js
@@ -42,8 +42,8 @@ class SocketTizen {
         this._localPort
       );
     } catch (error) {
-      console.error(TAG, 'Messageport emit failed:' + error);
-      throw new Error('Messageport emit failed');
+      console.error(TAG, 'Messageport emit failed. ' + error);
+      this.handleEvents('disconnect', { reason: 'transport error', details: error.message });
     }
   }
 

diff --git a/packaging/wrtjs.spec b/packaging/wrtjs.spec
index b729517af4aa47a3b67a4e7fa1f9e7bd97f33eff..929c6642a3c69853f19538e7ccf4fdd58db4ded4 100644 (file)
--- a/packaging/wrtjs.spec
+++ b/packaging/wrtjs.spec
@@ -26,6 +26,7 @@ Source:     %{name}-%{version}.tar.gz
   %define _use_nmt 1
 %endif
   %define _use_category 1
+  %define _use_d2d_offload 1
 %endif
 
 BuildRequires: pkgconfig(chromium-efl)