From: Insoon Kim Date: Fri, 29 Apr 2022 10:40:12 +0000 (+0900) Subject: Enable signaling server for public X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72756abae052c047510a53bf6c214f16ee86f9e3;p=platform%2Fframework%2Fweb%2Fwrtjs.git 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 --- diff --git a/device_home/service.js b/device_home/service.js index 17cd727b..5876d1fc 100644 --- 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 44998f09..b85fc8e3 100644 --- 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 bb1f7266..d5f503e7 100644 --- 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 b729517a..929c6642 100644 --- 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)