Update app.py

app.py

@@ -35,10 +35,10 @@ def decrypt_encrypt_ajax_response(obj):
 
     def pad(data):
         padding_length = 16 - (len(data) % 16)
-        return data + (chr(padding_length) * padding_length).encode()
+        return data + bytes([padding_length] * padding_length)
 
     def unpad(s):
-        return s[:-ord(s[len(s)-1:])]
+        return s[:-s[-1]]
 
     try:
         cipher = AES.new(keys['second_key'], AES.MODE_CBC, keys['iv'])
@@ -48,11 +48,13 @@ def decrypt_encrypt_ajax_response(obj):
         st.write(f"Encrypted data length: {len(encrypted_data)}")
         st.write(f"Encrypted data: {encrypted_data[:20]}...") # Show first 20 bytes
         
-        # Pad the data before decryption
-        padded_data = pad(encrypted_data)
-        st.write(f"Padded data length: {len(padded_data)}")
+        # Ensure the data is padded correctly
+        if len(encrypted_data) % 16 != 0:
+            encrypted_data = pad(encrypted_data)
         
-        decrypted = cipher.decrypt(padded_data)
+        st.write(f"Padded data length: {len(encrypted_data)}")
+        
+        decrypted = cipher.decrypt(encrypted_data)
         
         # Print debug information
         st.write(f"Decrypted data length: {len(decrypted)}")
@@ -157,8 +159,13 @@ def get_m3u8(iframe_url):
             st.write("Encrypted response received successfully")
             st.write(f"Response content: {encrypted_response.text[:100]}...") # Show first 100 characters
             
-            # Ensure we're passing a dictionary to decrypt_encrypt_ajax_response
-            response_data = encrypted_response.json()
+            try:
+                response_data = encrypted_response.json()
+            except json.JSONDecodeError:
+                st.error("Failed to decode JSON response")
+                st.write(f"Full response: {encrypted_response.text}")
+                return {'sources': [], 'sources_bk': []}
+
             if isinstance(response_data, dict) and 'data' in response_data:
                 decrypted_response = decrypt_encrypt_ajax_response(response_data)
                 return {
@@ -168,6 +175,7 @@ def get_m3u8(iframe_url):
                 }
             else:
                 st.error("Invalid response format from encrypt-ajax.php")
+                st.write(f"Response data: {response_data}")
                 return {'sources': [], 'sources_bk': []}
         else:
             st.error(f"Failed to fetch streaming data. Status code: {encrypted_response.status_code}")