feat: WIP add websocket for remote connections

this currently uses the websocket for all connections.
lart2150 · Dec 31, 2023 · d745d69 · d745d69
1 parent 06613aa
commit d745d69
Show file tree

Hide file tree

Showing 7 changed files with 447 additions and 190 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,10 @@
+/rc_images
+/dist
+/release
+/bin
+/.gradle
+/.settings
+/config.ini
+/css
+/cdata.*
+/*.jar
diff --git a/lib/Java-WebSocket-1.5.5.jar b/lib/Java-WebSocket-1.5.5.jar
diff --git a/src/com/tivo/kmttg/gui/remote/info.java b/src/com/tivo/kmttg/gui/remote/info.java
@@ -240,61 +240,61 @@ private void RC_infoCB(final String tivoName) {
                            info += String.format("%-30s %s\n", fields[i], json.get(fields[i]));
                      }
 
-                     if (! r.awayMode() ) {
-                        // More detailed info
-                        JSONObject j = new JSONObject();
-                        j.put("bodyId", r.bodyId_get());
-                        JSONObject response = r.Command("systemInformationGet", j);
-                        if (response != null) {
-                           String integers[] = {
-                              "remoteAddress", "recordingCapacityHdHours",
-                              "recordingCapacitySdHours", "freeDiskSpaceSdHours",
-                              "freeDiskSpaceHdHours"
-                           };
-                           String strings[] = {
-                              "internalTemperature",
-                              "zipCode", "remoteBatteryLevel", "activeVideoOutputFormat",
-                              "platform", "netflixEsn",
-                              "hdcpVersionInfo", "collabSliceVersion",
-                              "programInfoTo", "gcCompletionTime", "indexCompletionTime",
-                              "dialInCode", "serviceState", "serviceLevel", "serviceMapInfo",
-                           };
-                           String jsons[] = { "serviceConnectionInfo", "vcmConnectionInfo" };
-                           for (int i=0; i<strings.length; ++i) {
-                              if (response.has(strings[i]))
-                                 info += String.format(
-                                    "%-30s %s\n", strings[i], response.getString(strings[i])
-                                 );
-                           }                           
-                           for (int i=0; i<jsons.length; ++i) {
-                              if (response.has(jsons[i])) {
-                                 response.getJSONObject(jsons[i]).remove("type");
-                                 info += String.format(
-                                    "%s:\n%s\n", jsons[i], response.getJSONObject(jsons[i]).toString(3)
-                                 );
-                              }
-                           }                           
-                           for (int i=0; i<integers.length; ++i) {
-                              if (response.has(integers[i]))
-                                 info += String.format(
-                                    "%-30s %d\n", integers[i], response.getInt(integers[i])
-                                 );
+                     // More detailed info
+                     JSONObject j = new JSONObject();
+                     j.put("bodyId", r.bodyId_get());
+                     JSONObject response = r.Command("systemInformationGet", j);
+                     if (response != null) {
+                        String integers[] = {
+                           "remoteAddress", "recordingCapacityHdHours",
+                           "recordingCapacitySdHours", "freeDiskSpaceSdHours",
+                           "freeDiskSpaceHdHours"
+                        };
+                        String strings[] = {
+                           "internalTemperature",
+                           "zipCode", "remoteBatteryLevel", "activeVideoOutputFormat",
+                           "platform", "netflixEsn",
+                           "hdcpVersionInfo", "collabSliceVersion",
+                           "programInfoTo", "gcCompletionTime", "indexCompletionTime",
+                           "dialInCode", "serviceState", "serviceLevel", "serviceMapInfo",
+                        };
+                        String jsons[] = { "serviceConnectionInfo", "vcmConnectionInfo" };
+                        for (int i=0; i<strings.length; ++i) {
+                           if (response.has(strings[i]))
+                              info += String.format(
+                                 "%-30s %s\n", strings[i], response.getString(strings[i])
+                              );
+                        }                           
+                        for (int i=0; i<jsons.length; ++i) {
+                           if (response.has(jsons[i])) {
+                              response.getJSONObject(jsons[i]).remove("type");
+                              info += String.format(
+                                 "%s:\n%s\n", jsons[i], response.getJSONObject(jsons[i]).toString(3)
+                              );
                            }
+                        }                           
+                        for (int i=0; i<integers.length; ++i) {
+                           if (response.has(integers[i]))
+                              info += String.format(
+                                 "%-30s %d\n", integers[i], response.getInt(integers[i])
+                              );
                         }
-
-                        // What's On info
-                        String [] whatson = getWhatsOn(tivoName);
-                        if (whatson != null) {
-                           info += String.format("%-30s ", "What's On");
-                           for (int i=0; i<whatson.length; ++i) {
-                              if (i>0)
-                                 info += "; ";
-                              info += whatson[i];
-                           }
-                           info += "\n";
+                     }
+
+                     // What's On info
+                     String [] whatson = getWhatsOn(tivoName);
+                     if (whatson != null) {
+                        info += String.format("%-30s ", "What's On");
+                        for (int i=0; i<whatson.length; ++i) {
+                           if (i>0)
+                              info += "; ";
+                           info += whatson[i];
                         }
                         info += "\n";
+                     }
+                     info += "\n";
 
+                     if (! r.awayMode() ) {
                         // Tuner info
                         reply = r.Command("TunerInfo", new JSONObject());
                         if (reply != null && reply.has("state")) {

diff --git a/src/com/tivo/kmttg/main/config.java b/src/com/tivo/kmttg/main/config.java
@@ -36,6 +36,7 @@
 import java.util.Stack;
 
 import com.tivo.kmttg.rpc.Remote;
+import com.tivo.kmttg.rpc.TiVoRPCWS;
 import com.tivo.kmttg.util.*;
 import com.tivo.kmttg.gui.gui;
 import com.tivo.kmttg.httpserver.kmttgServer;
@@ -631,11 +632,9 @@ public static void twpDeleteEnabledSet(Boolean state) {
 
    public static Remote initRemote(String tivoName) {
       if (rpcEnabled(tivoName)) {
-         Remote r = new Remote(tivoName);
-         return(r);
+         return new Remote(tivoName);
       } else {
-         Remote r = new Remote(tivoName, true);
-         return(r);
+         return new Remote(tivoName, true);
       }
    }