corrade-lsl-templates – Diff between revs 41 and 42

Subversion Repositories:

?pathlinks?

Rev 41 – Details – Blame – Last modification – View Log

     list a = llParseStringKeepNulls(data, ["&", "="], []);
     integer i = llListFindList(llList2ListStrided(a, 0, -1, 2), [ k ]);
     if(i != -1) return llList2String(a, 2*i+1);
     return "";
+}
 ///////////////////////////////////////////////////////////////////////////
 //    Copyright (C) 2013 Wizardry and Steamworks - License: CC BY 2.0    //
 ///////////////////////////////////////////////////////////////////////////
 string wasKeyValueEncode(list data) {
     list k = llList2ListStrided(data, 0, -1, 2);
     list v = [];
     do {
         string a = llDumpList2String(
             llParseStringKeepNulls(
                 llList2String(
                     l,
                 ),
                 ["\""],
                 []
             ),
             "\"\""
         );
         if(llParseStringKeepNulls(
             a,
             [" ", ",", "\n", "\""], []
             ) !=
             (list) a
         ) a = "\"" + a + "\"";
         v += a;
         l = llDeleteSubList(l, 0, 0);
     } while(l != []);
     return llUnescapeURL(
         llDumpList2String(
             llParseString2List(
                 llDumpList2String(
                     llParseString2List(
                         i,
                         ["+"],
                         []
                     ),
                     " "
                 ),
                 ["%0D%0A"],
                 []
             ),
             "\n"
+        )
     );
+}
+    }
     on_rez(integer num) {
         llResetScript();
+    }
     changed(integer change) {
         if((change & CHANGED_INVENTORY) ||
             (change & CHANGED_REGION_START) ||
             (change & CHANGED_OWNER)) {
             llResetScript();
+        }
+    }
     state_exit() {
+    }
     link_message(integer sender, integer num, string message, key id) {
         // We only care about notifications now.
         if(id != "notification")
             return;
         // This script only processes group notifications.
         if(wasKeyValueGet("type", message) != "group" ||
             (wasKeyValueGet("type", message) == "group" &&
             wasURLUnescape(wasKeyValueGet("group", message)) !=
             wasKeyValueGet("group", configuration)))
             return;
         // Get the sent message.
         data = wasURLUnescape(
             wasKeyValueGet(
                 "message",
                 message
+            )
         );
         // Check if this is an eggdrop command.
         if(llGetSubString(data, 0, 0) !=
             wasKeyValueGet("command", configuration))
             return;
         // Check if the command matches the current module.
         list command = llParseString2List(data, [" "], []);
         if(llList2String(command, 0) !=
             wasKeyValueGet("command", configuration) + "heartbeat")
             return;
         // Remove command.
         command = llDeleteSubList(command, 0, 0);
-        // Get an URL.
-        state url;
-    }
-    on_rez(integer num) {
-        llResetScript();
-    }
-    changed(integer change) {
-        if((change & CHANGED_INVENTORY) ||
-            (change & CHANGED_REGION_START) ||
-            (change & CHANGED_OWNER)) {
-            llResetScript();
-        }
-    }
-}
-state url {
-    state_entry() {
-        // DEBUG
-        llOwnerSay("[Heartbeat] Requesting URL...");
-        llRequestURL();
-    }
-    http_request(key id, string method, string body) {
-        if(method != URL_REQUEST_GRANTED) return;
-        URL = body;
-        // DEBUG
-        llOwnerSay("[Heartbeat] Got URL...");
+        // Get heartbeat.
-        state version;
+        state heartbeat;
+    }
     on_rez(integer num) {
         llResetScript();
+    }
     changed(integer change) {
         if((change & CHANGED_INVENTORY) ||
             (change & CHANGED_REGION_START) ||
             (change & CHANGED_OWNER)) {
             llResetScript();
+        }
+    }
 }
-state version {
+state heartbeat {
     state_entry() {
         // DEBUG
         llOwnerSay("[Heartbeat] Getting heartbeat data...");
         llInstantMessage(
             wasKeyValueGet(
                 "corrade",
                 configuration
             ),
             wasKeyValueEncode(
+                [
                     "command", "getheartbeatdata",
                     "group", wasURLEscape(
                         wasKeyValueGet(
                             "group",
                             configuration
+                        )
                     ),
                     "password", wasURLEscape(
                         wasKeyValueGet(
                             "password",
                             configuration
+                        )
                     ),
                     "data", wasListToCSV(
+                        [
+                            "AverageCPUUsage",
-                            "AverageCPUUsage",
+                            "AverageRAMUsage",
-                            "AverageRAMUsage",
+                            "AverageNETUsage",
                             "Uptime"
                         ]
+                    ),
+                    "callback", wasURLEscape(
+                        wasKeyValueGet(
+                            "URL",
+                            configuration
                     ),
                     "callback", wasURLEscape(URL)
+                ]
+            )
         );
         llSetTimerEvent(60);
     }
-    http_request(key id, string method, string body) {
-        llHTTPResponse(id, 200, "OK");
+    link_message(integer sender, integer num, string body, key id) {
+        // Only process callbacks for the database command.
+        if(id != "callback" || wasKeyValueGet("command", body) != "getheartbeatdata")
-        llReleaseURL(URL);
+            return;
         if(wasKeyValueGet("command", body) != "getheartbeatdata" ||
-            wasKeyValueGet("success", body) != "True") {
+        if(wasKeyValueGet("success", body) != "True") {
             // DEBUG
             llOwnerSay("[Heartbeat] Unable to get heartbeat data: " +
                 wasURLUnescape(
                     wasKeyValueGet("error", body)
+                )
             );
             state listen_group;
+        }
         list stats = wasCSVToList(
             wasURLUnescape(
                 wasKeyValueGet(
                     "data",
                     body
+                )
             )
         );
         string CPU = llList2String(
             stats,
             llListFindList(
                 stats,
                 ["AverageCPUUsage"]
             ) + 1
         );
         // AverageRAMUsage is returned in bytes,
         // so convert the value to MiB and round.
         string RAM = (string)llRound(
             llList2Float(
                 stats,
                 llListFindList(
                     stats,
                     ["AverageRAMUsage"]
                 ) + 1
             ) / 1024 / 1024
+        );
+        // AverageNETUsage is returned in bytes,
+        // so convert the value to MiB and round.
+        string NET = (string)llRound(
+            llList2Float(
+                stats,
+                llListFindList(
+                    stats,
+                    ["AverageNETUsage"]
+                ) + 1
+            ) / 1024 / 1024
         );
         string uptime = llList2String(
             stats,
             llListFindList(
                 stats,
                 ["Uptime"]
             ) + 1
         );
-        data = "RAM: " + RAM + "MiB" + " CPU: " + CPU + "%" + " Uptime: " + uptime;
+        data = "RAM: " + RAM + "MiB" + " CPU: " + CPU + "%" + " NET: " + NET + "MiB" + " Uptime: " + uptime;
         state tell;
-    }
     timer() {
-        llReleaseURL(URL);
+    timer() {
         state listen_group;
+    }
     on_rez(integer num) {
         llResetScript();
     }
     changed(integer change) {
         if((change & CHANGED_INVENTORY) ||
             (change & CHANGED_REGION_START) ||
             (change & CHANGED_OWNER)) {
             llResetScript();
+        }
     state_entry() {
         // DEBUG
         llOwnerSay("[Heartbeat] Sending to group.");
         llInstantMessage(
             wasKeyValueGet(
                 "corrade",
                 configuration
             ),
             wasKeyValueEncode(
+                [
                     "command", "tell",
                     "group", wasURLEscape(
                         wasKeyValueGet(
                             "group",
                             configuration
+                        )
                     ),
                     "password", wasURLEscape(
                         wasKeyValueGet(
                             "password",
                             configuration
+                        )
                     ),
                     "entity", "group",
                     "message", wasURLEscape(data)