.github/workflows/publish-release.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup dotnet 7.x
+      - name: Setup dotnet 8.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.x
+          dotnet-version: 8.x
 
       - name: Display dotnet version
         run: dotnet --version

OF DL/Entities/CDRMProjectRequest.cs

@@ -9,14 +9,19 @@ namespace OF_DL.Entities
 {
     public class CDRMProjectRequest
     {
+        [JsonProperty("pssh")]
         public string PSSH { get; set; } = "";
 
-        [JsonProperty("License URL")]
+        [JsonProperty("licurl")]
         public string LicenseURL { get; set; } = "";
+
+        [JsonProperty("headers")]
         public string Headers { get; set; } = "";
-        public string JSON { get; set; } = "";
+
+        [JsonProperty("cookies")]
         public string Cookies { get; set; } = "";
+
+        [JsonProperty("data")]
         public string Data { get; set; } = "";
-        public string Proxy { get; set; } = "";
     }
 }

OF DL/Helpers/APIHelper.cs

@@ -2586,10 +2586,8 @@ public async Task<string> GetDecryptionKey(Dictionary<string, string> drmHeaders
                 PSSH = pssh,
                 LicenseURL = licenceURL,
                 Headers = JsonConvert.SerializeObject(drmHeaders),
-                JSON = "",
                 Cookies = "",
-                Data = "",
-                Proxy = ""
+                Data = ""
             };
 
             string json = JsonConvert.SerializeObject(cdrmProjectRequest);
@@ -2600,7 +2598,7 @@ public async Task<string> GetDecryptionKey(Dictionary<string, string> drmHeaders
             {
                 attempt++;
 
-                HttpRequestMessage request = new(HttpMethod.Post, "https://cdrm-project.com/")
+                HttpRequestMessage request = new(HttpMethod.Post, "https://cdrm-project.com/api/decrypt")
                 {
                     Content = new StringContent(json, Encoding.UTF8, "application/json")
                 };
@@ -2611,19 +2609,30 @@ public async Task<string> GetDecryptionKey(Dictionary<string, string> drmHeaders
 
                 response.EnsureSuccessStatusCode();
                 var body = await response.Content.ReadAsStringAsync();
+                var doc = JsonDocument.Parse(body);
 
-                if (!body.Contains("error", StringComparison.OrdinalIgnoreCase))
+                if (doc.RootElement.TryGetProperty("status", out JsonElement status))
                 {
-                    var doc = JsonDocument.Parse(body);
-                    dcValue = doc.RootElement.GetProperty("Message").GetString().Trim();
-                    return dcValue;
+                    if (status.ToString().Trim().Equals("success", StringComparison.OrdinalIgnoreCase))
+                    {
+                        dcValue = doc.RootElement.GetProperty("message").GetString().Trim();
+                        return dcValue;
+                    }
+                    else
+                    {
+                        Log.Debug($"CDRM response status not successful. Retrying... Attempt {attempt} of {maxAttempts}");
+                        if (attempt < maxAttempts)
+                        {
+                            await Task.Delay(delayBetweenAttempts);
+                        }
+                    }
                 }
                 else
                 {
-                    Log.Debug($"Response contains 'error'. Retrying... Attempt {attempt} of {maxAttempts}");
+                    Log.Debug($"Status not in CDRM response. Retrying... Attempt {attempt} of {maxAttempts}");
                     if (attempt < maxAttempts)
                     {
-                        await Task.Delay(delayBetweenAttempts); 
+                        await Task.Delay(delayBetweenAttempts);
                     }
                 }
             }