Merge pull request #4 from Triadica/disable-raf

expose disable-raf option

package.json

@@ -10,7 +10,7 @@
     "rcontrol": "./server.mjs"
   },
   "devDependencies": {
-    "@triadica/touch-control": "^0.0.3",
+    "@triadica/touch-control": "^0.0.4-a1",
     "@types/ws": "^8.5.5",
     "git-describe": "^4.1.1",
     "query-string": "^8.1.0",

server.mjs

@@ -4,8 +4,12 @@ import { WebSocketServer } from "ws";
 
 let port = parseInt(process.env.PORT || "6200");
 
+let verbose = process.env.verbose;
+
 const wss = new WebSocketServer({ port, host: "0.0.0.0" });
 
+let lastTime = Date.now();
+
 wss.on("connection", function connection(ws) {
   console.log(`new connection. (${wss.clients.size})`);
 
@@ -19,7 +23,11 @@ wss.on("connection", function connection(ws) {
       ws.controlSender = true;
       console.log("sender declared");
     } else if (op.action === "control" || op.action === "button") {
-      // console.log("control clients:", wss.clients.size);
+      let now = Date.now();
+      if (verbose === "true") {
+        console.debug("control time delta:", now - lastTime);
+      }
+      lastTime = now;
       wss.clients.forEach((client) => {
         if (client !== ws && !client.controlSender) {
           client.send(s);

src/main.mts

@@ -9,6 +9,7 @@ const parsed = queryString.parse(location.search);
 
 let host = (parsed.host as string) || location.hostname;
 let port = parseInt((parsed.port as string) || "6200");
+let disableRaf = parsed["disable-raf"] === "true";
 
 let connected = false;
 
@@ -72,27 +73,31 @@ let allZero = (xs: number[]): boolean => {
 let main = () => {
   connect();
   renderControl();
-  startControlLoop(10, (elapsed, states, delta) => {
-    showData(elapsed, states, delta);
-    if (connected) {
-      if (
-        allZero(delta.leftMove) &&
-        allZero(delta.rightMove) &&
-        allZero(states.leftMove) &&
-        allZero(states.rightMove)
-      ) {
-        return;
+  startControlLoop(
+    10,
+    (elapsed, states, delta) => {
+      showData(elapsed, states, delta);
+      if (connected) {
+        if (
+          allZero(delta.leftMove) &&
+          allZero(delta.rightMove) &&
+          allZero(states.leftMove) &&
+          allZero(states.rightMove)
+        ) {
+          return;
+        }
+        ws.send(
+          JSON.stringify({
+            action: "control",
+            elapsed,
+            states,
+            delta,
+          })
+        );
       }
-      ws.send(
-        JSON.stringify({
-          action: "control",
-          elapsed,
-          states,
-          delta,
-        })
-      );
-    }
-  });
+    },
+    { disableRaf }
+  );
 
   console.log("hash:", __COMMIT_HASH__);
   document.querySelector(".hash")!.innerHTML = __COMMIT_HASH__;