+ {storedUrl && (
+
+ Current instance: {storedUrl}
+
+ )}
+
+
New instance URL:
setInstanceUrl(e.target.value)}
- placeholder={
- storedUrl
- ? `Current CDRM Instance: ${storedUrl}`
- : "CDRM Instance URL (e.g., https://cdrm-project.com/, http://127.0.0.1:5000/)"
- }
- className="w-full p-4 text-lg bg-gray-800 text-white border border-gray-700 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 mt-4"
+ placeholder="https://cdrm-project.com/, http://127.0.0.1:5000/"
+ className="w-full p-4 text-lg bg-gray-800 text-white border border-gray-700 rounded-md focus:outline-none focus:ring-2 focus:ring-blue-500 mt-4 font-mono"
/>
{message && (
--
2.43.0
From 889a4c63f310e599ec2dbb20da1b0a2a55778c17 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Sun, 20 Jul 2025 17:21:02 +0700
Subject: [PATCH 09/26] sync version: only update the "version" instead of
parsing whole file
---
syncVersion.js | 52 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git a/syncVersion.js b/syncVersion.js
index 7acba5d..6faa01a 100644
--- a/syncVersion.js
+++ b/syncVersion.js
@@ -5,6 +5,32 @@ import { fileURLToPath } from "url";
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
+const updateVersionWithRegex = async (filePath, newVersion) => {
+ try {
+ const content = await fs.readFile(filePath, "utf-8");
+
+ // Regex to match "version": "any.version.number"
+ const versionRegex = /("version"\s*:\s*")([^"]+)(")/;
+
+ if (!versionRegex.test(content)) {
+ console.warn(`⚠️ No version field found in ${filePath}`);
+ return false;
+ }
+
+ const updatedContent = content.replace(versionRegex, `$1${newVersion}$3`);
+
+ if (content !== updatedContent) {
+ await fs.writeFile(filePath, updatedContent);
+ return true;
+ }
+
+ return false;
+ } catch (err) {
+ console.error(`❌ Failed to update ${filePath}: ${err.message}`);
+ return false;
+ }
+};
+
const syncVersion = async () => {
const rootPkgPath = path.join(__dirname, "package.json");
const frontendPkgPath = path.join(__dirname, "frontend", "package.json");
@@ -20,26 +46,20 @@ const syncVersion = async () => {
return;
}
- // Update frontend/package.json if exists
- try {
- const frontendPkgRaw = await fs.readFile(frontendPkgPath, "utf-8");
- const frontendPkg = JSON.parse(frontendPkgRaw);
- frontendPkg.version = version;
- await fs.writeFile(frontendPkgPath, JSON.stringify(frontendPkg, null, 2));
+ // Update frontend/package.json using regex
+ const frontendUpdated = await updateVersionWithRegex(frontendPkgPath, version);
+ if (frontendUpdated) {
console.log(`🔄 Updated frontend/package.json version to ${version}`);
- } catch {
- console.log("ℹ️ frontend/package.json not found or unreadable, skipping version update.");
+ } else {
+ console.log("ℹ️ frontend/package.json not found or no changes needed.");
}
- // Update src/manifest.json version
- try {
- const manifestRaw = await fs.readFile(manifestPath, "utf-8");
- const manifest = JSON.parse(manifestRaw);
- manifest.version = version;
- await fs.writeFile(manifestPath, JSON.stringify(manifest, null, 2));
+ // Update src/manifest.json using regex
+ const manifestUpdated = await updateVersionWithRegex(manifestPath, version);
+ if (manifestUpdated) {
console.log(`🔄 Updated src/manifest.json version to ${version}`);
- } catch (err) {
- console.error(`❌ Failed to update src/manifest.json version: ${err.message}`);
+ } else {
+ console.log("ℹ️ src/manifest.json not found or no changes needed.");
}
};
--
2.43.0
From 6e2283704704b4f9d6518220ecf4341ff14956c9 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Sun, 20 Jul 2025 17:43:13 +0700
Subject: [PATCH 10/26] Fix Trusted Types violation in manifest interceptor
injection, which fixes data not showing for YouTube DRM
---
mv2/inject.js | 181 ++++++++++++++++++++++++++++----------------------
src/inject.js | 181 ++++++++++++++++++++++++++++----------------------
2 files changed, 202 insertions(+), 160 deletions(-)
diff --git a/mv2/inject.js b/mv2/inject.js
index fdcb029..e549c96 100644
--- a/mv2/inject.js
+++ b/mv2/inject.js
@@ -70,108 +70,129 @@ function safeHeaderShellEscape(str) {
// Intercep network to find manifest
function injectManifestInterceptor() {
- const script = document.createElement("script");
- script.textContent = `
- (function() {
- function isProbablyManifest(text = "", contentType = "") {
- const lowerCT = contentType?.toLowerCase() ?? "";
- const sample = text.slice(0, 2000);
+ // Execute the interceptor code directly instead of injecting a script
+ (function () {
+ function isProbablyManifest(text = "", contentType = "") {
+ const lowerCT = contentType?.toLowerCase() ?? "";
+ const sample = text.slice(0, 2000);
- const isHLSMime = lowerCT.includes("mpegurl");
- const isDASHMime = lowerCT.includes("dash+xml");
- const isSmoothMime = lowerCT.includes("sstr+xml");
+ const isHLSMime = lowerCT.includes("mpegurl");
+ const isDASHMime = lowerCT.includes("dash+xml");
+ const isSmoothMime = lowerCT.includes("sstr+xml");
- const isHLSKeyword = sample.includes("#EXTM3U") || sample.includes("#EXT-X-STREAM-INF");
- const isDASHKeyword = sample.includes("
{
- headersObj[key] = value;
- });
+ const headersObj = {};
+ clone.headers.forEach((value, key) => {
+ headersObj[key] = value;
+ });
- const headerFlags = Object.entries(headersObj)
- .map(([key, val]) => '--add-headers "' + safeHeaderShellEscape(key) + ': ' + safeHeaderShellEscape(val) + '"')
- .join(" ");
+ const headerFlags = Object.entries(headersObj)
+ .map(
+ ([key, val]) =>
+ '--add-headers "' +
+ safeHeaderShellEscape(key) +
+ ": " +
+ safeHeaderShellEscape(val) +
+ '"'
+ )
+ .join(" ");
- window.postMessage({
+ window.postMessage(
+ {
type: "__MANIFEST_HEADERS__",
url,
- headers: headerFlags
- }, "*");
- }
- } catch (e) {}
+ headers: headerFlags,
+ },
+ "*"
+ );
+ }
+ } catch (e) {}
- return response;
- };
+ return response;
+ };
- const originalXHROpen = XMLHttpRequest.prototype.open;
- const originalXHRSend = XMLHttpRequest.prototype.send;
+ const originalXHROpen = XMLHttpRequest.prototype.open;
+ const originalXHRSend = XMLHttpRequest.prototype.send;
- XMLHttpRequest.prototype.open = function(method, url) {
- this.__url = url;
- return originalXHROpen.apply(this, arguments);
- };
+ XMLHttpRequest.prototype.open = function (method, url) {
+ this.__url = url;
+ return originalXHROpen.apply(this, arguments);
+ };
- XMLHttpRequest.prototype.send = function(body) {
- this.addEventListener("load", function () {
- try {
- const contentType = this.getResponseHeader("content-type") || "";
- const text = this.responseText;
+ XMLHttpRequest.prototype.send = function (body) {
+ this.addEventListener("load", function () {
+ try {
+ const contentType = this.getResponseHeader("content-type") || "";
+ const text = this.responseText;
- if (isProbablyManifest(text, contentType)) {
- window.postMessage({ type: "__MANIFEST_URL__", data: this.__url }, "*");
- console.log("[Manifest][xhr]", this.__url, contentType);
+ if (isProbablyManifest(text, contentType)) {
+ window.postMessage({ type: "__MANIFEST_URL__", data: this.__url }, "*");
+ console.log("[Manifest][xhr]", this.__url, contentType);
- const xhrHeaders = {};
- const rawHeaders = this.getAllResponseHeaders().trim().split(/\\r?\\n/);
- rawHeaders.forEach(line => {
- const parts = line.split(": ");
- if (parts.length === 2) {
- xhrHeaders[parts[0]] = parts[1];
- }
- });
+ const xhrHeaders = {};
+ const rawHeaders = this.getAllResponseHeaders().trim().split(/\r?\n/);
+ rawHeaders.forEach((line) => {
+ const parts = line.split(": ");
+ if (parts.length === 2) {
+ xhrHeaders[parts[0]] = parts[1];
+ }
+ });
- const headerFlags = Object.entries(xhrHeaders)
- .map(([key, val]) => '--add-headers "' + safeHeaderShellEscape(key) + ': ' + safeHeaderShellEscape(val) + '"')
- .join(" ");
+ const headerFlags = Object.entries(xhrHeaders)
+ .map(
+ ([key, val]) =>
+ '--add-headers "' +
+ safeHeaderShellEscape(key) +
+ ": " +
+ safeHeaderShellEscape(val) +
+ '"'
+ )
+ .join(" ");
- window.postMessage({
+ window.postMessage(
+ {
type: "__MANIFEST_HEADERS__",
url: this.__url,
- headers: headerFlags
- }, "*");
- }
- } catch (e) {}
- });
- return originalXHRSend.apply(this, arguments);
- };
- })();
- `;
- document.documentElement.appendChild(script);
- script.remove();
+ headers: headerFlags,
+ },
+ "*"
+ );
+ }
+ } catch (e) {}
+ });
+ return originalXHRSend.apply(this, arguments);
+ };
+ })();
}
injectManifestInterceptor();
diff --git a/src/inject.js b/src/inject.js
index fdcb029..e549c96 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -70,108 +70,129 @@ function safeHeaderShellEscape(str) {
// Intercep network to find manifest
function injectManifestInterceptor() {
- const script = document.createElement("script");
- script.textContent = `
- (function() {
- function isProbablyManifest(text = "", contentType = "") {
- const lowerCT = contentType?.toLowerCase() ?? "";
- const sample = text.slice(0, 2000);
+ // Execute the interceptor code directly instead of injecting a script
+ (function () {
+ function isProbablyManifest(text = "", contentType = "") {
+ const lowerCT = contentType?.toLowerCase() ?? "";
+ const sample = text.slice(0, 2000);
- const isHLSMime = lowerCT.includes("mpegurl");
- const isDASHMime = lowerCT.includes("dash+xml");
- const isSmoothMime = lowerCT.includes("sstr+xml");
+ const isHLSMime = lowerCT.includes("mpegurl");
+ const isDASHMime = lowerCT.includes("dash+xml");
+ const isSmoothMime = lowerCT.includes("sstr+xml");
- const isHLSKeyword = sample.includes("#EXTM3U") || sample.includes("#EXT-X-STREAM-INF");
- const isDASHKeyword = sample.includes(" {
- headersObj[key] = value;
- });
+ const headersObj = {};
+ clone.headers.forEach((value, key) => {
+ headersObj[key] = value;
+ });
- const headerFlags = Object.entries(headersObj)
- .map(([key, val]) => '--add-headers "' + safeHeaderShellEscape(key) + ': ' + safeHeaderShellEscape(val) + '"')
- .join(" ");
+ const headerFlags = Object.entries(headersObj)
+ .map(
+ ([key, val]) =>
+ '--add-headers "' +
+ safeHeaderShellEscape(key) +
+ ": " +
+ safeHeaderShellEscape(val) +
+ '"'
+ )
+ .join(" ");
- window.postMessage({
+ window.postMessage(
+ {
type: "__MANIFEST_HEADERS__",
url,
- headers: headerFlags
- }, "*");
- }
- } catch (e) {}
+ headers: headerFlags,
+ },
+ "*"
+ );
+ }
+ } catch (e) {}
- return response;
- };
+ return response;
+ };
- const originalXHROpen = XMLHttpRequest.prototype.open;
- const originalXHRSend = XMLHttpRequest.prototype.send;
+ const originalXHROpen = XMLHttpRequest.prototype.open;
+ const originalXHRSend = XMLHttpRequest.prototype.send;
- XMLHttpRequest.prototype.open = function(method, url) {
- this.__url = url;
- return originalXHROpen.apply(this, arguments);
- };
+ XMLHttpRequest.prototype.open = function (method, url) {
+ this.__url = url;
+ return originalXHROpen.apply(this, arguments);
+ };
- XMLHttpRequest.prototype.send = function(body) {
- this.addEventListener("load", function () {
- try {
- const contentType = this.getResponseHeader("content-type") || "";
- const text = this.responseText;
+ XMLHttpRequest.prototype.send = function (body) {
+ this.addEventListener("load", function () {
+ try {
+ const contentType = this.getResponseHeader("content-type") || "";
+ const text = this.responseText;
- if (isProbablyManifest(text, contentType)) {
- window.postMessage({ type: "__MANIFEST_URL__", data: this.__url }, "*");
- console.log("[Manifest][xhr]", this.__url, contentType);
+ if (isProbablyManifest(text, contentType)) {
+ window.postMessage({ type: "__MANIFEST_URL__", data: this.__url }, "*");
+ console.log("[Manifest][xhr]", this.__url, contentType);
- const xhrHeaders = {};
- const rawHeaders = this.getAllResponseHeaders().trim().split(/\\r?\\n/);
- rawHeaders.forEach(line => {
- const parts = line.split(": ");
- if (parts.length === 2) {
- xhrHeaders[parts[0]] = parts[1];
- }
- });
+ const xhrHeaders = {};
+ const rawHeaders = this.getAllResponseHeaders().trim().split(/\r?\n/);
+ rawHeaders.forEach((line) => {
+ const parts = line.split(": ");
+ if (parts.length === 2) {
+ xhrHeaders[parts[0]] = parts[1];
+ }
+ });
- const headerFlags = Object.entries(xhrHeaders)
- .map(([key, val]) => '--add-headers "' + safeHeaderShellEscape(key) + ': ' + safeHeaderShellEscape(val) + '"')
- .join(" ");
+ const headerFlags = Object.entries(xhrHeaders)
+ .map(
+ ([key, val]) =>
+ '--add-headers "' +
+ safeHeaderShellEscape(key) +
+ ": " +
+ safeHeaderShellEscape(val) +
+ '"'
+ )
+ .join(" ");
- window.postMessage({
+ window.postMessage(
+ {
type: "__MANIFEST_HEADERS__",
url: this.__url,
- headers: headerFlags
- }, "*");
- }
- } catch (e) {}
- });
- return originalXHRSend.apply(this, arguments);
- };
- })();
- `;
- document.documentElement.appendChild(script);
- script.remove();
+ headers: headerFlags,
+ },
+ "*"
+ );
+ }
+ } catch (e) {}
+ });
+ return originalXHRSend.apply(this, arguments);
+ };
+ })();
}
injectManifestInterceptor();
--
2.43.0
From 3fae8f296f9ae4dd499e90cab807152e9437094f Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Sun, 20 Jul 2025 20:10:47 +0700
Subject: [PATCH 11/26] show "use yt-dlp" in manifest for youtube, use
plugin-react-swc
---
frontend/package-lock.json | 245 +++++++++++++++++++++++++++-
frontend/package.json | 1 +
frontend/src/components/results.jsx | 49 +++++-
frontend/vite.config.js | 2 +-
4 files changed, 290 insertions(+), 7 deletions(-)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c86a3ab..e1d1c23 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "frontend",
- "version": "0.0.0",
+ "version": "2.1.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "frontend",
- "version": "0.0.0",
+ "version": "2.1.0",
"dependencies": {
"@tailwindcss/vite": "^4.1.11",
"react": "^19.1.0",
@@ -19,6 +19,7 @@
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@vitejs/plugin-react": "^4.7.0",
+ "@vitejs/plugin-react-swc": "^3.11.0",
"eslint": "^9.31.0",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.20",
@@ -1255,6 +1256,232 @@
"win32"
]
},
+ "node_modules/@swc/core": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.13.1.tgz",
+ "integrity": "sha512-jEKKErLC6uwSqA+p6bmZR08usZM5Fpc+HdEu5CAzvye0q43yf1si1kjhHEa9XMkz0A2SAaal3eKCg/YYmtOsCA==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@swc/counter": "^0.1.3",
+ "@swc/types": "^0.1.23"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/swc"
+ },
+ "optionalDependencies": {
+ "@swc/core-darwin-arm64": "1.13.1",
+ "@swc/core-darwin-x64": "1.13.1",
+ "@swc/core-linux-arm-gnueabihf": "1.13.1",
+ "@swc/core-linux-arm64-gnu": "1.13.1",
+ "@swc/core-linux-arm64-musl": "1.13.1",
+ "@swc/core-linux-x64-gnu": "1.13.1",
+ "@swc/core-linux-x64-musl": "1.13.1",
+ "@swc/core-win32-arm64-msvc": "1.13.1",
+ "@swc/core-win32-ia32-msvc": "1.13.1",
+ "@swc/core-win32-x64-msvc": "1.13.1"
+ },
+ "peerDependencies": {
+ "@swc/helpers": ">=0.5.17"
+ },
+ "peerDependenciesMeta": {
+ "@swc/helpers": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@swc/core-darwin-arm64": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.13.1.tgz",
+ "integrity": "sha512-zO6SW/jSMTUORPm6dUZFPUwf+EFWZsaXWMGXadRG6akCofYpoQb8pcY2QZkVr43z8TMka6BtXpyoD/DJ0iOPHQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-darwin-x64": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.13.1.tgz",
+ "integrity": "sha512-8RjaTZYxrlYKE5PgzZYWSOT4mAsyhIuh30Nu4dnn/2r0Ef68iNCbvX4ynGnFMhOIhqunjQbJf+mJKpwTwdHXhw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-arm-gnueabihf": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.13.1.tgz",
+ "integrity": "sha512-jEqK6pECs2m4BpL2JA/4CCkq04p6iFOEtVNXTisO+lJ3zwmxlnIEm9UfJZG6VSu8GS9MHRKGB0ieZ1tEdN1qDA==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "Apache-2.0",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-arm64-gnu": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.13.1.tgz",
+ "integrity": "sha512-PbkuIOYXO/gQbWQ7NnYIwm59ygNqmUcF8LBeoKvxhx1VtOwE+9KiTfoplOikkPLhMiTzKsd8qentTslbITIg+Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-arm64-musl": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.13.1.tgz",
+ "integrity": "sha512-JaqFdBCarIBKiMu5bbAp+kWPMNGg97ej+7KzbKOzWP5pRptqKi86kCDZT3WmjPe8hNG6dvBwbm7Y8JNry5LebQ==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-x64-gnu": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.13.1.tgz",
+ "integrity": "sha512-t4cLkku10YECDaakWUH0452WJHIZtrLPRwezt6BdoMntVMwNjvXRX7C8bGuYcKC3YxRW7enZKFpozLhQIQ37oA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-linux-x64-musl": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.13.1.tgz",
+ "integrity": "sha512-fSMwZOaG+3ukUucbEbzz9GhzGhUhXoCPqHe9qW0/Vc2IZRp538xalygKyZynYweH5d9EHux1aj3+IO8/xBaoiA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-win32-arm64-msvc": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.13.1.tgz",
+ "integrity": "sha512-tweCXK/79vAwj1NhAsYgICy8T1z2QEairmN2BFEBYFBFNMEB1iI1YlXwBkBtuihRvgZrTh1ORusKa4jLYzLCZA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-win32-ia32-msvc": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.13.1.tgz",
+ "integrity": "sha512-zi7hO9D+2R2yQN9D7T10/CAI9KhuXkNkz8tcJOW6+dVPtAk/gsIC5NoGPELjgrAlLL9CS38ZQpLDslLfpP15ng==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/core-win32-x64-msvc": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.13.1.tgz",
+ "integrity": "sha512-KubYjzqs/nz3H69ncX/XHKsC8c1xqc7UvonQAj26BhbL22HBsqdAaVutZ+Obho6RMpd3F5qQ95ldavUTWskRrw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "Apache-2.0 AND MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/@swc/counter": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+ "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+ "dev": true,
+ "license": "Apache-2.0"
+ },
+ "node_modules/@swc/types": {
+ "version": "0.1.23",
+ "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.23.tgz",
+ "integrity": "sha512-u1iIVZV9Q0jxY+yM2vw/hZGDNudsN85bBpTqzAQ9rzkxW9D+e3aEM4Han+ow518gSewkXgjmEK0BD79ZcNVgPw==",
+ "dev": true,
+ "license": "Apache-2.0",
+ "dependencies": {
+ "@swc/counter": "^0.1.3"
+ }
+ },
"node_modules/@tailwindcss/node": {
"version": "4.1.11",
"resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.11.tgz",
@@ -1616,6 +1843,20 @@
"vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
}
},
+ "node_modules/@vitejs/plugin-react-swc": {
+ "version": "3.11.0",
+ "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.11.0.tgz",
+ "integrity": "sha512-YTJCGFdNMHCMfjODYtxRNVAYmTWQ1Lb8PulP/2/f/oEEtglw8oKxKIZmmRkyXrVrHfsKOaVkAc3NT9/dMutO5w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@rolldown/pluginutils": "1.0.0-beta.27",
+ "@swc/core": "^1.12.11"
+ },
+ "peerDependencies": {
+ "vite": "^4 || ^5 || ^6 || ^7"
+ }
+ },
"node_modules/acorn": {
"version": "8.15.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index bae1047..3e0425e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,6 +21,7 @@
"@types/react": "^19.1.8",
"@types/react-dom": "^19.1.6",
"@vitejs/plugin-react": "^4.7.0",
+ "@vitejs/plugin-react-swc": "^3.11.0",
"eslint": "^9.31.0",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.20",
diff --git a/frontend/src/components/results.jsx b/frontend/src/components/results.jsx
index fe9ffe7..7155419 100644
--- a/frontend/src/components/results.jsx
+++ b/frontend/src/components/results.jsx
@@ -6,6 +6,7 @@ function Results() {
const [licenseUrl, setLicenseUrl] = useState("");
const [keys, setKeys] = useState([]);
const [manifestUrl, setManifestUrl] = useState("");
+ const [currentTabUrl, setCurrentTabUrl] = useState("");
useEffect(() => {
chrome.storage.local.get(
@@ -36,6 +37,21 @@ function Results() {
}
);
+ // Get current tab URL when component mounts
+ chrome.windows.getAll({ populate: true, windowTypes: ["normal"] }, (windows) => {
+ if (windows && windows.length > 0) {
+ const lastFocusedWindow = windows.find((w) => w.focused) || windows[0];
+ if (lastFocusedWindow) {
+ const activeTab = lastFocusedWindow.tabs.find(
+ (tab) => tab.active && tab.url && /^https?:\/\//.test(tab.url)
+ );
+ if (activeTab?.url) {
+ setCurrentTabUrl(activeTab.url);
+ }
+ }
+ }
+ });
+
const handleChange = (changes, area) => {
if (area === "local") {
if (changes.drmType) {
@@ -102,8 +118,31 @@ function Results() {
});
};
- // Export to JSON file
+ // Check if current tab is YouTube
+ const isYouTube = () => {
+ return currentTabUrl.includes("youtube.com") || currentTabUrl.includes("youtu.be");
+ };
+ // Get manifest URL display value
+ const getManifestDisplayValue = () => {
+ if (manifestUrl) {
+ return manifestUrl;
+ }
+ if (isYouTube()) {
+ return "[Use yt-dlp to download video]";
+ }
+ return "";
+ };
+
+ // Get manifest URL placeholder
+ const getManifestPlaceholder = () => {
+ if (isYouTube() && !manifestUrl) {
+ return "[Use yt-dlp to download video]";
+ }
+ return "[Not available]";
+ };
+
+ // Export to JSON file
const hasData = () => {
return (
drmType ||
@@ -164,9 +203,11 @@ function Results() {
Manifest URL
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 01889a6..971ff39 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -1,5 +1,5 @@
import tailwindcss from "@tailwindcss/vite";
-import react from "@vitejs/plugin-react";
+import react from "@vitejs/plugin-react-swc";
import { readFileSync } from "fs";
import { defineConfig } from "vite";
--
2.43.0
From 9cff5b44bd295d64b51d5a597fa3ce1f34efd387 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:39:35 +0700
Subject: [PATCH 12/26] forgot to remove _FOUND in MANIFEST_URL
---
src/background.js | 2 +-
src/content.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/background.js b/src/background.js
index 3c0fc5d..bbd7fd6 100644
--- a/src/background.js
+++ b/src/background.js
@@ -32,7 +32,7 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
chrome.storage.local.set({ licenseURL: data });
break;
- case "MANIFEST_URL_FOUND":
+ case "MANIFEST_URL":
console.log("Storing Manifest URL:", data);
chrome.storage.local.set({ manifestURL: data });
break;
diff --git a/src/content.js b/src/content.js
index 55b7891..0e12c93 100644
--- a/src/content.js
+++ b/src/content.js
@@ -78,7 +78,7 @@ window.addEventListener("message", function (event) {
console.log("✅ [Content] Unique manifest URL:", url);
chrome.runtime.sendMessage({
- type: "MANIFEST_URL_FOUND",
+ type: "MANIFEST_URL",
data: url,
});
}
--
2.43.0
From 3bd2e0f4655dd29b4ceeaa6e4bfe3777811c1a1d Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:41:49 +0700
Subject: [PATCH 13/26] refactor: extract redundant code into helpers (part 1)
---
src/inject.js | 275 ++++++++++++++++++++------------------------------
1 file changed, 111 insertions(+), 164 deletions(-)
diff --git a/src/inject.js b/src/inject.js
index e549c96..915083f 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -68,6 +68,35 @@ function safeHeaderShellEscape(str) {
.replace(/\n/g, ""); // strip newlines
}
+function headersToFlags(headersObj) {
+ return Object.entries(headersObj)
+ .map(
+ ([key, val]) =>
+ '--add-headers "' +
+ safeHeaderShellEscape(key) +
+ ": " +
+ safeHeaderShellEscape(val) +
+ '"'
+ )
+ .join(" ");
+}
+
+function handleManifestDetection(url, headersObj, contentType, source) {
+ window.postMessage({ type: "__MANIFEST_URL__", data: url }, "*");
+ console.log(`[Manifest][${source}]`, url, contentType);
+
+ const headerFlags = headersToFlags(headersObj);
+
+ window.postMessage(
+ {
+ type: "__MANIFEST_HEADERS__",
+ url,
+ headers: headerFlags,
+ },
+ "*"
+ );
+}
+
// Intercep network to find manifest
function injectManifestInterceptor() {
// Execute the interceptor code directly instead of injecting a script
@@ -108,33 +137,11 @@ function injectManifestInterceptor() {
const url = typeof input === "string" ? input : input.url;
if (isProbablyManifest(text, contentType)) {
- window.postMessage({ type: "__MANIFEST_URL__", data: url }, "*");
- console.log("[Manifest][fetch]", url, contentType);
-
const headersObj = {};
clone.headers.forEach((value, key) => {
headersObj[key] = value;
});
-
- const headerFlags = Object.entries(headersObj)
- .map(
- ([key, val]) =>
- '--add-headers "' +
- safeHeaderShellEscape(key) +
- ": " +
- safeHeaderShellEscape(val) +
- '"'
- )
- .join(" ");
-
- window.postMessage(
- {
- type: "__MANIFEST_HEADERS__",
- url,
- headers: headerFlags,
- },
- "*"
- );
+ handleManifestDetection(url, headersObj, contentType, "fetch");
}
} catch (e) {}
@@ -156,9 +163,6 @@ function injectManifestInterceptor() {
const text = this.responseText;
if (isProbablyManifest(text, contentType)) {
- window.postMessage({ type: "__MANIFEST_URL__", data: this.__url }, "*");
- console.log("[Manifest][xhr]", this.__url, contentType);
-
const xhrHeaders = {};
const rawHeaders = this.getAllResponseHeaders().trim().split(/\r?\n/);
rawHeaders.forEach((line) => {
@@ -167,26 +171,7 @@ function injectManifestInterceptor() {
xhrHeaders[parts[0]] = parts[1];
}
});
-
- const headerFlags = Object.entries(xhrHeaders)
- .map(
- ([key, val]) =>
- '--add-headers "' +
- safeHeaderShellEscape(key) +
- ": " +
- safeHeaderShellEscape(val) +
- '"'
- )
- .join(" ");
-
- window.postMessage(
- {
- type: "__MANIFEST_HEADERS__",
- url: this.__url,
- headers: headerFlags,
- },
- "*"
- );
+ handleManifestDetection(this.__url, xhrHeaders, contentType, "xhr");
}
} catch (e) {}
});
@@ -197,21 +182,19 @@ function injectManifestInterceptor() {
injectManifestInterceptor();
-// PlayReady Remote CDM Class
-class remotePlayReadyCDM {
- constructor(security_level, host, secret, device_name) {
- this.security_level = security_level;
+class RemoteCDMBase {
+ constructor({ host, secret, device_name, security_level }) {
this.host = host;
this.secret = secret;
this.device_name = device_name;
+ this.security_level = security_level;
this.session_id = null;
this.challenge = null;
this.keys = null;
}
- // Open PlayReady session
- openSession() {
- const url = `${this.host}/remotecdm/playready/${this.device_name}/open`;
+ openSession(path) {
+ const url = `${this.host}${path}/open`;
const xhr = new XMLHttpRequest();
xhr.open("GET", url, false);
xhr.setRequestHeader("Content-Type", "application/json");
@@ -219,126 +202,127 @@ class remotePlayReadyCDM {
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.data?.session_id) {
this.session_id = jsonData.data.session_id;
- console.log("PlayReady session opened:", this.session_id);
+ console.log("Session opened:", this.session_id);
} else {
- console.error("Failed to open PlayReady session:", jsonData.message);
- throw new Error("Failed to open PlayReady session");
+ console.error("Failed to open session:", jsonData.message);
+ throw new Error("Failed to open session");
}
}
- // Get PlayReady challenge
- getChallenge(init_data) {
- const url = `${this.host}/remotecdm/playready/${this.device_name}/get_license_challenge`;
+ getChallenge(path, body) {
+ const url = `${this.host}${path}/get_license_challenge`;
const xhr = new XMLHttpRequest();
xhr.open("POST", url, false);
xhr.setRequestHeader("Content-Type", "application/json");
- const body = {
- session_id: this.session_id,
- init_data: init_data,
- };
xhr.send(JSON.stringify(body));
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.data?.challenge) {
this.challenge = btoa(jsonData.data.challenge);
- console.log("PlayReady challenge received:", this.challenge);
+ console.log("Challenge received:", this.challenge);
+ } else if (jsonData.data?.challenge_b64) {
+ this.challenge = jsonData.data.challenge_b64;
+ console.log("Challenge received:", this.challenge);
} else {
- console.error("Failed to get PlayReady challenge:", jsonData.message);
- throw new Error("Failed to get PlayReady challenge");
+ console.error("Failed to get challenge:", jsonData.message);
+ throw new Error("Failed to get challenge");
}
}
- // Parse PlayReady license response
- parseLicense(license_message) {
- const url = `${this.host}/remotecdm/playready/${this.device_name}/parse_license`;
+ parseLicense(path, body) {
+ const url = `${this.host}${path}/parse_license`;
const xhr = new XMLHttpRequest();
xhr.open("POST", url, false);
xhr.setRequestHeader("Content-Type", "application/json");
- const body = {
- session_id: this.session_id,
- license_message: license_message,
- };
xhr.send(JSON.stringify(body));
const jsonData = JSON.parse(xhr.responseText);
- if (
- jsonData.message === "Successfully parsed and loaded the Keys from the License message"
- ) {
- console.log("PlayReady license response parsed successfully");
+ if (jsonData.status === 200 || jsonData.message?.includes("parsed and loaded")) {
+ console.log("License response parsed successfully");
return true;
} else {
- console.error("Failed to parse PlayReady license response:", jsonData.message);
- throw new Error("Failed to parse PlayReady license response");
+ console.error("Failed to parse license response:", jsonData.message);
+ throw new Error("Failed to parse license response");
}
}
- // Get PlayReady keys
- getKeys() {
- const url = `${this.host}/remotecdm/playready/${this.device_name}/get_keys`;
+ getKeys(path, body, extraPath = "") {
+ const url = `${this.host}${path}/get_keys${extraPath}`;
const xhr = new XMLHttpRequest();
xhr.open("POST", url, false);
xhr.setRequestHeader("Content-Type", "application/json");
- const body = {
- session_id: this.session_id,
- };
xhr.send(JSON.stringify(body));
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.data?.keys) {
this.keys = jsonData.data.keys;
- console.log("PlayReady keys received:", this.keys);
+ console.log("Keys received:", this.keys);
} else {
- console.error("Failed to get PlayReady keys:", jsonData.message);
- throw new Error("Failed to get PlayReady keys");
+ console.error("Failed to get keys:", jsonData.message);
+ throw new Error("Failed to get keys");
}
}
- // Close PlayReady session
- closeSession() {
- const url = `${this.host}/remotecdm/playready/${this.device_name}/close/${this.session_id}`;
+ closeSession(path) {
+ const url = `${this.host}${path}/close/${this.session_id}`;
const xhr = new XMLHttpRequest();
xhr.open("GET", url, false);
xhr.setRequestHeader("Content-Type", "application/json");
xhr.send();
const jsonData = JSON.parse(xhr.responseText);
if (jsonData) {
- console.log("PlayReady session closed successfully");
+ console.log("Session closed successfully");
} else {
- console.error("Failed to close PlayReady session:", jsonData.message);
- throw new Error("Failed to close PlayReady session");
+ console.error("Failed to close session:", jsonData.message);
+ throw new Error("Failed to close session");
}
}
}
+// PlayReady Remote CDM Class
+class remotePlayReadyCDM extends RemoteCDMBase {
+ constructor(security_level, host, secret, device_name) {
+ super({ host, secret, device_name, security_level });
+ }
+
+ openSession() {
+ super.openSession(`/remotecdm/playready/${this.device_name}`);
+ }
+
+ getChallenge(init_data) {
+ super.getChallenge(`/remotecdm/playready/${this.device_name}`, {
+ session_id: this.session_id,
+ init_data: init_data,
+ });
+ }
+
+ parseLicense(license_message) {
+ return super.parseLicense(`/remotecdm/playready/${this.device_name}`, {
+ session_id: this.session_id,
+ license_message: license_message,
+ });
+ }
+
+ getKeys() {
+ super.getKeys(`/remotecdm/playready/${this.device_name}`, {
+ session_id: this.session_id,
+ });
+ }
+
+ closeSession() {
+ super.closeSession(`/remotecdm/playready/${this.device_name}`);
+ }
+}
+
// Widevine Remote CDM Class
-class remoteWidevineCDM {
+class remoteWidevineCDM extends RemoteCDMBase {
constructor(device_type, system_id, security_level, host, secret, device_name) {
+ super({ host, secret, device_name, security_level });
this.device_type = device_type;
this.system_id = system_id;
- this.security_level = security_level;
- this.host = host;
- this.secret = secret;
- this.device_name = device_name;
- this.session_id = null;
- this.challenge = null;
- this.keys = null;
}
- // Open Widevine session
openSession() {
- const url = `${this.host}/remotecdm/widevine/${this.device_name}/open`;
- const xhr = new XMLHttpRequest();
- xhr.open("GET", url, false);
- xhr.setRequestHeader("Content-Type", "application/json");
- xhr.send();
- const jsonData = JSON.parse(xhr.responseText);
- if (jsonData.data?.session_id) {
- this.session_id = jsonData.data.session_id;
- console.log("Widevine session opened:", this.session_id);
- } else {
- console.error("Failed to open Widevine session:", jsonData.message);
- throw new Error("Failed to open Widevine session");
- }
+ super.openSession(`/remotecdm/widevine/${this.device_name}`);
}
- // Set Widevine service certificate
setServiceCertificate(certificate) {
const url = `${this.host}/remotecdm/widevine/${this.device_name}/set_service_certificate`;
const xhr = new XMLHttpRequest();
@@ -358,7 +342,6 @@ class remoteWidevineCDM {
}
}
- // Get Widevine challenge
getChallenge(init_data, license_type = "STREAMING") {
const url = `${this.host}/remotecdm/widevine/${this.device_name}/get_license_challenge/${license_type}`;
const xhr = new XMLHttpRequest();
@@ -380,61 +363,25 @@ class remoteWidevineCDM {
}
}
- // Parse Widevine license response
parseLicense(license_message) {
- const url = `${this.host}/remotecdm/widevine/${this.device_name}/parse_license`;
- const xhr = new XMLHttpRequest();
- xhr.open("POST", url, false);
- xhr.setRequestHeader("Content-Type", "application/json");
- const body = {
+ return super.parseLicense(`/remotecdm/widevine/${this.device_name}`, {
session_id: this.session_id,
license_message: license_message,
- };
- xhr.send(JSON.stringify(body));
- const jsonData = JSON.parse(xhr.responseText);
- if (jsonData.status === 200) {
- console.log("Widevine license response parsed successfully");
- return true;
- } else {
- console.error("Failed to parse Widevine license response:", jsonData.message);
- throw new Error("Failed to parse Widevine license response");
- }
+ });
}
- // Get Widevine keys
getKeys() {
- const url = `${this.host}/remotecdm/widevine/${this.device_name}/get_keys/ALL`;
- const xhr = new XMLHttpRequest();
- xhr.open("POST", url, false);
- xhr.setRequestHeader("Content-Type", "application/json");
- const body = {
- session_id: this.session_id,
- };
- xhr.send(JSON.stringify(body));
- const jsonData = JSON.parse(xhr.responseText);
- if (jsonData.data?.keys) {
- this.keys = jsonData.data.keys;
- console.log("Widevine keys received:", this.keys);
- } else {
- console.error("Failed to get Widevine keys:", jsonData.message);
- throw new Error("Failed to get Widevine keys");
- }
+ super.getKeys(
+ `/remotecdm/widevine/${this.device_name}`,
+ {
+ session_id: this.session_id,
+ },
+ "/ALL"
+ );
}
- // Close Widevine session
closeSession() {
- const url = `${this.host}/remotecdm/widevine/${this.device_name}/close/${this.session_id}`;
- const xhr = new XMLHttpRequest();
- xhr.open("GET", url, false);
- xhr.setRequestHeader("Content-Type", "application/json");
- xhr.send();
- const jsonData = JSON.parse(xhr.responseText);
- if (jsonData) {
- console.log("Widevine session closed successfully");
- } else {
- console.error("Failed to close Widevine session:", jsonData.message);
- throw new Error("Failed to close Widevine session");
- }
+ super.closeSession(`/remotecdm/widevine/${this.device_name}`);
}
}
--
2.43.0
From 30e797bc09d4d44dd53b20b5e6e1c8bbab17dede Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:54:40 +0700
Subject: [PATCH 14/26] use global `DRM_SIGNATURES` for readability
---
src/inject.js | 106 +++++++++++++++++++++++++++++++-------------------
1 file changed, 66 insertions(+), 40 deletions(-)
diff --git a/src/inject.js b/src/inject.js
index 915083f..3b16d9d 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -17,6 +17,13 @@ let foundChallengeInBody = false;
let licenseResponseCounter = 0;
let keysRetrieved = false;
+const DRM_SIGNATURES = {
+ WIDEVINE: "CAES",
+ PLAYREADY: "PD94",
+ SERVICE_CERT: "CAUS",
+ WIDEVINE_INIT: "CAQ=",
+};
+
// Post message to content.js to get DRM override
window.postMessage({ type: "__GET_DRM_OVERRIDE__" }, "*");
@@ -398,7 +405,7 @@ function b64ToHexStr(b64) {
return [...atob(b64)].map((c) => c.charCodeAt(0).toString(16).padStart(2, "0")).join``;
}
-function jsonContainsValue(obj, prefix = "CAES") {
+function jsonContainsValue(obj, prefix = DRM_SIGNATURES.WIDEVINE) {
if (typeof obj === "string") return obj.startsWith(prefix);
if (Array.isArray(obj)) return obj.some((val) => jsonContainsValue(val, prefix));
if (typeof obj === "object" && obj !== null) {
@@ -409,7 +416,9 @@ function jsonContainsValue(obj, prefix = "CAES") {
function jsonReplaceValue(obj, newValue) {
if (typeof obj === "string") {
- return obj.startsWith("CAES") || obj.startsWith("PD94") ? newValue : obj;
+ return obj.startsWith(DRM_SIGNATURES.WIDEVINE) || obj.startsWith(DRM_SIGNATURES.PLAYREADY)
+ ? newValue
+ : obj;
}
if (Array.isArray(obj)) {
@@ -516,7 +525,11 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
event.stopImmediatePropagation();
const uint8Array = new Uint8Array(event.message);
const base64challenge = arrayBufferToBase64(uint8Array);
- if (base64challenge === "CAQ=" && interceptType !== "DISABLED" && !serviceCertFound) {
+ if (
+ base64challenge === DRM_SIGNATURES.WIDEVINE_INIT &&
+ interceptType !== "DISABLED" &&
+ !serviceCertFound
+ ) {
const { device_type, system_id, security_level, host, secret, device_name } =
widevineDeviceInfo;
remoteCDM = new remoteWidevineCDM(
@@ -529,14 +542,18 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
);
remoteCDM.openSession();
}
- if (!injectionSuccess && base64challenge !== "CAQ=" && interceptType !== "DISABLED") {
+ if (
+ !injectionSuccess &&
+ base64challenge !== DRM_SIGNATURES.WIDEVINE_INIT &&
+ interceptType !== "DISABLED"
+ ) {
if (interceptType === "EME") {
injectionSuccess = true;
}
if (!originalChallenge) {
originalChallenge = base64challenge;
}
- if (originalChallenge.startsWith("CAES")) {
+ if (originalChallenge.startsWith(DRM_SIGNATURES.WIDEVINE)) {
window.postMessage({ type: "__DRM_TYPE__", data: "Widevine" }, "*");
window.postMessage({ type: "__PSSH_DATA__", data: foundWidevinePssh }, "*");
if (interceptType === "EME" && !remoteCDM) {
@@ -560,7 +577,7 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
remoteCDM.getChallenge(foundWidevinePssh);
}
}
- if (!originalChallenge.startsWith("CAES")) {
+ if (!originalChallenge.startsWith(DRM_SIGNATURES.WIDEVINE)) {
const buffer = event.message;
const decoder = new TextDecoder("utf-16");
const decodedText = decoder.decode(buffer);
@@ -616,7 +633,12 @@ const originalUpdate = MediaKeySession.prototype.update;
MediaKeySession.prototype.update = function (response) {
const uint8 = response instanceof Uint8Array ? response : new Uint8Array(response);
const base64Response = window.btoa(String.fromCharCode(...uint8));
- if (base64Response.startsWith("CAUS") && foundWidevinePssh && remoteCDM && !serviceCertFound) {
+ if (
+ base64Response.startsWith(DRM_SIGNATURES.SERVICE_CERT) &&
+ foundWidevinePssh &&
+ remoteCDM &&
+ !serviceCertFound
+ ) {
remoteCDM.setServiceCertificate(base64Response);
if (interceptType === "EME" && !remoteCDM.challenge) {
remoteCDM.getChallenge(foundWidevinePssh);
@@ -626,7 +648,7 @@ MediaKeySession.prototype.update = function (response) {
serviceCertFound = true;
}
if (
- !base64Response.startsWith("CAUS") &&
+ !base64Response.startsWith(DRM_SIGNATURES.SERVICE_CERT) &&
(foundWidevinePssh || foundPlayreadyPssh) &&
!keysRetrieved
) {
@@ -680,7 +702,8 @@ MediaKeySession.prototype.update = function (response) {
const buffer = body instanceof Uint8Array ? body : new Uint8Array(body);
const base64Body = window.btoa(String.fromCharCode(...buffer));
if (
- (base64Body.startsWith("CAES") || base64Body.startsWith("PD94")) &&
+ (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
(!remoteCDM ||
remoteCDM.challenge === null ||
base64Body !== remoteCDM.challenge) &&
@@ -692,14 +715,15 @@ MediaKeySession.prototype.update = function (response) {
return;
}
if (
- (base64Body.startsWith("CAES") || base64Body.startsWith("PD94")) &&
+ (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
interceptType == "LICENSE" &&
!foundChallengeInBody
) {
foundChallengeInBody = true;
window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
if (!remoteCDM) {
- if (base64Body.startsWith("CAES")) {
+ if (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE)) {
const {
device_type,
system_id,
@@ -719,7 +743,7 @@ MediaKeySession.prototype.update = function (response) {
remoteCDM.openSession();
remoteCDM.getChallenge(foundWidevinePssh);
}
- if (base64Body.startsWith("PD94")) {
+ if (base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) {
const { security_level, host, secret, device_name } =
playreadyDeviceInfo;
remoteCDM = new remotePlayReadyCDM(
@@ -743,8 +767,8 @@ MediaKeySession.prototype.update = function (response) {
if (typeof body === "string" && !isJson(body)) {
const base64EncodedBody = btoa(body);
if (
- (base64EncodedBody.startsWith("CAES") ||
- base64EncodedBody.startsWith("PD94")) &&
+ (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
(!remoteCDM ||
remoteCDM.challenge === null ||
base64EncodedBody !== remoteCDM.challenge) &&
@@ -756,15 +780,15 @@ MediaKeySession.prototype.update = function (response) {
return;
}
if (
- (base64EncodedBody.startsWith("CAES") ||
- base64EncodedBody.startsWith("PD94")) &&
+ (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
interceptType == "LICENSE" &&
!foundChallengeInBody
) {
foundChallengeInBody = true;
window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
if (!remoteCDM) {
- if (base64EncodedBody.startsWith("CAES")) {
+ if (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE)) {
const {
device_type,
system_id,
@@ -784,7 +808,7 @@ MediaKeySession.prototype.update = function (response) {
remoteCDM.openSession();
remoteCDM.getChallenge(foundWidevinePssh);
}
- if (base64EncodedBody.startsWith("PD94")) {
+ if (base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) {
const { security_level, host, secret, device_name } =
playreadyDeviceInfo;
remoteCDM = new remotePlayReadyCDM(
@@ -809,8 +833,8 @@ MediaKeySession.prototype.update = function (response) {
const jsonBody = JSON.parse(body);
if (
- (jsonContainsValue(jsonBody, "CAES") ||
- jsonContainsValue(jsonBody, "PD94")) &&
+ (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
+ jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
(!remoteCDM || remoteCDM.challenge === null) &&
interceptType === "EME"
) {
@@ -821,15 +845,15 @@ MediaKeySession.prototype.update = function (response) {
}
if (
- (jsonContainsValue(jsonBody, "CAES") ||
- jsonContainsValue(jsonBody, "PD94")) &&
+ (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
+ jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
interceptType === "LICENSE" &&
!foundChallengeInBody
) {
foundChallengeInBody = true;
window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
if (!remoteCDM) {
- if (jsonContainsValue(jsonBody, "CAES")) {
+ if (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE)) {
const {
device_type,
system_id,
@@ -849,7 +873,7 @@ MediaKeySession.prototype.update = function (response) {
remoteCDM.openSession();
remoteCDM.getChallenge(foundWidevinePssh);
}
- if (jsonContainsValue(jsonBody, "PD94")) {
+ if (jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) {
const { security_level, host, secret, device_name } =
playreadyDeviceInfo;
remoteCDM = new remotePlayReadyCDM(
@@ -894,7 +918,8 @@ MediaKeySession.prototype.update = function (response) {
const buffer = body instanceof Uint8Array ? body : new Uint8Array(body);
const base64Body = window.btoa(String.fromCharCode(...buffer));
if (
- (base64Body.startsWith("CAES") || base64Body.startsWith("PD94")) &&
+ (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
(!remoteCDM ||
remoteCDM.challenge === null ||
base64Body !== remoteCDM.challenge) &&
@@ -906,14 +931,15 @@ MediaKeySession.prototype.update = function (response) {
return;
}
if (
- (base64Body.startsWith("CAES") || base64Body.startsWith("PD94")) &&
+ (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
interceptType == "LICENSE" &&
!foundChallengeInBody
) {
foundChallengeInBody = true;
window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
if (!remoteCDM) {
- if (base64Body.startsWith("CAES")) {
+ if (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE)) {
const {
device_type,
system_id,
@@ -933,7 +959,7 @@ MediaKeySession.prototype.update = function (response) {
remoteCDM.openSession();
remoteCDM.getChallenge(foundWidevinePssh);
}
- if (base64Body.startsWith("PD94")) {
+ if (base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) {
const { security_level, host, secret, device_name } =
playreadyDeviceInfo;
remoteCDM = new remotePlayReadyCDM(
@@ -957,8 +983,8 @@ MediaKeySession.prototype.update = function (response) {
if (typeof body === "string" && !isJson(body)) {
const base64EncodedBody = btoa(body);
if (
- (base64EncodedBody.startsWith("CAES") ||
- base64EncodedBody.startsWith("PD94")) &&
+ (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
(!remoteCDM ||
remoteCDM.challenge === null ||
base64EncodedBody !== remoteCDM.challenge) &&
@@ -970,15 +996,15 @@ MediaKeySession.prototype.update = function (response) {
return;
}
if (
- (base64EncodedBody.startsWith("CAES") ||
- base64EncodedBody.startsWith("PD94")) &&
+ (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
+ base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
interceptType == "LICENSE" &&
!foundChallengeInBody
) {
foundChallengeInBody = true;
window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
if (!remoteCDM) {
- if (base64EncodedBody.startsWith("CAES")) {
+ if (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE)) {
const {
device_type,
system_id,
@@ -998,7 +1024,7 @@ MediaKeySession.prototype.update = function (response) {
remoteCDM.openSession();
remoteCDM.getChallenge(foundWidevinePssh);
}
- if (base64EncodedBody.startsWith("PD94")) {
+ if (base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) {
const { security_level, host, secret, device_name } =
playreadyDeviceInfo;
remoteCDM = new remotePlayReadyCDM(
@@ -1023,8 +1049,8 @@ MediaKeySession.prototype.update = function (response) {
const jsonBody = JSON.parse(body);
if (
- (jsonContainsValue(jsonBody, "CAES") ||
- jsonContainsValue(jsonBody, "PD94")) &&
+ (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
+ jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
(!remoteCDM || remoteCDM.challenge === null) &&
interceptType === "EME"
) {
@@ -1035,15 +1061,15 @@ MediaKeySession.prototype.update = function (response) {
}
if (
- (jsonContainsValue(jsonBody, "CAES") ||
- jsonContainsValue(jsonBody, "PD94")) &&
+ (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
+ jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
interceptType === "LICENSE" &&
!foundChallengeInBody
) {
foundChallengeInBody = true;
window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
if (!remoteCDM) {
- if (jsonContainsValue(jsonBody, "CAES")) {
+ if (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE)) {
const {
device_type,
system_id,
@@ -1063,7 +1089,7 @@ MediaKeySession.prototype.update = function (response) {
remoteCDM.openSession();
remoteCDM.getChallenge(foundWidevinePssh);
}
- if (jsonContainsValue(jsonBody, "PD94")) {
+ if (jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) {
const { security_level, host, secret, device_name } =
playreadyDeviceInfo;
remoteCDM = new remotePlayReadyCDM(
--
2.43.0
From 89f66b25be3daedb6919d09b5da7d3b2388ef334 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 16:05:35 +0700
Subject: [PATCH 15/26] add extension prefix and color for ease of debugging
and filtering
---
src/background.js | 35 +++++++----
src/content.js | 17 +++++-
src/inject.js | 149 +++++++++++++++++++++++++++-------------------
3 files changed, 128 insertions(+), 73 deletions(-)
diff --git a/src/background.js b/src/background.js
index bbd7fd6..b5f70fc 100644
--- a/src/background.js
+++ b/src/background.js
@@ -13,27 +13,27 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
switch (type) {
case "DRM_TYPE":
- console.log("DRM Type:", data);
+ logWithPrefix("DRM Type:", data);
chrome.storage.local.set({ drmType: data });
break;
case "PSSH_DATA":
- console.log("Storing PSSH:", data);
+ logWithPrefix("Storing PSSH:", data);
chrome.storage.local.set({ latestPSSH: data });
break;
case "KEYS_DATA":
- console.log("Storing Decryption Keys:", data);
+ logWithPrefix("Storing Decryption Keys:", data);
chrome.storage.local.set({ latestKeys: data });
break;
case "LICENSE_URL":
- console.log("Storling License URL " + data);
+ logWithPrefix("Storling License URL " + data);
chrome.storage.local.set({ licenseURL: data });
break;
case "MANIFEST_URL":
- console.log("Storing Manifest URL:", data);
+ logWithPrefix("Storing Manifest URL:", data);
chrome.storage.local.set({ manifestURL: data });
break;
@@ -44,12 +44,27 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
// Set initial config and injection type on install
chrome.runtime.onInstalled.addListener((details) => {
+ const EXTENSION_PREFIX = "[CDRM EXTENSION]";
+ const PREFIX_COLOR = "black";
+ const PREFIX_BACKGROUND_COLOR = "yellow";
+
+ const logWithPrefix = (...args) => {
+ const style = `color: ${PREFIX_COLOR}; background: ${PREFIX_BACKGROUND_COLOR}; font-weight: bold; padding: 2px 4px; border-radius: 2px;`;
+ if (typeof args[0] === "string") {
+ // If the first arg is a string, prepend the prefix
+ console.log(`%c${EXTENSION_PREFIX}%c ${args[0]}`, style, "", ...args.slice(1));
+ } else {
+ // If not, just log the prefix and the rest
+ console.log(`%c${EXTENSION_PREFIX}`, style, ...args);
+ }
+ };
+
if (details.reason === "install") {
chrome.storage.local.set({ valid_config: false }, () => {
if (chrome.runtime.lastError) {
console.error("Error setting valid_config:", chrome.runtime.lastError);
} else {
- console.log("valid_config set to false on first install.");
+ logWithPrefix("valid_config set to false on first install.");
}
});
@@ -57,7 +72,7 @@ chrome.runtime.onInstalled.addListener((details) => {
if (chrome.runtime.lastError) {
console.error("Error setting Injection Type:", chrome.runtime.lastError);
} else {
- console.log("Injection type set to LICENSE on first install.");
+ logWithPrefix("Injection type set to LICENSE on first install.");
}
});
@@ -65,7 +80,7 @@ chrome.runtime.onInstalled.addListener((details) => {
if (chrome.runtime.lastError) {
console.error("Error setting DRM Override type:", chrome.runtime.lastError);
} else {
- console.log("DRM Override type set to DISABLED on first install.");
+ logWithPrefix("DRM Override type set to DISABLED on first install.");
}
});
@@ -73,7 +88,7 @@ chrome.runtime.onInstalled.addListener((details) => {
if (chrome.runtime.lastError) {
console.error("Error setting CDRM instance:", chrome.runtime.lastError);
} else {
- console.log("CDRM instance set to null.");
+ logWithPrefix("CDRM instance set to null.");
}
});
@@ -81,7 +96,7 @@ chrome.runtime.onInstalled.addListener((details) => {
if (chrome.runtime.lastError) {
console.error("Error setting CDRM API Key:", chrome.runtime.lastError);
} else {
- console.log("CDRM API Key set.");
+ logWithPrefix("CDRM API Key set.");
}
});
}
diff --git a/src/content.js b/src/content.js
index 0e12c93..221035d 100644
--- a/src/content.js
+++ b/src/content.js
@@ -68,6 +68,19 @@ window.addEventListener("message", function (event) {
}
// Manifest header and URL
+ const EXTENSION_PREFIX = "[CDRM EXTENSION]";
+ const PREFIX_COLOR = "black";
+ const PREFIX_BACKGROUND_COLOR = "yellow";
+ const logWithPrefix = (...args) => {
+ const style = `color: ${PREFIX_COLOR}; background: ${PREFIX_BACKGROUND_COLOR}; font-weight: bold; padding: 2px 4px; border-radius: 2px;`;
+ if (typeof args[0] === "string") {
+ // If the first arg is a string, prepend the prefix
+ console.log(`%c${EXTENSION_PREFIX}%c ${args[0]}`, style, "", ...args.slice(1));
+ } else {
+ // If not, just log the prefix and the rest
+ console.log(`%c${EXTENSION_PREFIX}`, style, ...args);
+ }
+ };
const seenManifestUrls = new Set();
@@ -75,7 +88,7 @@ window.addEventListener("message", function (event) {
const url = event.data.data;
if (seenManifestUrls.has(url)) return;
seenManifestUrls.add(url);
- console.log("✅ [Content] Unique manifest URL:", url);
+ logWithPrefix("✅ [Content] Unique manifest URL:", url);
chrome.runtime.sendMessage({
type: "MANIFEST_URL",
@@ -85,7 +98,7 @@ window.addEventListener("message", function (event) {
if (event.data?.type === "__MANIFEST_HEADERS__") {
const { url, headers } = event.data;
- console.log("[Content.js] Manifest Headers:", url, headers);
+ logWithPrefix("[Content.js] Manifest Headers:", url, headers);
chrome.runtime.sendMessage({
type: "MANIFEST_HEADERS",
diff --git a/src/inject.js b/src/inject.js
index 3b16d9d..3b463bc 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -24,6 +24,21 @@ const DRM_SIGNATURES = {
WIDEVINE_INIT: "CAQ=",
};
+const EXTENSION_PREFIX = "[CDRM EXTENSION]";
+const PREFIX_COLOR = "black";
+const PREFIX_BACKGROUND_COLOR = "yellow";
+
+const logWithPrefix = (...args) => {
+ const style = `color: ${PREFIX_COLOR}; background: ${PREFIX_BACKGROUND_COLOR}; font-weight: bold; padding: 2px 4px; border-radius: 2px;`;
+ if (typeof args[0] === "string") {
+ // If the first arg is a string, prepend the prefix
+ console.log(`%c${EXTENSION_PREFIX}%c ${args[0]}`, style, "", ...args.slice(1));
+ } else {
+ // If not, just log the prefix and the rest
+ console.log(`%c${EXTENSION_PREFIX}`, style, ...args);
+ }
+};
+
// Post message to content.js to get DRM override
window.postMessage({ type: "__GET_DRM_OVERRIDE__" }, "*");
@@ -32,7 +47,7 @@ window.addEventListener("message", function (event) {
if (event.source !== window) return;
if (event.data.type === "__DRM_OVERRIDE__") {
drmOverride = event.data.drmOverride || "DISABLED";
- console.log("DRM Override set to:", drmOverride);
+ logWithPrefix("DRM Override set to:", drmOverride);
}
});
@@ -45,7 +60,7 @@ window.addEventListener("message", function (event) {
if (event.data.type === "__INJECTION_TYPE__") {
interceptType = event.data.injectionType || "DISABLED";
- console.log("Injection type set to:", interceptType);
+ logWithPrefix("Injection type set to:", interceptType);
}
});
@@ -59,7 +74,7 @@ window.addEventListener("message", function (event) {
if (event.data.type === "__CDM_DEVICES__") {
const { widevine_device, playready_device } = event.data;
- console.log("Received device info:", widevine_device, playready_device);
+ logWithPrefix("Received device info:", widevine_device, playready_device);
widevineDeviceInfo = widevine_device;
playreadyDeviceInfo = playready_device;
@@ -90,7 +105,7 @@ function headersToFlags(headersObj) {
function handleManifestDetection(url, headersObj, contentType, source) {
window.postMessage({ type: "__MANIFEST_URL__", data: url }, "*");
- console.log(`[Manifest][${source}]`, url, contentType);
+ logWithPrefix(`[Manifest][${source}]`, url, contentType);
const headerFlags = headersToFlags(headersObj);
@@ -209,7 +224,7 @@ class RemoteCDMBase {
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.data?.session_id) {
this.session_id = jsonData.data.session_id;
- console.log("Session opened:", this.session_id);
+ logWithPrefix("Session opened:", this.session_id);
} else {
console.error("Failed to open session:", jsonData.message);
throw new Error("Failed to open session");
@@ -225,10 +240,10 @@ class RemoteCDMBase {
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.data?.challenge) {
this.challenge = btoa(jsonData.data.challenge);
- console.log("Challenge received:", this.challenge);
+ logWithPrefix("Challenge received:", this.challenge);
} else if (jsonData.data?.challenge_b64) {
this.challenge = jsonData.data.challenge_b64;
- console.log("Challenge received:", this.challenge);
+ logWithPrefix("Challenge received:", this.challenge);
} else {
console.error("Failed to get challenge:", jsonData.message);
throw new Error("Failed to get challenge");
@@ -243,7 +258,7 @@ class RemoteCDMBase {
xhr.send(JSON.stringify(body));
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.status === 200 || jsonData.message?.includes("parsed and loaded")) {
- console.log("License response parsed successfully");
+ logWithPrefix("License response parsed successfully");
return true;
} else {
console.error("Failed to parse license response:", jsonData.message);
@@ -260,7 +275,7 @@ class RemoteCDMBase {
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.data?.keys) {
this.keys = jsonData.data.keys;
- console.log("Keys received:", this.keys);
+ logWithPrefix("Keys received:", this.keys);
} else {
console.error("Failed to get keys:", jsonData.message);
throw new Error("Failed to get keys");
@@ -275,7 +290,7 @@ class RemoteCDMBase {
xhr.send();
const jsonData = JSON.parse(xhr.responseText);
if (jsonData) {
- console.log("Session closed successfully");
+ logWithPrefix("Session closed successfully");
} else {
console.error("Failed to close session:", jsonData.message);
throw new Error("Failed to close session");
@@ -342,7 +357,7 @@ class remoteWidevineCDM extends RemoteCDMBase {
xhr.send(JSON.stringify(body));
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.status === 200) {
- console.log("Service certificate set successfully");
+ logWithPrefix("Service certificate set successfully");
} else {
console.error("Failed to set service certificate:", jsonData.message);
throw new Error("Failed to set service certificate");
@@ -363,7 +378,7 @@ class remoteWidevineCDM extends RemoteCDMBase {
const jsonData = JSON.parse(xhr.responseText);
if (jsonData.data?.challenge_b64) {
this.challenge = jsonData.data.challenge_b64;
- console.log("Widevine challenge received:", this.challenge);
+ logWithPrefix("Widevine challenge received:", this.challenge);
} else {
console.error("Failed to get Widevine challenge:", jsonData.message);
throw new Error("Failed to get Widevine challenge");
@@ -501,30 +516,74 @@ function arrayBufferToBase64(uint8array) {
return window.btoa(binary);
}
+function bufferToBase64(buffer) {
+ const uint8 = buffer instanceof Uint8Array ? buffer : new Uint8Array(buffer);
+ return window.btoa(String.fromCharCode(...uint8));
+}
+
+// DRM type detection
+function isWidevine(base64str) {
+ return base64str.startsWith(DRM_SIGNATURES.WIDEVINE);
+}
+function isPlayReady(base64str) {
+ return base64str.startsWith(DRM_SIGNATURES.PLAYREADY);
+}
+function isServiceCertificate(base64str) {
+ return base64str.startsWith(DRM_SIGNATURES.SERVICE_CERT);
+}
+
+function postDRMTypeAndPssh(type, pssh) {
+ window.postMessage({ type: "__DRM_TYPE__", data: type }, "*");
+ window.postMessage({ type: "__PSSH_DATA__", data: pssh }, "*");
+}
+
+function ensureRemoteCDM(type, deviceInfo, pssh) {
+ if (!remoteCDM) {
+ if (type === "Widevine") {
+ const { device_type, system_id, security_level, host, secret, device_name } =
+ deviceInfo;
+ remoteCDM = new remoteWidevineCDM(
+ device_type,
+ system_id,
+ security_level,
+ host,
+ secret,
+ device_name
+ );
+ remoteCDM.openSession();
+ remoteCDM.getChallenge(pssh);
+ } else if (type === "PlayReady") {
+ const { security_level, host, secret, device_name } = deviceInfo;
+ remoteCDM = new remotePlayReadyCDM(security_level, host, secret, device_name);
+ remoteCDM.openSession();
+ remoteCDM.getChallenge(pssh);
+ }
+ }
+}
+
// Challenge generator interceptor
const originalGenerateRequest = MediaKeySession.prototype.generateRequest;
MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
const session = this;
let playReadyPssh = getPlayReadyPssh(initData);
if (playReadyPssh) {
- console.log("[DRM Detected] PlayReady");
+ logWithPrefix("[DRM Detected] PlayReady");
foundPlayreadyPssh = playReadyPssh;
- console.log("[PlayReady PSSH found] " + playReadyPssh);
+ logWithPrefix("[PlayReady PSSH found] " + playReadyPssh);
}
let wideVinePssh = getWidevinePssh(initData);
if (wideVinePssh) {
// Widevine code
- console.log("[DRM Detected] Widevine");
+ logWithPrefix("[DRM Detected] Widevine");
foundWidevinePssh = wideVinePssh;
- console.log("[Widevine PSSH found] " + wideVinePssh);
+ logWithPrefix("[Widevine PSSH found] " + wideVinePssh);
}
// Challenge message interceptor
if (!remoteListenerMounted) {
remoteListenerMounted = true;
session.addEventListener("message", function messageInterceptor(event) {
event.stopImmediatePropagation();
- const uint8Array = new Uint8Array(event.message);
- const base64challenge = arrayBufferToBase64(uint8Array);
+ const base64challenge = bufferToBase64(event.message);
if (
base64challenge === DRM_SIGNATURES.WIDEVINE_INIT &&
interceptType !== "DISABLED" &&
@@ -554,27 +613,9 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
originalChallenge = base64challenge;
}
if (originalChallenge.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- window.postMessage({ type: "__DRM_TYPE__", data: "Widevine" }, "*");
- window.postMessage({ type: "__PSSH_DATA__", data: foundWidevinePssh }, "*");
- if (interceptType === "EME" && !remoteCDM) {
- const {
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name,
- } = widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
- );
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundWidevinePssh);
+ postDRMTypeAndPssh("Widevine", foundWidevinePssh);
+ if (interceptType === "EME") {
+ ensureRemoteCDM("Widevine", widevineDeviceInfo, foundWidevinePssh);
}
}
if (!originalChallenge.startsWith(DRM_SIGNATURES.WIDEVINE)) {
@@ -585,23 +626,10 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
/([^<]+)<\/Challenge>/
);
if (match) {
- window.postMessage({ type: "__DRM_TYPE__", data: "PlayReady" }, "*");
- window.postMessage(
- { type: "__PSSH_DATA__", data: foundPlayreadyPssh },
- "*"
- );
+ postDRMTypeAndPssh("PlayReady", foundPlayreadyPssh);
originalChallenge = match[1];
- if (interceptType === "EME" && !remoteCDM) {
- const { security_level, host, secret, device_name } =
- playreadyDeviceInfo;
- remoteCDM = new remotePlayReadyCDM(
- security_level,
- host,
- secret,
- device_name
- );
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundPlayreadyPssh);
+ if (interceptType === "EME") {
+ ensureRemoteCDM("PlayReady", playreadyDeviceInfo, foundPlayreadyPssh);
}
}
}
@@ -618,12 +646,12 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
Object.defineProperty(syntheticEvent, "message", {
get: () => challengeBuffer,
});
- console.log("Intercepted EME Challenge and injected custom one.");
+ logWithPrefix("Intercepted EME Challenge and injected custom one.");
session.dispatchEvent(syntheticEvent);
}
}
});
- console.log("Message interceptor mounted.");
+ logWithPrefix("Message interceptor mounted.");
}
return originalGenerateRequest.call(session, initDataType, initData);
};
@@ -631,8 +659,7 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
// Message update interceptors
const originalUpdate = MediaKeySession.prototype.update;
MediaKeySession.prototype.update = function (response) {
- const uint8 = response instanceof Uint8Array ? response : new Uint8Array(response);
- const base64Response = window.btoa(String.fromCharCode(...uint8));
+ const base64Response = bufferToBase64(response);
if (
base64Response.startsWith(DRM_SIGNATURES.SERVICE_CERT) &&
foundWidevinePssh &&
@@ -667,7 +694,7 @@ MediaKeySession.prototype.update = function (response) {
.then(() => {
let clearKeys = getClearkey(response);
if (clearKeys && clearKeys.length > 0) {
- console.log("[CLEARKEY] ", clearKeys);
+ logWithPrefix("[CLEARKEY] ", clearKeys);
const drmType = {
type: "__DRM_TYPE__",
data: "ClearKey",
@@ -681,7 +708,7 @@ MediaKeySession.prototype.update = function (response) {
}
})
.catch((e) => {
- console.log("[CLEARKEY] Not found");
+ logWithPrefix("[CLEARKEY] Not found");
});
}
--
2.43.0
From 9e071365e372dda6424041f37eff597be50819cb Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 17:18:18 +0700
Subject: [PATCH 16/26] use regular prefix instead of adding color. fixes not
storing to `chrome.storage.local`
---
src/background.js | 47 ++++++++++++++++-------------------------------
src/content.js | 19 +++----------------
2 files changed, 19 insertions(+), 47 deletions(-)
diff --git a/src/background.js b/src/background.js
index b5f70fc..03c5e12 100644
--- a/src/background.js
+++ b/src/background.js
@@ -13,90 +13,75 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
switch (type) {
case "DRM_TYPE":
- logWithPrefix("DRM Type:", data);
+ console.log("[CDRM-Extension] DRM Type:", data);
chrome.storage.local.set({ drmType: data });
break;
case "PSSH_DATA":
- logWithPrefix("Storing PSSH:", data);
+ console.log("[CDRM-Extension] Storing PSSH:", data);
chrome.storage.local.set({ latestPSSH: data });
break;
case "KEYS_DATA":
- logWithPrefix("Storing Decryption Keys:", data);
+ console.log("[CDRM-Extension] Storing Decryption Keys:", data);
chrome.storage.local.set({ latestKeys: data });
break;
case "LICENSE_URL":
- logWithPrefix("Storling License URL " + data);
+ console.log("[CDRM-Extension] Storing License URL " + data);
chrome.storage.local.set({ licenseURL: data });
break;
case "MANIFEST_URL":
- logWithPrefix("Storing Manifest URL:", data);
+ console.log("[CDRM-Extension] Storing Manifest URL:", data);
chrome.storage.local.set({ manifestURL: data });
break;
default:
- console.warn("Unknown message type received:", type);
+ console.warn("[CDRM-Extension] Unknown message type received:", type);
}
});
// Set initial config and injection type on install
chrome.runtime.onInstalled.addListener((details) => {
- const EXTENSION_PREFIX = "[CDRM EXTENSION]";
- const PREFIX_COLOR = "black";
- const PREFIX_BACKGROUND_COLOR = "yellow";
-
- const logWithPrefix = (...args) => {
- const style = `color: ${PREFIX_COLOR}; background: ${PREFIX_BACKGROUND_COLOR}; font-weight: bold; padding: 2px 4px; border-radius: 2px;`;
- if (typeof args[0] === "string") {
- // If the first arg is a string, prepend the prefix
- console.log(`%c${EXTENSION_PREFIX}%c ${args[0]}`, style, "", ...args.slice(1));
- } else {
- // If not, just log the prefix and the rest
- console.log(`%c${EXTENSION_PREFIX}`, style, ...args);
- }
- };
-
if (details.reason === "install") {
chrome.storage.local.set({ valid_config: false }, () => {
if (chrome.runtime.lastError) {
- console.error("Error setting valid_config:", chrome.runtime.lastError);
+ console.error("[CDRM-Extension] Error setting valid_config:", chrome.runtime.lastError);
} else {
- logWithPrefix("valid_config set to false on first install.");
+ console.log("[CDRM-Extension] valid_config set to false on first install.");
}
});
chrome.storage.local.set({ injection_type: "LICENSE" }, () => {
if (chrome.runtime.lastError) {
- console.error("Error setting Injection Type:", chrome.runtime.lastError);
+ console.error("[CDRM-Extension] Error setting Injection Type:", chrome.runtime.lastError);
} else {
- logWithPrefix("Injection type set to LICENSE on first install.");
+ console.log("[CDRM-Extension] Injection type set to LICENSE on first install.");
}
});
chrome.storage.local.set({ drm_override: "DISABLED" }, () => {
if (chrome.runtime.lastError) {
- console.error("Error setting DRM Override type:", chrome.runtime.lastError);
+ console.error("[CDRM-Extension] Error setting DRM Override type:", chrome.runtime.lastError);
} else {
- logWithPrefix("DRM Override type set to DISABLED on first install.");
+ console.log("[CDRM-Extension] DRM Override type set to DISABLED on first install.");
}
});
chrome.storage.local.set({ cdrm_instance: null }, () => {
if (chrome.runtime.lastError) {
- console.error("Error setting CDRM instance:", chrome.runtime.lastError);
+ console.error("[CDRM-Extension] Error setting CDRM instance:", chrome.runtime.lastError);
} else {
- logWithPrefix("CDRM instance set to null.");
+ console.log("[CDRM-Extension] CDRM instance set to null.");
}
});
chrome.storage.local.set({ cdrm_api_key: null }, () => {
if (chrome.runtime.lastError) {
- console.error("Error setting CDRM API Key:", chrome.runtime.lastError);
+ console.error("[CDRM-Extension] Error setting CDRM API Key:", chrome.runtime.lastError);
} else {
- logWithPrefix("CDRM API Key set.");
+ console.log("[CDRM-Extension] CDRM API Key set.");
}
});
}
diff --git a/src/content.js b/src/content.js
index 221035d..85e397e 100644
--- a/src/content.js
+++ b/src/content.js
@@ -68,19 +68,6 @@ window.addEventListener("message", function (event) {
}
// Manifest header and URL
- const EXTENSION_PREFIX = "[CDRM EXTENSION]";
- const PREFIX_COLOR = "black";
- const PREFIX_BACKGROUND_COLOR = "yellow";
- const logWithPrefix = (...args) => {
- const style = `color: ${PREFIX_COLOR}; background: ${PREFIX_BACKGROUND_COLOR}; font-weight: bold; padding: 2px 4px; border-radius: 2px;`;
- if (typeof args[0] === "string") {
- // If the first arg is a string, prepend the prefix
- console.log(`%c${EXTENSION_PREFIX}%c ${args[0]}`, style, "", ...args.slice(1));
- } else {
- // If not, just log the prefix and the rest
- console.log(`%c${EXTENSION_PREFIX}`, style, ...args);
- }
- };
const seenManifestUrls = new Set();
@@ -88,17 +75,17 @@ window.addEventListener("message", function (event) {
const url = event.data.data;
if (seenManifestUrls.has(url)) return;
seenManifestUrls.add(url);
- logWithPrefix("✅ [Content] Unique manifest URL:", url);
+ console.log("[CDRM-Extension] ✅ [content.js] Unique manifest URL:", url);
chrome.runtime.sendMessage({
- type: "MANIFEST_URL",
+ type: "MANIFEST_URL_FOUND",
data: url,
});
}
if (event.data?.type === "__MANIFEST_HEADERS__") {
const { url, headers } = event.data;
- logWithPrefix("[Content.js] Manifest Headers:", url, headers);
+ console.log("[CDRM-Extension] [content.js] Manifest headers:", url, headers);
chrome.runtime.sendMessage({
type: "MANIFEST_HEADERS",
--
2.43.0
From f8712d7726dcd70e299bda396f1660fcfb6923c0 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 18:28:59 +0700
Subject: [PATCH 17/26] refactor: consolidate remote cdm initialization into a
helper function
---
src/inject.js | 261 +++++++++++++++-----------------------------------
1 file changed, 76 insertions(+), 185 deletions(-)
diff --git a/src/inject.js b/src/inject.js
index 3b463bc..3156ae5 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -537,27 +537,32 @@ function postDRMTypeAndPssh(type, pssh) {
window.postMessage({ type: "__PSSH_DATA__", data: pssh }, "*");
}
+function createAndOpenRemoteCDM(type, deviceInfo, pssh) {
+ let cdm;
+ if (type === "Widevine") {
+ const { device_type, system_id, security_level, host, secret, device_name } = deviceInfo;
+ cdm = new remoteWidevineCDM(
+ device_type,
+ system_id,
+ security_level,
+ host,
+ secret,
+ device_name
+ );
+ cdm.openSession();
+ cdm.getChallenge(pssh);
+ } else if (type === "PlayReady") {
+ const { security_level, host, secret, device_name } = deviceInfo;
+ cdm = new remotePlayReadyCDM(security_level, host, secret, device_name);
+ cdm.openSession();
+ cdm.getChallenge(pssh);
+ }
+ return cdm;
+}
+
function ensureRemoteCDM(type, deviceInfo, pssh) {
if (!remoteCDM) {
- if (type === "Widevine") {
- const { device_type, system_id, security_level, host, secret, device_name } =
- deviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
- );
- remoteCDM.openSession();
- remoteCDM.getChallenge(pssh);
- } else if (type === "PlayReady") {
- const { security_level, host, secret, device_name } = deviceInfo;
- remoteCDM = new remotePlayReadyCDM(security_level, host, secret, device_name);
- remoteCDM.openSession();
- remoteCDM.getChallenge(pssh);
- }
+ remoteCDM = createAndOpenRemoteCDM(type, deviceInfo, pssh);
}
}
@@ -589,17 +594,11 @@ MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
interceptType !== "DISABLED" &&
!serviceCertFound
) {
- const { device_type, system_id, security_level, host, secret, device_name } =
- widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "Widevine",
+ widevineDeviceInfo,
+ foundWidevinePssh
);
- remoteCDM.openSession();
}
if (
!injectionSuccess &&
@@ -751,36 +750,18 @@ MediaKeySession.prototype.update = function (response) {
window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
if (!remoteCDM) {
if (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- const {
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name,
- } = widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "Widevine",
+ widevineDeviceInfo,
+ foundWidevinePssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundWidevinePssh);
}
if (base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- const { security_level, host, secret, device_name } =
- playreadyDeviceInfo;
- remoteCDM = new remotePlayReadyCDM(
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "PlayReady",
+ playreadyDeviceInfo,
+ foundPlayreadyPssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundPlayreadyPssh);
}
}
if (remoteCDM && remoteCDM.challenge === null) {
@@ -816,36 +797,18 @@ MediaKeySession.prototype.update = function (response) {
window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
if (!remoteCDM) {
if (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- const {
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name,
- } = widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "Widevine",
+ widevineDeviceInfo,
+ foundWidevinePssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundWidevinePssh);
}
if (base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- const { security_level, host, secret, device_name } =
- playreadyDeviceInfo;
- remoteCDM = new remotePlayReadyCDM(
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "PlayReady",
+ playreadyDeviceInfo,
+ foundPlayreadyPssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundPlayreadyPssh);
}
}
if (remoteCDM && remoteCDM.challenge === null) {
@@ -881,36 +844,18 @@ MediaKeySession.prototype.update = function (response) {
window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
if (!remoteCDM) {
if (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE)) {
- const {
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name,
- } = widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "Widevine",
+ widevineDeviceInfo,
+ foundWidevinePssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundWidevinePssh);
}
if (jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) {
- const { security_level, host, secret, device_name } =
- playreadyDeviceInfo;
- remoteCDM = new remotePlayReadyCDM(
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "PlayReady",
+ playreadyDeviceInfo,
+ foundPlayreadyPssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundPlayreadyPssh);
}
}
if (remoteCDM && remoteCDM.challenge === null) {
@@ -967,36 +912,18 @@ MediaKeySession.prototype.update = function (response) {
window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
if (!remoteCDM) {
if (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- const {
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name,
- } = widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "Widevine",
+ widevineDeviceInfo,
+ foundWidevinePssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundWidevinePssh);
}
if (base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- const { security_level, host, secret, device_name } =
- playreadyDeviceInfo;
- remoteCDM = new remotePlayReadyCDM(
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "PlayReady",
+ playreadyDeviceInfo,
+ foundPlayreadyPssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundPlayreadyPssh);
}
}
if (remoteCDM && remoteCDM.challenge === null) {
@@ -1032,36 +959,18 @@ MediaKeySession.prototype.update = function (response) {
window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
if (!remoteCDM) {
if (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- const {
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name,
- } = widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "Widevine",
+ widevineDeviceInfo,
+ foundWidevinePssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundWidevinePssh);
}
if (base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- const { security_level, host, secret, device_name } =
- playreadyDeviceInfo;
- remoteCDM = new remotePlayReadyCDM(
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "PlayReady",
+ playreadyDeviceInfo,
+ foundPlayreadyPssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundPlayreadyPssh);
}
}
if (remoteCDM && remoteCDM.challenge === null) {
@@ -1097,36 +1006,18 @@ MediaKeySession.prototype.update = function (response) {
window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
if (!remoteCDM) {
if (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE)) {
- const {
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name,
- } = widevineDeviceInfo;
- remoteCDM = new remoteWidevineCDM(
- device_type,
- system_id,
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "Widevine",
+ widevineDeviceInfo,
+ foundWidevinePssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundWidevinePssh);
}
if (jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) {
- const { security_level, host, secret, device_name } =
- playreadyDeviceInfo;
- remoteCDM = new remotePlayReadyCDM(
- security_level,
- host,
- secret,
- device_name
+ remoteCDM = createAndOpenRemoteCDM(
+ "PlayReady",
+ playreadyDeviceInfo,
+ foundPlayreadyPssh
);
- remoteCDM.openSession();
- remoteCDM.getChallenge(foundPlayreadyPssh);
}
}
if (remoteCDM && remoteCDM.challenge === null) {
--
2.43.0
From 867294f7f60135ae89d896bb01d809243dc3908b Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 20:25:47 +0700
Subject: [PATCH 18/26] refactor: extract DRM challenge detection and handling
for fetch and XHR requests
---
src/inject.js | 406 ++++++++++++++++----------------------------------
1 file changed, 130 insertions(+), 276 deletions(-)
diff --git a/src/inject.js b/src/inject.js
index 3156ae5..678a607 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -714,6 +714,81 @@ MediaKeySession.prototype.update = function (response) {
return updatePromise;
};
+// Helpers
+function detectDRMChallenge(body) {
+ // Handles ArrayBuffer, Uint8Array, string, and JSON string
+ // Returns: { type: "Widevine"|"PlayReady"|null, base64: string|null, bodyType: "buffer"|"string"|"json"|null }
+ if (body instanceof ArrayBuffer || body instanceof Uint8Array) {
+ const buffer = body instanceof Uint8Array ? body : new Uint8Array(body);
+ const base64Body = window.btoa(String.fromCharCode(...buffer));
+ if (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE)) {
+ return { type: "Widevine", base64: base64Body, bodyType: "buffer" };
+ }
+ if (base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) {
+ return { type: "PlayReady", base64: base64Body, bodyType: "buffer" };
+ }
+ } else if (typeof body === "string" && !isJson(body)) {
+ const base64EncodedBody = btoa(body);
+ if (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE)) {
+ return { type: "Widevine", base64: base64EncodedBody, bodyType: "string" };
+ }
+ if (base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) {
+ return { type: "PlayReady", base64: base64EncodedBody, bodyType: "string" };
+ }
+ } else if (typeof body === "string" && isJson(body)) {
+ const jsonBody = JSON.parse(body);
+ if (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE)) {
+ return { type: "Widevine", base64: null, bodyType: "json" };
+ }
+ if (jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) {
+ return { type: "PlayReady", base64: null, bodyType: "json" };
+ }
+ }
+ return { type: null, base64: null, bodyType: null };
+}
+
+function handleLicenseMode({
+ drmInfo,
+ body,
+ setBody, // function to set the new body (for fetch: (b) => config.body = b, for XHR: (b) => originalSend.call(this, b))
+ urlOrResource,
+ getWidevinePssh,
+ getPlayreadyPssh,
+ widevineDeviceInfo,
+ playreadyDeviceInfo,
+}) {
+ foundChallengeInBody = true;
+ window.postMessage({ type: "__LICENSE_URL__", data: urlOrResource }, "*");
+
+ // Create remoteCDM if needed
+ if (!remoteCDM) {
+ if (drmInfo.type === "Widevine") {
+ remoteCDM = createAndOpenRemoteCDM("Widevine", widevineDeviceInfo, getWidevinePssh());
+ }
+ if (drmInfo.type === "PlayReady") {
+ remoteCDM = createAndOpenRemoteCDM(
+ "PlayReady",
+ playreadyDeviceInfo,
+ getPlayreadyPssh()
+ );
+ }
+ }
+ if (remoteCDM && remoteCDM.challenge === null) {
+ remoteCDM.getChallenge(getWidevinePssh());
+ }
+
+ // Inject the new challenge into the request body
+ if (drmInfo.bodyType === "json") {
+ const jsonBody = JSON.parse(body);
+ const injectedBody = jsonReplaceValue(jsonBody, remoteCDM.challenge);
+ setBody(JSON.stringify(injectedBody));
+ } else if (drmInfo.bodyType === "buffer") {
+ setBody(base64ToUint8Array(remoteCDM.challenge));
+ } else {
+ setBody(atob(remoteCDM.challenge));
+ }
+}
+
// fetch POST interceptor
(function () {
const originalFetch = window.fetch;
@@ -724,146 +799,37 @@ MediaKeySession.prototype.update = function (response) {
if (method === "POST") {
let body = config.body;
if (body) {
- if (body instanceof ArrayBuffer || body instanceof Uint8Array) {
- const buffer = body instanceof Uint8Array ? body : new Uint8Array(body);
- const base64Body = window.btoa(String.fromCharCode(...buffer));
- if (
- (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- (!remoteCDM ||
- remoteCDM.challenge === null ||
- base64Body !== remoteCDM.challenge) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
- // Block the request
- return;
- }
- if (
- (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- interceptType == "LICENSE" &&
- !foundChallengeInBody
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
- if (!remoteCDM) {
- if (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- remoteCDM = createAndOpenRemoteCDM(
- "Widevine",
- widevineDeviceInfo,
- foundWidevinePssh
- );
- }
- if (base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- remoteCDM = createAndOpenRemoteCDM(
- "PlayReady",
- playreadyDeviceInfo,
- foundPlayreadyPssh
- );
- }
- }
- if (remoteCDM && remoteCDM.challenge === null) {
- remoteCDM.getChallenge(foundWidevinePssh);
- }
- const injectedBody = base64ToUint8Array(remoteCDM.challenge);
- config.body = injectedBody;
- return originalFetch(resource, config);
- }
- }
- if (typeof body === "string" && !isJson(body)) {
- const base64EncodedBody = btoa(body);
- if (
- (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- (!remoteCDM ||
- remoteCDM.challenge === null ||
- base64EncodedBody !== remoteCDM.challenge) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
- // Block the request
- return;
- }
- if (
- (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- interceptType == "LICENSE" &&
- !foundChallengeInBody
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
- if (!remoteCDM) {
- if (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- remoteCDM = createAndOpenRemoteCDM(
- "Widevine",
- widevineDeviceInfo,
- foundWidevinePssh
- );
- }
- if (base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- remoteCDM = createAndOpenRemoteCDM(
- "PlayReady",
- playreadyDeviceInfo,
- foundPlayreadyPssh
- );
- }
- }
- if (remoteCDM && remoteCDM.challenge === null) {
- remoteCDM.getChallenge(foundWidevinePssh);
- }
- const injectedBody = atob(remoteCDM.challenge);
- config.body = injectedBody;
- return originalFetch(resource, config);
- }
- }
- if (typeof body === "string" && isJson(body)) {
- const jsonBody = JSON.parse(body);
+ const drmInfo = detectDRMChallenge(body);
- if (
- (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
- jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
- (!remoteCDM || remoteCDM.challenge === null) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
- // Block the request
- return;
- }
+ // EME mode: block the request if a DRM challenge is detected
+ if (
+ drmInfo.type &&
+ (!remoteCDM ||
+ remoteCDM.challenge === null ||
+ drmInfo.base64 !== remoteCDM.challenge) &&
+ interceptType === "EME"
+ ) {
+ foundChallengeInBody = true;
+ window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
+ // Block the request
+ return;
+ }
- if (
- (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
- jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
- interceptType === "LICENSE" &&
- !foundChallengeInBody
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
- if (!remoteCDM) {
- if (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE)) {
- remoteCDM = createAndOpenRemoteCDM(
- "Widevine",
- widevineDeviceInfo,
- foundWidevinePssh
- );
- }
- if (jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) {
- remoteCDM = createAndOpenRemoteCDM(
- "PlayReady",
- playreadyDeviceInfo,
- foundPlayreadyPssh
- );
- }
- }
- if (remoteCDM && remoteCDM.challenge === null) {
- remoteCDM.getChallenge(foundWidevinePssh);
- }
- const injectedBody = jsonReplaceValue(jsonBody, remoteCDM.challenge);
- config.body = JSON.stringify(injectedBody);
- }
+ // LICENSE mode: replace the challenge in the request
+ if (drmInfo.type && interceptType === "LICENSE" && !foundChallengeInBody) {
+ handleLicenseMode({
+ drmInfo,
+ body,
+ setBody: (b) => {
+ config.body = b;
+ },
+ urlOrResource: resource,
+ getWidevinePssh: () => foundWidevinePssh,
+ getPlayreadyPssh: () => foundPlayreadyPssh,
+ widevineDeviceInfo,
+ playreadyDeviceInfo,
+ });
+ return originalFetch(resource, config);
}
}
}
@@ -886,146 +852,34 @@ MediaKeySession.prototype.update = function (response) {
XMLHttpRequest.prototype.send = function (body) {
if (this._method && this._method.toUpperCase() === "POST") {
if (body) {
- if (body instanceof ArrayBuffer || body instanceof Uint8Array) {
- const buffer = body instanceof Uint8Array ? body : new Uint8Array(body);
- const base64Body = window.btoa(String.fromCharCode(...buffer));
- if (
- (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- (!remoteCDM ||
- remoteCDM.challenge === null ||
- base64Body !== remoteCDM.challenge) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
- // Block the request
- return;
- }
- if (
- (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- interceptType == "LICENSE" &&
- !foundChallengeInBody
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
- if (!remoteCDM) {
- if (base64Body.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- remoteCDM = createAndOpenRemoteCDM(
- "Widevine",
- widevineDeviceInfo,
- foundWidevinePssh
- );
- }
- if (base64Body.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- remoteCDM = createAndOpenRemoteCDM(
- "PlayReady",
- playreadyDeviceInfo,
- foundPlayreadyPssh
- );
- }
- }
- if (remoteCDM && remoteCDM.challenge === null) {
- remoteCDM.getChallenge(foundWidevinePssh);
- }
- const injectedBody = base64ToUint8Array(remoteCDM.challenge);
- return originalSend.call(this, injectedBody);
- }
+ const drmInfo = detectDRMChallenge(body);
+
+ // EME mode: block the request if a DRM challenge is detected
+ if (
+ drmInfo.type &&
+ (!remoteCDM ||
+ remoteCDM.challenge === null ||
+ drmInfo.base64 !== remoteCDM.challenge) &&
+ interceptType === "EME"
+ ) {
+ foundChallengeInBody = true;
+ window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
+ // Block the request
+ return;
}
- if (typeof body === "string" && !isJson(body)) {
- const base64EncodedBody = btoa(body);
- if (
- (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- (!remoteCDM ||
- remoteCDM.challenge === null ||
- base64EncodedBody !== remoteCDM.challenge) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
- // Block the request
- return;
- }
- if (
- (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE) ||
- base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) &&
- interceptType == "LICENSE" &&
- !foundChallengeInBody
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
- if (!remoteCDM) {
- if (base64EncodedBody.startsWith(DRM_SIGNATURES.WIDEVINE)) {
- remoteCDM = createAndOpenRemoteCDM(
- "Widevine",
- widevineDeviceInfo,
- foundWidevinePssh
- );
- }
- if (base64EncodedBody.startsWith(DRM_SIGNATURES.PLAYREADY)) {
- remoteCDM = createAndOpenRemoteCDM(
- "PlayReady",
- playreadyDeviceInfo,
- foundPlayreadyPssh
- );
- }
- }
- if (remoteCDM && remoteCDM.challenge === null) {
- remoteCDM.getChallenge(foundWidevinePssh);
- }
- const injectedBody = atob(remoteCDM.challenge);
- return originalSend.call(this, injectedBody);
- }
- }
-
- if (typeof body === "string" && isJson(body)) {
- const jsonBody = JSON.parse(body);
-
- if (
- (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
- jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
- (!remoteCDM || remoteCDM.challenge === null) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
- // Block the request
- return;
- }
-
- if (
- (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE) ||
- jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) &&
- interceptType === "LICENSE" &&
- !foundChallengeInBody
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
- if (!remoteCDM) {
- if (jsonContainsValue(jsonBody, DRM_SIGNATURES.WIDEVINE)) {
- remoteCDM = createAndOpenRemoteCDM(
- "Widevine",
- widevineDeviceInfo,
- foundWidevinePssh
- );
- }
- if (jsonContainsValue(jsonBody, DRM_SIGNATURES.PLAYREADY)) {
- remoteCDM = createAndOpenRemoteCDM(
- "PlayReady",
- playreadyDeviceInfo,
- foundPlayreadyPssh
- );
- }
- }
- if (remoteCDM && remoteCDM.challenge === null) {
- remoteCDM.getChallenge(foundWidevinePssh);
- }
- const injectedBody = jsonReplaceValue(jsonBody, remoteCDM.challenge);
- return originalSend.call(this, JSON.stringify(injectedBody));
- }
+ // LICENSE mode: replace the challenge in the request
+ if (drmInfo.type && interceptType === "LICENSE" && !foundChallengeInBody) {
+ return handleLicenseMode({
+ drmInfo,
+ body,
+ setBody: (b) => originalSend.call(this, b),
+ urlOrResource: this._url,
+ getWidevinePssh: () => foundWidevinePssh,
+ getPlayreadyPssh: () => foundPlayreadyPssh,
+ widevineDeviceInfo,
+ playreadyDeviceInfo,
+ });
}
}
}
--
2.43.0
From d0154fd6c12220b25613f69ea329ef6e39460256 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 22:57:28 +0700
Subject: [PATCH 19/26] change MANIFEST_URL_FOUND to MANIFEST_URL
---
src/content.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/content.js b/src/content.js
index 85e397e..35c0497 100644
--- a/src/content.js
+++ b/src/content.js
@@ -78,7 +78,7 @@ window.addEventListener("message", function (event) {
console.log("[CDRM-Extension] ✅ [content.js] Unique manifest URL:", url);
chrome.runtime.sendMessage({
- type: "MANIFEST_URL_FOUND",
+ type: "MANIFEST_URL",
data: url,
});
}
--
2.43.0
From e03ca633de3236220d53a5100f844a324684054e Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Mon, 21 Jul 2025 23:29:40 +0700
Subject: [PATCH 20/26] do not show export if keys are not present
---
frontend/src/components/results.jsx | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/frontend/src/components/results.jsx b/frontend/src/components/results.jsx
index 7155419..4b60d67 100644
--- a/frontend/src/components/results.jsx
+++ b/frontend/src/components/results.jsx
@@ -144,13 +144,7 @@ function Results() {
// Export to JSON file
const hasData = () => {
- return (
- drmType ||
- pssh ||
- licenseUrl ||
- manifestUrl ||
- (Array.isArray(keys) && keys.filter((k) => k.type !== "SIGNING").length > 0)
- );
+ return Array.isArray(keys) && keys.filter((k) => k.type !== "SIGNING").length > 0;
};
const handleExportJSON = () => {
--
2.43.0
From 81f44b2f0ed7f1da9d3ec5b63abf25f83391d22e Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Tue, 22 Jul 2025 09:52:12 +0700
Subject: [PATCH 21/26] concatenate message handling for DRM, injection type,
and CDM devices
---
src/inject.js | 52 +++++++++++++++++++++------------------------------
1 file changed, 21 insertions(+), 31 deletions(-)
diff --git a/src/inject.js b/src/inject.js
index 678a607..0dbedd9 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -39,46 +39,36 @@ const logWithPrefix = (...args) => {
}
};
-// Post message to content.js to get DRM override
window.postMessage({ type: "__GET_DRM_OVERRIDE__" }, "*");
-
-// Add listener for DRM override messages
-window.addEventListener("message", function (event) {
- if (event.source !== window) return;
- if (event.data.type === "__DRM_OVERRIDE__") {
- drmOverride = event.data.drmOverride || "DISABLED";
- logWithPrefix("DRM Override set to:", drmOverride);
- }
-});
-
-// Post message to content.js to get injection type
window.postMessage({ type: "__GET_INJECTION_TYPE__" }, "*");
-
-// Add listener for injection type messages
-window.addEventListener("message", function (event) {
- if (event.source !== window) return;
-
- if (event.data.type === "__INJECTION_TYPE__") {
- interceptType = event.data.injectionType || "DISABLED";
- logWithPrefix("Injection type set to:", interceptType);
- }
-});
-
-// Post message to get CDM devices
window.postMessage({ type: "__GET_CDM_DEVICES__" }, "*");
-// Add listener for CDM device messages
-window.addEventListener("message", function (event) {
- if (event.source !== window) return;
+function createMessageHandler(handlers) {
+ window.addEventListener("message", function (event) {
+ if (event.source !== window) return;
- if (event.data.type === "__CDM_DEVICES__") {
- const { widevine_device, playready_device } = event.data;
+ const handler = handlers[event.data.type];
+ if (handler) {
+ handler(event.data);
+ }
+ });
+}
+createMessageHandler({
+ __DRM_OVERRIDE__: (data) => {
+ drmOverride = data.drmOverride || "DISABLED";
+ logWithPrefix("DRM Override set to:", drmOverride);
+ },
+ __INJECTION_TYPE__: (data) => {
+ interceptType = data.injectionType || "DISABLED";
+ logWithPrefix("Injection type set to:", interceptType);
+ },
+ __CDM_DEVICES__: (data) => {
+ const { widevine_device, playready_device } = data;
logWithPrefix("Received device info:", widevine_device, playready_device);
-
widevineDeviceInfo = widevine_device;
playreadyDeviceInfo = playready_device;
- }
+ },
});
function safeHeaderShellEscape(str) {
--
2.43.0
From a40a6abaf76dea228c2aba8f9d2909b8910e6d9a Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Tue, 22 Jul 2025 09:56:05 +0700
Subject: [PATCH 22/26] extract DRM PSSH detection and storage into a separate
function
---
src/inject.js | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/inject.js b/src/inject.js
index 0dbedd9..652b2a9 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -556,23 +556,32 @@ function ensureRemoteCDM(type, deviceInfo, pssh) {
}
}
+function detectAndStorePssh(initData) {
+ const detections = [
+ {
+ type: "PlayReady",
+ getter: getPlayReadyPssh,
+ store: (pssh) => (foundPlayreadyPssh = pssh),
+ },
+ { type: "Widevine", getter: getWidevinePssh, store: (pssh) => (foundWidevinePssh = pssh) },
+ ];
+
+ detections.forEach(({ type, getter, store }) => {
+ const pssh = getter(initData);
+ if (pssh) {
+ logWithPrefix(`[DRM Detected] ${type}`);
+ store(pssh);
+ logWithPrefix(`[${type} PSSH found] ${pssh}`);
+ }
+ });
+}
+
// Challenge generator interceptor
const originalGenerateRequest = MediaKeySession.prototype.generateRequest;
MediaKeySession.prototype.generateRequest = function (initDataType, initData) {
const session = this;
- let playReadyPssh = getPlayReadyPssh(initData);
- if (playReadyPssh) {
- logWithPrefix("[DRM Detected] PlayReady");
- foundPlayreadyPssh = playReadyPssh;
- logWithPrefix("[PlayReady PSSH found] " + playReadyPssh);
- }
- let wideVinePssh = getWidevinePssh(initData);
- if (wideVinePssh) {
- // Widevine code
- logWithPrefix("[DRM Detected] Widevine");
- foundWidevinePssh = wideVinePssh;
- logWithPrefix("[Widevine PSSH found] " + wideVinePssh);
- }
+ detectAndStorePssh(initData);
+
// Challenge message interceptor
if (!remoteListenerMounted) {
remoteListenerMounted = true;
--
2.43.0
From 8d4cd89a025382d3606c93c0da8239ae83564f25 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Tue, 22 Jul 2025 10:04:17 +0700
Subject: [PATCH 23/26] consolidate DRM interception handling for fetch and XHR
requests
---
src/inject.js | 120 +++++++++++++++++++++++---------------------------
1 file changed, 56 insertions(+), 64 deletions(-)
diff --git a/src/inject.js b/src/inject.js
index 652b2a9..0793cd1 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -788,6 +788,37 @@ function handleLicenseMode({
}
}
+function handleDRMInterception(drmInfo, body, url, setBodyCallback, continueRequestCallback) {
+ // EME mode: block the request if a DRM challenge is detected
+ if (
+ drmInfo.type &&
+ (!remoteCDM || remoteCDM.challenge === null || drmInfo.base64 !== remoteCDM.challenge) &&
+ interceptType === "EME"
+ ) {
+ foundChallengeInBody = true;
+ window.postMessage({ type: "__LICENSE_URL__", data: url }, "*");
+ // Block the request
+ return { shouldBlock: true };
+ }
+
+ // LICENSE mode: replace the challenge in the request
+ if (drmInfo.type && interceptType === "LICENSE" && !foundChallengeInBody) {
+ handleLicenseMode({
+ drmInfo,
+ body,
+ setBody: setBodyCallback,
+ urlOrResource: url,
+ getWidevinePssh: () => foundWidevinePssh,
+ getPlayreadyPssh: () => foundPlayreadyPssh,
+ widevineDeviceInfo,
+ playreadyDeviceInfo,
+ });
+ return { shouldIntercept: true, result: continueRequestCallback() };
+ }
+
+ return { shouldContinue: true };
+}
+
// fetch POST interceptor
(function () {
const originalFetch = window.fetch;
@@ -795,42 +826,21 @@ function handleLicenseMode({
window.fetch = async function (resource, config = {}) {
const method = (config.method || "GET").toUpperCase();
- if (method === "POST") {
- let body = config.body;
- if (body) {
- const drmInfo = detectDRMChallenge(body);
+ if (method === "POST" && config.body) {
+ const drmInfo = detectDRMChallenge(config.body);
- // EME mode: block the request if a DRM challenge is detected
- if (
- drmInfo.type &&
- (!remoteCDM ||
- remoteCDM.challenge === null ||
- drmInfo.base64 !== remoteCDM.challenge) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: resource }, "*");
- // Block the request
- return;
- }
+ const result = handleDRMInterception(
+ drmInfo,
+ config.body,
+ resource,
+ (b) => {
+ config.body = b;
+ },
+ () => originalFetch(resource, config)
+ );
- // LICENSE mode: replace the challenge in the request
- if (drmInfo.type && interceptType === "LICENSE" && !foundChallengeInBody) {
- handleLicenseMode({
- drmInfo,
- body,
- setBody: (b) => {
- config.body = b;
- },
- urlOrResource: resource,
- getWidevinePssh: () => foundWidevinePssh,
- getPlayreadyPssh: () => foundPlayreadyPssh,
- widevineDeviceInfo,
- playreadyDeviceInfo,
- });
- return originalFetch(resource, config);
- }
- }
+ if (result.shouldBlock) return;
+ if (result.shouldIntercept) return result.result;
}
return originalFetch(resource, config);
@@ -849,39 +859,21 @@ function handleLicenseMode({
};
XMLHttpRequest.prototype.send = function (body) {
- if (this._method && this._method.toUpperCase() === "POST") {
- if (body) {
- const drmInfo = detectDRMChallenge(body);
+ if (this._method && this._method.toUpperCase() === "POST" && body) {
+ const drmInfo = detectDRMChallenge(body);
- // EME mode: block the request if a DRM challenge is detected
- if (
- drmInfo.type &&
- (!remoteCDM ||
- remoteCDM.challenge === null ||
- drmInfo.base64 !== remoteCDM.challenge) &&
- interceptType === "EME"
- ) {
- foundChallengeInBody = true;
- window.postMessage({ type: "__LICENSE_URL__", data: this._url }, "*");
- // Block the request
- return;
- }
+ const result = handleDRMInterception(
+ drmInfo,
+ body,
+ this._url,
+ (b) => originalSend.call(this, b),
+ () => {} // XHR doesn't need continuation callback
+ );
- // LICENSE mode: replace the challenge in the request
- if (drmInfo.type && interceptType === "LICENSE" && !foundChallengeInBody) {
- return handleLicenseMode({
- drmInfo,
- body,
- setBody: (b) => originalSend.call(this, b),
- urlOrResource: this._url,
- getWidevinePssh: () => foundWidevinePssh,
- getPlayreadyPssh: () => foundPlayreadyPssh,
- widevineDeviceInfo,
- playreadyDeviceInfo,
- });
- }
- }
+ if (result.shouldBlock) return;
+ if (result.shouldIntercept) return result.result;
}
+
return originalSend.apply(this, arguments);
};
})();
--
2.43.0
From f40e1880d6ec45ac657fba0889f2bfb32d0aa4bd Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Tue, 22 Jul 2025 10:13:17 +0700
Subject: [PATCH 24/26] add logging for POST request interception in DRM
handling
---
src/inject.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/inject.js b/src/inject.js
index 0793cd1..982c312 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -827,6 +827,7 @@ function handleDRMInterception(drmInfo, body, url, setBodyCallback, continueRequ
const method = (config.method || "GET").toUpperCase();
if (method === "POST" && config.body) {
+ logWithPrefix("[FETCH] Intercepting POST request to:", resource);
const drmInfo = detectDRMChallenge(config.body);
const result = handleDRMInterception(
@@ -860,6 +861,7 @@ function handleDRMInterception(drmInfo, body, url, setBodyCallback, continueRequ
XMLHttpRequest.prototype.send = function (body) {
if (this._method && this._method.toUpperCase() === "POST" && body) {
+ logWithPrefix("[XHR] Intercepting POST request to:", this._url);
const drmInfo = detectDRMChallenge(body);
const result = handleDRMInterception(
--
2.43.0
From 0b59c6b0d6090a5e54d3e840f9bbc09eb4da9109 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Tue, 22 Jul 2025 10:28:25 +0700
Subject: [PATCH 25/26] feat: implement `resetDRMState` to clear state and
session on new manifest detection
---
src/inject.js | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/src/inject.js b/src/inject.js
index 982c312..a759d62 100644
--- a/src/inject.js
+++ b/src/inject.js
@@ -39,6 +39,47 @@ const logWithPrefix = (...args) => {
}
};
+function resetDRMState() {
+ logWithPrefix("Resetting DRM state for new manifest...");
+
+ // Reset DRM detection state
+ originalChallenge = null;
+ serviceCertFound = false;
+ drmType = "NONE";
+ psshFound = false;
+ foundWidevinePssh = null;
+ foundPlayreadyPssh = null;
+ drmDecided = null;
+
+ // Reset CDM and session state
+ if (remoteCDM) {
+ try {
+ // Try to close the existing session if it exists
+ if (remoteCDM.session_id) {
+ remoteCDM.closeSession();
+ }
+ } catch (e) {
+ // Ignore errors when closing session
+ logWithPrefix("Error closing previous CDM session:", e.message);
+ }
+ remoteCDM = null;
+ }
+
+ // Reset interceptor state
+ generateRequestCalled = false;
+ remoteListenerMounted = false;
+ injectionSuccess = false;
+ foundChallengeInBody = false;
+ licenseResponseCounter = 0;
+ keysRetrieved = false;
+
+ // Post reset messages to clear UI state
+ window.postMessage({ type: "__DRM_TYPE__", data: "" }, "*");
+ window.postMessage({ type: "__PSSH_DATA__", data: "" }, "*");
+ window.postMessage({ type: "__KEYS_DATA__", data: "" }, "*");
+ window.postMessage({ type: "__LICENSE_URL__", data: "" }, "*");
+}
+
window.postMessage({ type: "__GET_DRM_OVERRIDE__" }, "*");
window.postMessage({ type: "__GET_INJECTION_TYPE__" }, "*");
window.postMessage({ type: "__GET_CDM_DEVICES__" }, "*");
@@ -94,6 +135,9 @@ function headersToFlags(headersObj) {
}
function handleManifestDetection(url, headersObj, contentType, source) {
+ // Reset DRM state when new manifest is detected
+ resetDRMState();
+
window.postMessage({ type: "__MANIFEST_URL__", data: url }, "*");
logWithPrefix(`[Manifest][${source}]`, url, contentType);
--
2.43.0
From ee9eeb30ea42661f89a7c194c4cec932cd1de024 Mon Sep 17 00:00:00 2001
From: voldemort <5692900+yell0wsuit@users.noreply.github.com>
Date: Tue, 22 Jul 2025 10:55:02 +0700
Subject: [PATCH 26/26] feat: add js minification during file copy in build
process
---
README.md | 1 +
buildext.js | 57 ++++++++++++++++++-
package-lock.json | 136 ++++++++++++++++++++++++++++++++++++++++++++++
package.json | 3 +
4 files changed, 194 insertions(+), 3 deletions(-)
create mode 100644 package-lock.json
diff --git a/README.md b/README.md
index 4cb2211..48c514f 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ To update the version across the entire project, simply change the version numbe
- Run the build script:
```bash
+npm install
npm run buildext
```
diff --git a/buildext.js b/buildext.js
index 632d6fb..c6b7bcb 100644
--- a/buildext.js
+++ b/buildext.js
@@ -1,6 +1,7 @@
import { execSync } from "child_process";
import fs from "fs";
import path from "path";
+import { minify } from "terser";
import url from "url";
import syncVersion from "./syncVersion.js";
@@ -25,6 +26,56 @@ const copyDir = async (src, dest) => {
});
};
+const minifyJS = async (jsContent) => {
+ try {
+ const result = await minify(jsContent, {
+ compress: {
+ drop_console: false, // Keep console logs for debugging
+ drop_debugger: true,
+ pure_funcs: ["console.debug"],
+ },
+ mangle: {
+ reserved: ["chrome"], // Don't mangle chrome API
+ },
+ });
+ return result.code;
+ } catch (error) {
+ console.warn("⚠️ Minification failed, using original:", error.message);
+ return jsContent;
+ }
+};
+
+// Copy and minify JavaScript files from src directory
+const copyAndMinifySrcFiles = async (src, dest) => {
+ await fs.promises.mkdir(dest, { recursive: true });
+
+ const entries = await fs.promises.readdir(src, { withFileTypes: true });
+
+ for (const entry of entries) {
+ const srcPath = path.join(src, entry.name);
+ const destPath = path.join(dest, entry.name);
+
+ if (entry.isDirectory()) {
+ await copyAndMinifySrcFiles(srcPath, destPath);
+ } else if (entry.name.endsWith(".js")) {
+ // Minify JavaScript files
+ console.log(`🗜️ Minifying ${entry.name}...`);
+ const content = await fs.promises.readFile(srcPath, "utf8");
+ const originalSize = Buffer.byteLength(content, "utf8");
+ const minified = await minifyJS(content, entry.name);
+ const minifiedSize = Buffer.byteLength(minified, "utf8");
+ const savings = (((originalSize - minifiedSize) / originalSize) * 100).toFixed(1);
+ console.log(
+ ` 📊 ${entry.name}: ${originalSize} → ${minifiedSize} bytes (${savings}% smaller)`
+ );
+ await fs.promises.writeFile(destPath, minified, "utf8");
+ } else {
+ // Copy other files as-is
+ await fs.promises.copyFile(srcPath, destPath);
+ }
+ }
+};
+
const main = async () => {
await syncVersion();
@@ -47,9 +98,9 @@ const main = async () => {
}
await fs.promises.mkdir(releaseDir);
- // 4. Copy src files (manifest, background, etc) to release
- console.log("📦 Copying src files to extension-release...");
- await copyDir(srcDir, releaseDir);
+ // 4. Copy and minify src files
+ console.log("📦 Copying and minifying src files...");
+ await copyAndMinifySrcFiles(srcDir, releaseDir);
// 5. Copy frontend dist files to release (merged at root)
console.log("📦 Copying frontend dist files to extension-release...");
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..df2901f
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,136 @@
+{
+ "name": "cdrm-extension",
+ "version": "2.1.0",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "cdrm-extension",
+ "version": "2.1.0",
+ "license": "ISC",
+ "devDependencies": {
+ "terser": "^5.43.1"
+ },
+ "engines": {
+ "node": ">=21.0.0"
+ }
+ },
+ "node_modules/@jridgewell/gen-mapping": {
+ "version": "0.3.12",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+ "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/sourcemap-codec": "^1.5.0",
+ "@jridgewell/trace-mapping": "^0.3.24"
+ }
+ },
+ "node_modules/@jridgewell/resolve-uri": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+ "dev": true,
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/source-map": {
+ "version": "0.3.10",
+ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.10.tgz",
+ "integrity": "sha512-0pPkgz9dY+bijgistcTTJ5mR+ocqRXLuhXHYdzoMmmoJ2C9S46RCm2GMUbatPEUK9Yjy26IrAy8D/M00lLkv+Q==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.25"
+ }
+ },
+ "node_modules/@jridgewell/sourcemap-codec": {
+ "version": "1.5.4",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
+ "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.29",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+ "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
+ }
+ },
+ "node_modules/acorn": {
+ "version": "8.15.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+ "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "acorn": "bin/acorn"
+ },
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
+ "node_modules/buffer-from": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/source-map-support": {
+ "version": "0.5.21",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+ "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
+ }
+ },
+ "node_modules/terser": {
+ "version": "5.43.1",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.43.1.tgz",
+ "integrity": "sha512-+6erLbBm0+LROX2sPXlUYx/ux5PyE9K/a92Wrt6oA+WDAoFTdpHE5tCYCI5PNzq2y8df4rA+QgHLJuR4jNymsg==",
+ "dev": true,
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "@jridgewell/source-map": "^0.3.3",
+ "acorn": "^8.14.0",
+ "commander": "^2.20.0",
+ "source-map-support": "~0.5.20"
+ },
+ "bin": {
+ "terser": "bin/terser"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ }
+ }
+}
diff --git a/package.json b/package.json
index 2372915..2288e3a 100644
--- a/package.json
+++ b/package.json
@@ -17,5 +17,8 @@
"type": "module",
"engines": {
"node": ">=21.0.0"
+ },
+ "devDependencies": {
+ "terser": "^5.43.1"
}
}
--
2.43.0