Merge lp:~abranson/rockwork/jsfixes into lp:rockwork

[Andrew Branson]

Some JS fixes, including a fix for a RockWork issue. If you could check the XMLHttpRequest state flags to confirm the behaviour is the same on Ubuntu as Sailfish, that would be great. It's not behaving as I'd expect.

[Brian Douglass (bhdouglass)]

Should there be an event for timeout as well?

[lp:~abranson/rockwork/jsfixes]

120. By abranson on 2016-04-01

Make JXHR invokeCallbacks method private

121. By abranson on 2016-04-01

XMLHttpRequest listeners get 'this' set properly, and the status constants have been re-added.

[Brian Douglass (bhdouglass)]

I tested this out a little and it seems good to me.

review: Approve

=== modified file 'rockworkd/libpebble/jskit/jskitmanager.cpp'
--- rockworkd/libpebble/jskit/jskitmanager.cpp	2016-02-23 05:28:51 +0000
+++ rockworkd/libpebble/jskit/jskitmanager.cpp	2016-04-01 21:35:57 +0000
@@ -262,8 +262,11 @@
         return true;
     });
 
+    QJSValue eventObj = m_engine->newObject();
+    eventObj.setProperty("ready",m_engine->toScriptValue(true));
+    eventObj.setProperty("type","ready");
     // We try to invoke the callbacks even if script parsing resulted in error...
-    m_jspebble->invokeCallbacks("ready");
+    m_jspebble->invokeCallbacks("ready",QJSValueList({eventObj}));
 
     loadJsFile(":/cacheLocalStorage.js");
 

=== modified file 'rockworkd/libpebble/jskit/jskitsetup.js'
--- rockworkd/libpebble/jskit/jskitsetup.js	2016-02-14 01:42:48 +0000
+++ rockworkd/libpebble/jskit/jskitsetup.js	2016-04-01 21:35:57 +0000
@@ -45,7 +45,6 @@
         ['readyState', 'response', 'responseText', 'responseType', 'status',
         'statusText', 'timeout', 'onreadystatechange', 'ontimeout', 'onload',
         'onloadstart', 'onloadend', 'onprogress', 'onerror', 'onabort']);
-
     this.UNSENT = 0;
     this.OPENED = 1;
     this.HEADERS_RECEIVED = 2;
@@ -277,4 +276,4 @@
 MessageEvent._init = function(origin, data) {
     //Convenience function to call from the engine
     return new MessageEvent(origin, data)
-};
\ No newline at end of file
+};

=== modified file 'rockworkd/libpebble/jskit/jskitxmlhttprequest.cpp'
--- rockworkd/libpebble/jskit/jskitxmlhttprequest.cpp	2016-02-09 05:28:21 +0000
+++ rockworkd/libpebble/jskit/jskitxmlhttprequest.cpp	2016-04-01 21:35:57 +0000
@@ -208,6 +208,45 @@
     m_responseType = type;
 }
 
+void JSKitXMLHttpRequest::addEventListener(const QString &type, QJSValue function)
+{
+    m_listeners[type].append(function);
+}
+
+void JSKitXMLHttpRequest::removeEventListener(const QString &type, QJSValue function)
+{
+    if (!m_listeners.contains(type)) return;
+
+    QList<QJSValue> &callbacks = m_listeners[type];
+    for (QList<QJSValue>::iterator it = callbacks.begin(); it != callbacks.end(); ) {
+        if (it->strictlyEquals(function)) {
+            it = callbacks.erase(it);
+        } else {
+            ++it;
+        }
+    }
+
+    if (callbacks.empty()) {
+        m_listeners.remove(type);
+    }
+}
+
+void JSKitXMLHttpRequest::invokeCallbacks(const QString &type, const QJSValueList &args)
+{
+    if (!m_listeners.contains(type)) return;
+    QList<QJSValue> &callbacks = m_listeners[type];
+
+    for (QList<QJSValue>::iterator it = callbacks.begin(); it != callbacks.end(); ++it) {
+        qCDebug(l) << "invoking callback" << type << it->toString();
+        QJSValue result = it->callWithInstance(m_engine->newQObject(this), args);
+        if (result.isError()) {
+            qCWarning(l) << "error while invoking callback"
+                << type << it->toString() << ":"
+                << JSKitManager::describeError(result);
+        }
+    }
+}
+
 QJSValue JSKitXMLHttpRequest::response() const
 {
     if (m_responseType.isEmpty() || m_responseType == "text") {
@@ -269,6 +308,7 @@
     } else {
         qCDebug(l) << "No onload set";
     }
+    invokeCallbacks("load", QJSValueList({m_engine->newQObject(this)}));
 
     if (m_onreadystatechange.isCallable()) {
         qCDebug(l) << "going to call onreadystatechange handler:" << m_onreadystatechange.toString();
@@ -277,6 +317,7 @@
             qCWarning(l) << "JS error on onreadystatechange handler:" << JSKitManager::describeError(result);
         }
     }
+    invokeCallbacks("readystatechange", QJSValueList({m_engine->newQObject(this)}));
 }
 
 void JSKitXMLHttpRequest::handleReplyError(QNetworkReply::NetworkError code)
@@ -299,6 +340,7 @@
             qCWarning(l) << "JS error on onerror handler:" << JSKitManager::describeError(result);
         }
     }
+    invokeCallbacks("error", QJSValueList({m_engine->newQObject(this)}));
 }
 
 void JSKitXMLHttpRequest::handleAuthenticationRequired(QNetworkReply *reply, QAuthenticator *auth)

=== modified file 'rockworkd/libpebble/jskit/jskitxmlhttprequest.h'
--- rockworkd/libpebble/jskit/jskitxmlhttprequest.h	2016-02-09 05:28:21 +0000
+++ rockworkd/libpebble/jskit/jskitxmlhttprequest.h	2016-04-01 21:35:57 +0000
@@ -40,6 +40,8 @@
     Q_INVOKABLE void send(const QJSValue &data = QJSValue(QJSValue::NullValue));
     Q_INVOKABLE void abort();
 
+    Q_INVOKABLE void addEventListener(const QString &type, QJSValue function);
+    Q_INVOKABLE void removeEventListener(const QString &type, QJSValue function);
     QJSValue onload() const;
     void setOnload(const QJSValue &value);
     QJSValue onreadystatechange() const;
@@ -76,6 +78,9 @@
     void handleAuthenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
 
 private:
+    void invokeCallbacks(const QString &type, const QJSValueList &args = QJSValueList());
+
+private:
     QJSEngine *m_engine;
     QNetworkAccessManager *m_net;
     QString m_verb;
@@ -87,6 +92,7 @@
     QNetworkReply *m_reply;
     QString m_responseType;
     QByteArray m_response;
+    QHash<QString, QList<QJSValue>> m_listeners;
     QJSValue m_onload;
     QJSValue m_onreadystatechange;
     QJSValue m_ontimeout;

=== modified file 'rockworkd/libpebble/pebble.cpp'
--- rockworkd/libpebble/pebble.cpp	2016-03-14 21:13:19 +0000
+++ rockworkd/libpebble/pebble.cpp	2016-04-01 21:35:57 +0000
@@ -61,6 +61,7 @@
     m_appMsgManager = new AppMsgManager(this, m_appManager, m_connection);
     m_jskitManager = new JSKitManager(this, m_connection, m_appManager, m_appMsgManager, this);
     QObject::connect(m_jskitManager, &JSKitManager::openURL, this, &Pebble::openURL);
+    QObject::connect(m_jskitManager, &JSKitManager::appNotification, this, &Pebble::sendSimpleNotification);
     QObject::connect(m_appMsgManager, &AppMsgManager::appStarted, this, &Pebble::appStarted);
 
     m_blobDB = new BlobDB(this, m_connection);
@@ -300,6 +301,13 @@
     }
 }
 
+void Pebble::sendSimpleNotification(const QUuid &uuid, const QString &title, const QString &body) {
+    Notification notif = Notification(appInfo(uuid).shortName());
+    notif.setSubject(title);
+    notif.setBody(body);
+    sendNotification(notif);
+}
+
 void Pebble::sendNotification(const Notification &notification)
 {
     if (!notificationsFilter().value(notification.sourceId(), true)) {

=== modified file 'rockworkd/libpebble/pebble.h'
--- rockworkd/libpebble/pebble.h	2016-02-14 22:10:12 +0000
+++ rockworkd/libpebble/pebble.h	2016-04-01 21:35:57 +0000
@@ -70,6 +70,7 @@
 public slots:
     QHash<QString, bool> notificationsFilter() const;
     void setNotificationFilter(const QString &sourceId, bool enabled);
+    void sendSimpleNotification(const QUuid &uuid, const QString &title, const QString &body);
     void sendNotification(const Notification &notification);
 
     void clearTimeline();