Fixed message routing with multiple websocket clients

finos · May 27, 2019 · a228ca5 · a228ca5
1 parent 0e2bac9
commit a228ca5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/packages/perspective/src/js/perspective.js b/packages/perspective/src/js/perspective.js
@@ -769,6 +769,7 @@ export default function(Module) {
         }
         this.callbacks.push({
             view: this,
+            orig_callback: callback,
             callback: async () => {
                 switch (mode) {
                     case "cell":
@@ -1104,6 +1105,25 @@ export default function(Module) {
         return v;
     };
 
+    let meter;
+
+    function initialize_profile_thread() {
+        if (meter === undefined) {
+            let _msgs = 0;
+            let start = performance.now();
+            setTimeout(function poll() {
+                let now = performance.now();
+                console.log(`${((1000 * _msgs) / (now - start)).toFixed(2)} msgs/sec`);
+                _msgs = 0;
+                start = now;
+                setTimeout(poll, 5000);
+            }, 5000);
+            meter = function update(x) {
+                _msgs += x;
+            };
+        }
+    }
+
     /**
      * Updates the rows of a {@link module:perspective~table}. Updated rows are pushed down to any
      * derived {@link module:perspective~view} objects.
@@ -1129,6 +1149,9 @@ export default function(Module) {
                 throw new Error("Overriding Arrow Schema is not supported.");
             }
             pdata = load_arrow_buffer(data, cols, types);
+            if (meter) {
+                meter(pdata.map(x => x.row_count).reduce((x, y) => x + y));
+            }
             is_arrow = true;
         } else if (typeof data === "string") {
             if (data[0] === ",") {
@@ -1137,10 +1160,16 @@ export default function(Module) {
             accessor.init(__MODULE__, papaparse.parse(data.trim(), {header: true}).data);
             accessor.names = cols;
             accessor.types = accessor.extract_typevec(types).slice(0, cols.length);
+            if (meter) {
+                meter(accessor.row_count);
+            }
         } else {
             accessor.init(__MODULE__, data);
             accessor.names = cols;
             accessor.types = accessor.extract_typevec(types).slice(0, cols.length);
+            if (meter) {
+                meter(accessor.row_count);
+            }
         }
 
         if (accessor.row_count === 0) {

diff --git a/packages/perspective/src/js/perspective.node.js b/packages/perspective/src/js/perspective.node.js
@@ -152,7 +152,7 @@ class WebSocketHost extends module.exports.Host {
                     return;
                 }
                 msg = JSON.parse(msg);
-                const compound_id = msg.id + ws.id;
+                const compound_id = `${msg.id}/${ws.id}`;
                 this.REQ_ID_MAP.set(compound_id, msg.id);
                 msg.id = compound_id;
                 this.REQS[msg.id] = {ws, msg};