diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2013-12-28 16:59:02 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 15:04:48 +0100 |
commit | 4d3167b97b8e48a9fcdb1c2b86467d75e7d669eb (patch) | |
tree | 0e335790074632bf05d62f276e9334ba54a41926 /src | |
parent | a5d8d21e5ff33b88c15f4767b3a0d04ad4dbed7a (diff) | |
download | qtwebchannel-4d3167b97b8e48a9fcdb1c2b86467d75e7d669eb.tar.gz |
Simplify QWebChannel usage by merging webchannel.js and qobject.js.
The code now resides in a single qwebchannel.js file and there is only
a single callback-nesting required to setup a MetaObjectPublisher
connection.
The server-side will be simplified in the next step.
Change-Id: Ib5fc77a03c2b281c61af91713411eed571ec6108
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/webchannel/qwebchannel.js (renamed from src/webchannel/qobject.js) | 211 | ||||
-rw-r--r-- | src/webchannel/resources.qrc | 3 | ||||
-rw-r--r-- | src/webchannel/webchannel.js | 129 | ||||
-rw-r--r-- | src/webchannel/webchannel.pro | 3 |
4 files changed, 153 insertions, 193 deletions
diff --git a/src/webchannel/qobject.js b/src/webchannel/qwebchannel.js index 5fae44c..fe3c650 100644 --- a/src/webchannel/qobject.js +++ b/src/webchannel/qwebchannel.js @@ -42,6 +42,157 @@ "use strict"; +var QWebChannel = function(baseUrl, initCallback, rawChannel) +{ + var channel = this; + // support multiple channels listening to the same socket + // the responses to channel.exec must be distinguishable + // see: http://stackoverflow.com/a/2117523/35250 + this.id = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { + var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8); + return v.toString(16); + }); + ///TODO: use ssl? + var socketUrl = "ws://" + baseUrl; + this.socket = new WebSocket(socketUrl, "QWebChannel"); + this.send = function(data) + { + if (typeof(data) !== "string") { + data = JSON.stringify(data); + } + channel.socket.send(data); + }; + + this.socket.onopen = function() + { + if (rawChannel) { + initCallback(channel); + } else { + channel.initMetaObjectPublisher(initCallback); + } + }; + this.socket.onclose = function() + { + console.error("web channel closed"); + }; + this.socket.onerror = function(error) + { + console.error("web channel error: " + error); + }; + this.socket.onmessage = function(message) + { + var jsonData = JSON.parse(message.data); + if (jsonData.id === undefined) { + console.error("invalid message received:", message.data); + return; + } + if (jsonData.data === undefined) { + jsonData.data = {}; + } + if (jsonData.response) { + if (jsonData.id[0] === channel.id) { + channel.execCallbacks[jsonData.id[1]](jsonData.data); + delete channel.execCallbacks[jsonData.id]; + } + } else if (channel.subscriptions[jsonData.id]) { + channel.subscriptions[jsonData.id].forEach(function(callback) { + (callback)(jsonData.data); } + ); + } + }; + + this.subscriptions = {}; + this.subscribe = function(id, callback) + { + if (channel.subscriptions[id]) { + channel.subscriptions[id].push(callback); + } else { + channel.subscriptions[id] = [callback]; + } + }; + + this.execCallbacks = {}; + this.execId = 0; + this.exec = function(data, callback) + { + if (!callback) { + // if no callback is given, send directly + channel.send({data: data}); + return; + } + if (channel.execId === Number.MAX_VALUE) { + // wrap + channel.execId = Number.MIN_VALUE; + } + var id = channel.execId++; + channel.execCallbacks[id] = callback; + channel.send({"id": [channel.id, id], "data": data}); + }; + + this.objectMap = {}; + + this.initMetaObjectPublisher = function(doneCallback) + { + // prevent multiple initialization which might happen with multiple webchannel clients. + var initialized = false; + + console.log(channel); + channel.subscribe( + "Qt.signal", + function(payload) { + var object = window[payload.object] || channel.objectMap[payload.object]; + if (object) { + object.signalEmitted(payload.signal, payload.args); + } else { + console.warn("Unhandled signal: " + payload.object + "::" + payload.signal); + } + } + ); + + channel.subscribe( + "Qt.propertyUpdate", + function(payload) { + for (var i in payload) { + var data = payload[i]; + var object = window[data.object] || channel.objectMap[data.object]; + if (object) { + object.propertyUpdate(data.signals, data.properties); + } else { + console.warn("Unhandled property update: " + data.object + "::" + data.signal); + } + } + setTimeout(function() { channel.exec({type: "Qt.idle"}); }, 0); + } + ); + + channel.subscribe( + "Qt.init", + function(payload) { + if (initialized) { + return; + } + initialized = true; + for (var objectName in payload) { + var data = payload[objectName]; + var object = new QObject(objectName, data, channel); + window[objectName] = object; + } + if (doneCallback) { + doneCallback(channel); + } + setTimeout(function() { channel.exec({type: "Qt.idle"}); }, 0); + } + ); + + channel.debug = function(message) + { + channel.send({"data" : {"type" : "Qt.Debug", "message" : message}}); + }; + + channel.exec({type:"Qt.init"}); + } +}; + function QObject(name, data, webChannel) { this.__id__ = name; @@ -244,63 +395,3 @@ function QObject(name, data, webChannel) object[name] = data.enums[name]; } } - -window.setupQObjectWebChannel = function(webChannel, doneCallback) -{ - // prevent multiple initialization which might happen with multiple webchannel clients. - var initialized = false; - - webChannel.subscribe( - "Qt.signal", - function(payload) { - var object = window[payload.object] || webChannel.objectMap[payload.object]; - if (object) { - object.signalEmitted(payload.signal, payload.args); - } else { - console.warn("Unhandled signal: " + payload.object + "::" + payload.signal); - } - } - ); - - webChannel.subscribe( - "Qt.propertyUpdate", - function(payload) { - for (var i in payload) { - var data = payload[i]; - var object = window[data.object] || webChannel.objectMap[data.object]; - if (object) { - object.propertyUpdate(data.signals, data.properties); - } else { - console.warn("Unhandled property update: " + data.object + "::" + data.signal); - } - } - setTimeout(function() { webChannel.exec({type: "Qt.idle"}); }, 0); - } - ); - - webChannel.subscribe( - "Qt.init", - function(payload) { - if (initialized) { - return; - } - initialized = true; - for (var objectName in payload) { - var data = payload[objectName]; - var object = new QObject(objectName, data, webChannel); - window[objectName] = object; - } - if (doneCallback) { - doneCallback(); - } - setTimeout(function() { webChannel.exec({type: "Qt.idle"}); }, 0); - } - ); - - webChannel.exec({type:"Qt.init"}); - - webChannel.debug = function(message) - { - webChannel.send({"data" : {"type" : "Qt.Debug", "message" : message}}); - }; -}; diff --git a/src/webchannel/resources.qrc b/src/webchannel/resources.qrc index 821e911..30a3e96 100644 --- a/src/webchannel/resources.qrc +++ b/src/webchannel/resources.qrc @@ -1,6 +1,5 @@ <RCC> <qresource prefix="/qwebchannel/"> - <file>webchannel.js</file> - <file>qobject.js</file> + <file>qwebchannel.js</file> </qresource> </RCC> diff --git a/src/webchannel/webchannel.js b/src/webchannel/webchannel.js deleted file mode 100644 index 8827cbf..0000000 --- a/src/webchannel/webchannel.js +++ /dev/null @@ -1,129 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Copyright (C) 2013 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com> -** Contact: http://www.qt-project.org/legal -* -** This file is part of the QtWebChannel module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -"use strict"; - -var QWebChannel = function(baseUrl, initCallback) -{ - var channel = this; - // support multiple channels listening to the same socket - // the responses to channel.exec must be distinguishable - // see: http://stackoverflow.com/a/2117523/35250 - this.id = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) { - var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8); - return v.toString(16); - }); - ///TODO: use ssl? - var socketUrl = "ws://" + baseUrl; - this.socket = new WebSocket(socketUrl, "QWebChannel"); - this.send = function(data) - { - if (typeof(data) !== "string") { - data = JSON.stringify(data); - } - channel.socket.send(data); - }; - - this.socket.onopen = function() - { - initCallback(channel); - }; - this.socket.onclose = function() - { - console.error("web channel closed"); - }; - this.socket.onerror = function(error) - { - console.error("web channel error: " + error); - }; - this.socket.onmessage = function(message) - { - var jsonData = JSON.parse(message.data); - if (jsonData.id === undefined) { - console.error("invalid message received:", message.data); - return; - } - if (jsonData.data === undefined) { - jsonData.data = {}; - } - if (jsonData.response) { - if (jsonData.id[0] === channel.id) { - channel.execCallbacks[jsonData.id[1]](jsonData.data); - delete channel.execCallbacks[jsonData.id]; - } - } else if (channel.subscriptions[jsonData.id]) { - channel.subscriptions[jsonData.id].forEach(function(callback) { - (callback)(jsonData.data); } - ); - } - }; - - this.subscriptions = {}; - this.subscribe = function(id, callback) - { - if (channel.subscriptions[id]) { - channel.subscriptions[id].push(callback); - } else { - channel.subscriptions[id] = [callback]; - } - }; - - this.execCallbacks = {}; - this.execId = 0; - this.exec = function(data, callback) - { - if (!callback) { - // if no callback is given, send directly - channel.send({data: data}); - return; - } - if (channel.execId === Number.MAX_VALUE) { - // wrap - channel.execId = Number.MIN_VALUE; - } - var id = channel.execId++; - channel.execCallbacks[id] = callback; - channel.send({"id": [channel.id, id], "data": data}); - }; - - this.objectMap = {}; -}; diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro index a0041bf..376711d 100644 --- a/src/webchannel/webchannel.pro +++ b/src/webchannel/webchannel.pro @@ -8,8 +8,7 @@ RESOURCES += \ resources.qrc OTHER_FILES = \ - webchannel.js \ - qobject.js + qwebchannel.js PUBLIC_HEADERS += \ qwebchannel.h \ |