Refactor: WebMessageProtocol error handling

Novage · Jan 14, 2025 · 0b4eb6f · 0b4eb6f
1 parent ebc442b
commit 0b4eb6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 26 deletions.
diff --git a/p2pml/src/main/java/com/novage/p2pml/webview/WebMessageProtocol.kt b/p2pml/src/main/java/com/novage/p2pml/webview/WebMessageProtocol.kt
@@ -35,11 +35,11 @@ internal class WebMessageProtocol(
     private var wasInitialMessageSent = false
 
     init {
-        setupWebMessageCallback()
+        initializeWebMessageCallback()
     }
 
     @SuppressLint("RequiresFeature")
-    private fun setupWebMessageCallback() {
+    private fun initializeWebMessageCallback() {
         channels[0].setWebMessageCallback(
             object : WebMessagePortCompat.WebMessageCallbackCompat() {
                 override fun onMessage(
@@ -61,9 +61,6 @@ internal class WebMessageProtocol(
     }
 
     private fun handleSegmentIdBytes(arrayBuffer: ByteArray) {
-        if (incomingRequestId == null) {
-            Log.d("WebMessageProtocol", "Error: Empty segment ID")
-        }
         val requestId =
             incomingRequestId
                 ?: throw IllegalStateException("Received segment bytes without a segment ID")
@@ -72,7 +69,7 @@ internal class WebMessageProtocol(
             val deferred = getSegmentResponseCallback(requestId)
 
             if (deferred == null) {
-                Log.d(
+                Log.e(
                     "WebMessageProtocol",
                     "Error: No deferred found for segment ID: $requestId",
                 )
@@ -104,7 +101,7 @@ internal class WebMessageProtocol(
 
             val deferredSegmentBytes = getSegmentResponseCallback(requestId)
             if (deferredSegmentBytes == null) {
-                Log.d(
+                Log.e(
                     "WebMessageProtocol",
                     "Error: No deferred found for segment ID: $segmentId",
                 )
@@ -125,12 +122,6 @@ internal class WebMessageProtocol(
     }
 
     private fun handleSegmentIdMessage(requestId: String) {
-        if (incomingRequestId != null) {
-            Log.d(
-                "WebMessageProtocol",
-                "Received incorrect request ID: $requestId. Expected: $incomingRequestId",
-            )
-        }
         val requestIdToInt =
             requestId.toIntOrNull() ?: throw IllegalStateException("Invalid request ID")
         incomingRequestId = requestIdToInt

diff --git a/p2pml/src/main/java/com/novage/p2pml/webview/WebViewManager.kt b/p2pml/src/main/java/com/novage/p2pml/webview/WebViewManager.kt
@@ -76,10 +76,6 @@ internal class WebViewManager(
                 while (isActive) {
                     try {
                         if (engineStateManager.isEngineDisabled()) {
-                            Log.d(
-                                "WebViewManager",
-                                "P2P Engine disabled, stopping playback info update.",
-                            )
                             playbackInfoJob?.cancel()
                             playbackInfoJob = null
                             break

diff --git a/p2pml/src/main/resources/p2pml/static/index.html b/p2pml/src/main/resources/p2pml/static/index.html
@@ -62,7 +62,6 @@
           const streams = JSON.parse(jsonData);
 
           for (const stream of streams) {
-            console.log(">>> Add stream:", stream);
             this.core.addStreamIfNoneExists(stream);
           }
         }
@@ -72,11 +71,6 @@
           const { streamRuntimeId, addSegments, removeSegmentsIds, isLive } =
             playlist;
 
-          console.log(">>> Parsed stream:", streamRuntimeId);
-          console.log("+++ Add segments:", addSegments);
-          console.log("--- Remove segments:", removeSegmentsIds);
-          console.log(">>> Is live:", isLive);
-
           this.core.updateStream(
             streamRuntimeId,
             addSegments,
@@ -97,7 +91,7 @@
               this.port.postMessage(`${requestId}`);
               this.port.postMessage(copyData, [copyData]);
             } catch (e) {
-              console.error("Error in onSuccess:", e);
+              this.port.postMessage(`Error:${requestId}:failed|${segmentUrl}`);
             }
           };
 
@@ -119,13 +113,11 @@
               onError,
             });
           } catch (e) {
-            console.warn("Error in processSegmentRequest:", e);
             this.port.postMessage(`Error:${requestId}:not_found|${segmentUrl}`);
           }
         }
 
         setManifestUrl(manifestUrl) {
-          console.log(">>> Set manifest URL:", manifestUrl);
           this.core.setManifestResponseUrl(manifestUrl);
         }