* Finish the webm initType support

* Add active state indicator
* Prevent polluting the global namespace
This commit is contained in:
Ingan121
2025-07-14 23:21:37 +09:00
parent 031297f75e
commit 5fe27eea28
10 changed files with 835 additions and 733 deletions

View File

@@ -9,6 +9,8 @@ import {
uint8ArrayToBase64,
uint8ArrayToHex,
getWvPsshFromConcatPssh,
makeCkInitData,
setIcon,
SettingsManager,
AsyncLocalStorage,
RemoteCDMManager,
@@ -27,6 +29,7 @@ import { utils } from "./jsplayready/noble-curves.min.js";
let manifests = new Map();
let requests = new Map();
let sessions = new Map();
let sessionCnt = {};
let logs = [];
chrome.webRequest.onBeforeSendHeaders.addListener(
@@ -340,6 +343,13 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
return;
}
if (!sessionCnt[sender.tab.id]) {
sessionCnt[sender.tab.id] = 1;
setIcon("images/icon-active.png", sender.tab.id);
} else {
sessionCnt[sender.tab.id]++;
}
try {
JSON.parse(atob(message.body));
sendResponse(message.body);
@@ -348,8 +358,35 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
if (message.body) {
if (message.body.startsWith("lookup:")) {
const split = message.body.split(":");
sessions.set(split[1], split[2]);
sendResponse();
// Find first log that contains the requested KID
const log = logs.find(log =>
log.keys.some(k => k.kid.toLowerCase() === split[2].toLowerCase())
);
if (!log) {
console.warn("[Vineless] Lookup failed: no log found for KID", kidHex);
sendResponse();
return;
}
switch (log.type) {
case "CLEARKEY": // UNTESTED
const ckInitData = makeCkInitData(log.keys);
sendResponse(uint8ArrayToBase64(ckInitData));
break;
case "WIDEVINE":
const device_type = await SettingsManager.getSelectedDeviceType();
switch (device_type) {
case "WVD":
await generateChallenge(log.pssh_data, sendResponse);
break;
case "REMOTE":
await generateChallengeRemote(log.pssh_data, sendResponse);
break;
}
break;
case "PLAYREADY": // UNTESTED
await generatePRChallenge(log.pssh_data, sendResponse, split[1]);
break;
}
} else if (message.body.startsWith("pr:")) {
if (!await SettingsManager.getPREnabled()) {
sendResponse();
@@ -389,38 +426,7 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
await parseClearKey(message.body, sendResponse, tab_url);
return;
} catch (e) {
if (message.body.startsWith("lookup:")) {
const split = message.body.split(':');
const sessionId = split[1];
const kidHex = sessions.get(sessionId);
if (!kidHex) {
console.warn("[Vineless] Lookup failed: no session mapping for", sessionId);
sendResponse();
return;
}
// Find first log that contains the requested KID
const log = logs.find(log =>
log.keys.some(k => k.kid.toLowerCase() === kidHex.toLowerCase())
);
if (!log) {
console.warn("[Vineless] Lookup failed: no log found for KID", kidHex);
sendResponse();
return;
}
const response = {
keys: log.keys.map(k => ({
k: k.k,
kid: k.kid
}))
};
sendResponse(JSON.stringify(response));
return;
} else if (message.body.startsWith("pr:")) {
if (message.body.startsWith("pr:")) {
if (!await SettingsManager.getPREnabled()) {
sendResponse();
manifests.clear();
@@ -447,6 +453,13 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
}
return;
}
case "CLOSE":
if (sessionCnt[sender.tab.id]) {
if (--sessionCnt[sender.tab.id] === 0) {
setIcon("images/icon.png", sender.tab.id);
}
}
break;
case "GET_ENABLED":
if (await SettingsManager.getEnabled()) {
sendResponse(JSON.stringify({
@@ -510,3 +523,13 @@ chrome.runtime.onMessage.addListener((message, sender, sendResponse) => {
})();
return true;
});
chrome.tabs.onRemoved.addListener((tabId) => {
delete sessionCnt[tabId];
});
(async () => {
if (!await SettingsManager.getEnabled()) {
setIcon("images/icon-disabled.png");
}
})();

File diff suppressed because it is too large Load Diff

BIN
images/icon-active.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
images/icon-disabled.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -1,7 +1,7 @@
{
"manifest_version": 3,
"name": "Vineless",
"version": "1.2",
"version": "1.3",
"description": "Play protected contents without a real CDM",
"permissions": [
"activeTab",
@@ -16,11 +16,11 @@
"action": {
"default_popup": "panel/panel.html",
"default_icon": {
"128": "images/icon-128.png"
"128": "images/icon.png"
}
},
"icons": {
"128": "images/icon-128.png"
"128": "images/icon.png"
},
"background": {
"scripts": ["background.js"],

View File

@@ -117,6 +117,11 @@ h1 {
.header-right {
font-size: 11px;
}
#version {
position: absolute;
top: 0;
right: 0;
}
#wvd > *, #remote > *, #prd > * {
margin: 5px;

View File

@@ -7,12 +7,13 @@
</head>
<body style="min-width: 200px;">
<div class="header">
<img src="../images/icon-128.png" alt="WidevineProxy Icon" width="64"/>
<img id="icon" src="../images/icon.png" alt="WidevineProxy Icon" width="64"/>
<div class="header-right">
<h1>Vineless</h1>
Made by Ingan121<br>
Based on WidevineProxy2 and PlayreadyProxy2
</div>
<p id="version">v1.x</p>
</div>
<fieldset>
<legend>Settings</legend>

View File

@@ -4,11 +4,13 @@ import { Utils } from '../jsplayready/utils.js';
import {AsyncLocalStorage, base64toUint8Array, stringToUint8Array, DeviceManager, RemoteCDMManager, PRDeviceManager, SettingsManager} from "../util.js";
const key_container = document.getElementById('key-container');
const icon = document.getElementById('icon');
// ================ Main ================
const enabled = document.getElementById('enabled');
enabled.addEventListener('change', async function (){
await SettingsManager.setEnabled(enabled.checked);
icon.src = `../images/icon${enabled.checked ? '' : '-disabled'}.png`;
});
const toggle = document.getElementById('darkModeToggle');
@@ -17,6 +19,9 @@ toggle.addEventListener('change', async () => {
await SettingsManager.saveDarkMode(toggle.checked);
});
const version = document.getElementById('version');
version.textContent = "v" + chrome.runtime.getManifest().version;
const wvEnabled = document.getElementById('wvEnabled');
wvEnabled.addEventListener('change', async function (){
await SettingsManager.setWVEnabled(wvEnabled.checked);
@@ -276,6 +281,9 @@ function checkLogs() {
document.addEventListener('DOMContentLoaded', async function () {
enabled.checked = await SettingsManager.getEnabled();
if (!enabled.checked) {
icon.src = "../images/icon-disabled.png";
}
SettingsManager.setDarkMode(await SettingsManager.getDarkMode());
wvEnabled.checked = await SettingsManager.getWVEnabled(true);
prEnabled.checked = await SettingsManager.getPREnabled(true);

72
util.js
View File

@@ -275,6 +275,7 @@ export class RemoteCDMManager {
export class SettingsManager {
static async setEnabled(enabled) {
await AsyncSyncStorage.setStorage({ enabled: enabled });
setIcon(`images/icon${enabled ? '' : '-disabled'}.png`);
}
static async getEnabled() {
@@ -533,3 +534,74 @@ export function getWvPsshFromConcatPssh(psshBase64) {
return psshBase64;
}
export function makeCkInitData(keys) {
const systemId = new Uint8Array([
0x10, 0x77, 0xef, 0xec,
0xc0, 0xb2,
0x4d, 0x02,
0xac, 0xe3,
0x3c, 0x1e, 0x52, 0xe2, 0xfb, 0x4b
]);
const kidCount = keys.length;
const kidDataLength = kidCount * 16;
const dataSize = 0;
const size = 4 + 4 + 4 + 16 + 4 + kidDataLength + 4 + dataSize;
const buffer = new ArrayBuffer(size);
const view = new DataView(buffer);
let offset = 0;
view.setUint32(offset, size); offset += 4;
view.setUint32(offset, 0x70737368); offset += 4; // 'pssh'
view.setUint8(offset++, 0x01); // version 1
view.setUint8(offset++, 0x00); // flags (3 bytes)
view.setUint8(offset++, 0x00);
view.setUint8(offset++, 0x00);
new Uint8Array(buffer, offset, 16).set(systemId); offset += 16;
view.setUint32(offset, kidCount); offset += 4;
for (const key of keys) {
const kidBytes = hexToUint8Array(key.kid);
if (kidBytes.length !== 16) throw new Error("Invalid KID length");
new Uint8Array(buffer, offset, 16).set(kidBytes);
offset += 16;
}
view.setUint32(offset, dataSize); offset += 4;
return new Uint8Array(buffer);
}
export async function setIcon(filename, tabId = undefined) {
const isMV3 = typeof chrome.action !== "undefined";
if (!isMV3) {
chrome.browserAction.setIcon({
path: {
128: filename
},
tabId
});
return;
}
const url = chrome.runtime.getURL(filename);
const res = await fetch(url);
const blob = await res.blob();
const bitmap = await createImageBitmap(blob);
const canvas = new OffscreenCanvas(bitmap.width, bitmap.height);
const ctx = canvas.getContext("2d");
ctx.drawImage(bitmap, 0, 0);
const imageData = ctx.getImageData(0, 0, bitmap.width, bitmap.height);
chrome.action.setIcon({
imageData: {
[bitmap.width]: imageData
},
...(tabId ? { tabId } : {})
});
}