Version 0.3.2, rev351, Sidebar to display site infos an modify settings, Per-site upload/download bytes statistics, Deny different origin media requests, Allow 10sec to finish query modifications, Websocket display errors to client instead of disconnecting, Allow specify notification id to server-side messages, Track every command response time

src/Ui/UiWebsocket.py

@@ -57,14 +57,18 @@ class UiWebsocket(object):
         while True:
             try:
                 message = ws.receive()
-                if message:
-                    self.handleRequest(message)
             except Exception, err:
-                if err.message != 'Connection is already closed':
+                self.log.error("WebSocket receive error: %s" % err)
+                return "Bye."  # Close connection
+
+            if message:
+                try:
+                    self.handleRequest(message)
+                except Exception, err:
                     if config.debug:  # Allow websocket errors to appear on /Debug
                         sys.modules["main"].DebugHook.handleError()
-                    self.log.error("WebSocket error: %s" % Debug.formatException(err))
-                return "Bye."
+                    self.log.error("WebSocket handleRequest error: %s" % err)
+                    self.cmd("error", "Internal error: %s" % err)
 
     # Event in a channel
     def event(self, channel, *params):
@@ -138,8 +142,10 @@ class UiWebsocket(object):
             func(req["id"], **params)
         elif type(params) is list:
             func(req["id"], *params)
-        else:
+        elif params:
             func(req["id"], params)
+        else:
+            func(req["id"])
 
     # Format site info
     def formatSiteInfo(self, site, create_user=True):
@@ -170,7 +176,7 @@ class UiWebsocket(object):
             "bad_files": len(site.bad_files),
             "size_limit": site.getSizeLimit(),
             "next_size_limit": site.getNextSizeLimit(),
-            "peers": site.settings.get("peers", len(site.peers)),
+            "peers": max(site.settings.get("peers", 0), len(site.peers)),
             "started_task_num": site.worker_manager.started_task_num,
             "tasks": len(site.worker_manager.tasks),
             "workers": len(site.worker_manager.workers),
@@ -404,7 +410,7 @@ class UiWebsocket(object):
             if auth_address == cert["auth_address"]:
                 active = domain
             title = cert["auth_user_name"] + "@" + domain
-            if domain in accepted_domains:
+            if domain in accepted_domains or not accepted_domains:
                 accounts.append([domain, title, ""])
             else:
                 accounts.append([domain, title, "disabled"])
@@ -527,7 +533,7 @@ class UiWebsocket(object):
         gevent.spawn(new_site.announce)
 
     def actionSiteSetLimit(self, to, size_limit):
-        self.site.settings["size_limit"] = size_limit
+        self.site.settings["size_limit"] = int(size_limit)
         self.site.saveSettings()
         self.response(to, "Site size limit changed to %sMB" % size_limit)
         self.site.download(blind_includes=True)

src/Ui/media/Wrapper.coffee

@@ -49,7 +49,11 @@ class Wrapper
 			else
 				@sendInner message # Pass message to inner frame
 		else if cmd == "notification" # Display notification
-			@notifications.add("notification-#{message.id}", message.params[0], message.params[1], message.params[2])
+			type = message.params[0]
+			id = "notification-#{message.id}"
+			if "-" in message.params[0]  # - in first param: message id definied
+				[id, type] = message.params[0].split("-")
+			@notifications.add(id, type, message.params[1], message.params[2])
 		else if cmd == "prompt" # Prompt input
 			@displayPrompt message.params[0], message.params[1], message.params[2], (res) =>
 				@ws.response message.id, res
@@ -57,6 +61,8 @@ class Wrapper
 			@sendInner message # Pass to inner frame
 			if message.params.address == @address # Current page
 				@setSiteInfo message.params
+		else if cmd == "error"
+			@notifications.add("notification-#{message.id}", "error", message.params, 0)
 		else if cmd == "updating" # Close connection
 			@ws.ws.close()
 			@ws.onCloseWebsocket(null, 4000)

src/Ui/media/Wrapper.css

@@ -7,13 +7,17 @@ a { color: black }
 #inner-iframe { width: 100%; height: 100%; position: absolute; border: 0px } /*; transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out*/
 #inner-iframe.back { transform: scale(0.95) translate(-300px, 0px); opacity: 0.4 }
 
-.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; border-radius: 2px; text-decoration: none; transition: all 0.5s; }
+.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; border-radius: 2px; text-decoration: none; transition: all 0.5s; background-position: left center; }
 .button:hover { background-color: #FFF400; border-bottom: 2px solid #4D4D4C; transition: none }
 .button:active { position: relative; top: 1px }
 
 .button-Delete { background-color: #e74c3c; border-bottom-color: #c0392b; color: white }
 .button-Delete:hover { background-color: #FF5442; border-bottom-color: #8E2B21 }
 
+.button.loading {
+	color: rgba(0,0,0,0); background: #999 url(img/loading.gif) no-repeat center center;
+	transition: all 0.5s ease-out ; pointer-events: none; border-bottom: 2px solid #666
+}
 
 /* Fixbutton */
 

src/Ui/media/all.css

@@ -12,13 +12,17 @@ a { color: black }
 #inner-iframe { width: 100%; height: 100%; position: absolute; border: 0px } /*; transition: all 0.8s cubic-bezier(0.68, -0.55, 0.265, 1.55), opacity 0.8s ease-in-out*/
 #inner-iframe.back { -webkit-transform: scale(0.95) translate(-300px, 0px); -moz-transform: scale(0.95) translate(-300px, 0px); -o-transform: scale(0.95) translate(-300px, 0px); -ms-transform: scale(0.95) translate(-300px, 0px); transform: scale(0.95) translate(-300px, 0px) ; opacity: 0.4 }
 
-.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; -webkit-border-radius: 2px; -moz-border-radius: 2px; -o-border-radius: 2px; -ms-border-radius: 2px; border-radius: 2px ; text-decoration: none; -webkit-transition: all 0.5s; -moz-transition: all 0.5s; -o-transition: all 0.5s; -ms-transition: all 0.5s; transition: all 0.5s ; }
+.button { padding: 5px 10px; margin-left: 10px; background-color: #FFF85F; border-bottom: 2px solid #CDBD1E; -webkit-border-radius: 2px; -moz-border-radius: 2px; -o-border-radius: 2px; -ms-border-radius: 2px; border-radius: 2px ; text-decoration: none; -webkit-transition: all 0.5s; -moz-transition: all 0.5s; -o-transition: all 0.5s; -ms-transition: all 0.5s; transition: all 0.5s ; background-position: left center; }
 .button:hover { background-color: #FFF400; border-bottom: 2px solid #4D4D4C; -webkit-transition: none ; -moz-transition: none ; -o-transition: none ; -ms-transition: none ; transition: none  }
 .button:active { position: relative; top: 1px }
 
 .button-Delete { background-color: #e74c3c; border-bottom-color: #c0392b; color: white }
 .button-Delete:hover { background-color: #FF5442; border-bottom-color: #8E2B21 }
 
+.button.loading {
+	color: rgba(0,0,0,0); background: #999 url(img/loading.gif) no-repeat center center;
+	-webkit-transition: all 0.5s ease-out ; -moz-transition: all 0.5s ease-out ; -o-transition: all 0.5s ease-out ; -ms-transition: all 0.5s ease-out ; transition: all 0.5s ease-out  ; pointer-events: none; border-bottom: 2px solid #666
+}
 
 /* Fixbutton */
 

src/Ui/media/all.js

@@ -758,6 +758,7 @@ jQuery.extend( jQuery.easing,
 (function() {
   var Wrapper, origin, proto, ws_url,
     __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
     __slice = [].slice;
 
   Wrapper = (function() {
@@ -810,7 +811,7 @@ jQuery.extend( jQuery.easing,
     }
 
     Wrapper.prototype.onMessageWebsocket = function(e) {
-      var cmd, message;
+      var cmd, id, message, type, _ref;
       message = JSON.parse(e.data);
       cmd = message.cmd;
       if (cmd === "response") {
@@ -820,7 +821,12 @@ jQuery.extend( jQuery.easing,
           return this.sendInner(message);
         }
       } else if (cmd === "notification") {
-        return this.notifications.add("notification-" + message.id, message.params[0], message.params[1], message.params[2]);
+        type = message.params[0];
+        id = "notification-" + message.id;
+        if (__indexOf.call(message.params[0], "-") >= 0) {
+          _ref = message.params[0].split("-"), id = _ref[0], type = _ref[1];
+        }
+        return this.notifications.add(id, type, message.params[1], message.params[2]);
       } else if (cmd === "prompt") {
         return this.displayPrompt(message.params[0], message.params[1], message.params[2], (function(_this) {
           return function(res) {
@@ -832,6 +838,8 @@ jQuery.extend( jQuery.easing,
         if (message.params.address === this.address) {
           return this.setSiteInfo(message.params);
         }
+      } else if (cmd === "error") {
+        return this.notifications.add("notification-" + message.id, "error", message.params, 0);
       } else if (cmd === "updating") {
         this.ws.ws.close();
         return this.ws.onCloseWebsocket(null, 4000);