tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/manifest-v3-v2' into feature/player-ui

Browse Source
This commit is contained in:
Tamius Han 2023-07-10 22:05:02 +02:00
commit 48f7e1f39c
12 changed files with 1875 additions and 573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2207
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

16
package.json
View File

@ -28,13 +28,7 @@
"@babel/plugin-proposal-class-properties": "^7.16.0",
"@mdi/font": "^6.5.95",
"@mdi/js": "^6.4.95",
"@types/chrome": "0.0.129",
"@types/core-js": "^2.5.5",
"@types/es6-promise": "^3.3.0",
"@types/firefox": "0.0.30",
"@types/resize-observer-browser": "^0.1.6",
"@vue/cli": "^4.5.15",
"@vue/cli-plugin-typescript": "^4.5.15",
"bootstrap": "^4.6.1",
"bootstrap-vue": "^2.21.2",
"concurrently": "^5.3.0",
@ -47,12 +41,16 @@
"vue-style-loader": "^4.1.3",
"vuex": "^4.0.2",
"vuex-webextensions": "^1.3.3",
"webextension-polyfill-ts": "^0.24.0"
"webextension-polyfill-ts": "^0.26.0"
},
"devDependencies": {
"@babel/core": "^7.16.0",
"@babel/plugin-proposal-optional-chaining": "^7.16.0",
"@babel/preset-env": "^7.16.0",
"@types/chrome": "0.0.240",
"@types/core-js": "^2.5.5",
"@types/es6-promise": "^3.3.0",
"@types/firefox": "0.0.31",
"@types/lodash": "^4.14.176",
"@types/node": "^14.17.32",
"@vue/compiler-sfc": "^3.2.21",
@ -76,6 +74,8 @@
"webpack": "^4.46.0",
"webpack-chrome-extension-reloader": "^0.8.3",
"webpack-cli": "^3.3.12",
"webpack-shell-plugin": "^0.5.0"
"webpack-shell-plugin": "^0.5.0",
"@vue/cli": "^4.5.15",
"@vue/cli-plugin-typescript": "^4.5.15"
}
}

59
src/ext/UWServer.ts
View File

@ -85,14 +85,13 @@ export default class UWServer {
this.settings = new Settings({logger: this.logger});
await this.settings.init();
this.eventBus = new EventBus();
this.eventBus = new EventBus({isUWServer: true});
for (const action in this.eventBusCommands) {
for (const command of this.eventBusCommands[action]) {
this.eventBus.subscribe(action, command);
}
}
this.comms = new CommsServer(this);
this.eventBus.setComms(this.comms);
@ -109,11 +108,32 @@ export default class UWServer {
}
async injectCss(css, sender) {
if (!css) {
return;
}
try {
if (BrowserDetect.firefox || BrowserDetect.edge) {
browser.tabs.insertCSS(sender.tab.id, {code: css, cssOrigin: 'user', frameId: sender.frameId});
} else if (BrowserDetect.anyChromium) {
chrome.tabs.insertCSS(sender.tab.id, {code: css, cssOrigin: 'user', frameId: sender.frameId});
if (BrowserDetect.firefox) {
browser.scripting.insertCSS({
target: {
tabId: sender.tab.id,
frameIds: [
sender.frameId
]
},
css,
origin: "USER"
});
} else {
await chrome.scripting.insertCSS({
target: {
tabId: sender.tab.id,
frameIds: [
sender.frameId
]
},
css,
origin: "USER"
});
}
} catch (e) {
this.logger.log('error','debug', '[UwServer::injectCss] Error while injecting css:', {error: e, css, sender});
@ -121,7 +141,30 @@ export default class UWServer {
}
async removeCss(css, sender) {
try {
browser.tabs.removeCSS(sender.tab.id, {code: css, cssOrigin: 'user', frameId: sender.frameId});
if (BrowserDetect.firefox) {
browser.scripting.removeCSS({
target: {
tabId: sender.tab.id,
frameIds: [
sender.frameId
]
},
css,
origin: "USER"
});
} else {
await chrome.scripting.removeCSS({
target: {
tabId: sender.tab.id,
frameIds: [
sender.frameId
]
},
css,
origin: "USER"
});
}
} catch (e) {
this.logger.log('error','debug', '[UwServer::injectCss] Error while removing css:', {error: e, css, sender});
}
@ -129,8 +172,8 @@ export default class UWServer {
async replaceCss(oldCss, newCss, sender) {
if (oldCss !== newCss) {
this.injectCss(newCss, sender);
this.removeCss(oldCss, sender);
this.injectCss(newCss, sender);
}
}

10
src/ext/conf/BrowserDetect.js
View File

@ -5,7 +5,11 @@ if (process.env.CHANNEL !== 'stable') {
}
function detectEdgeUA() {
return /Edg\/(\.?[0-9]*)*$/.test(window.navigator.userAgent);
try {
return /Edg\/(\.?[0-9]*)*$/.test(window.navigator.userAgent);
} catch {
return undefined;
}
}
function getBrowserObj() {
@ -31,10 +35,10 @@ const BrowserDetect = {
browserObj: getBrowserObj(),
runtime: getRuntime(),
getURL: (url) => getURL(url),
}
}
if (process.env.CHANNEL !== 'stable') {
console.info("BrowserDetect loaded:\n\nprocess.env.BROWSER:", process.env.BROWSER, "\nExporting BrowserDetect:", BrowserDetect);
}
export default BrowserDetect;
export default BrowserDetect;

6
src/ext/lib/EventBus.ts
View File

@ -32,8 +32,10 @@ export default class EventBus {
private popupContext: any = {};
// private uiUri = window.location.href;
constructor() {
this.setupIframeTunnelling();
constructor(options?: {isUWServer?: boolean}) {
if (!options?.isUWServer) {
this.setupIframeTunnelling();
}
}
setupPopupTunnelWorkaround(context: EventBusContext): void {

12
src/ext/lib/Logger.ts
View File

@ -268,8 +268,18 @@ class Logger {
// return logfileStr;
// }
getFileLogJSONString() {
let site;
// NOTE: no more window object on UWServer side of things!
// (or rather, we could get it, but we don't care enough to get it in this instance)
try {
site = window && window.location;
} catch {
site = 'uw-bg';
}
return {
site: window && window.location,
site,
log: JSON.stringify(this.history),
}
}

2
src/ext/lib/video-data/ExtensionStatus.ts
View File

@ -65,5 +65,5 @@ export class ExtensionStatus {
this.refreshExtensionStatus();
}
updateFullScreen()
updateFullScreen() {}
}

44
src/manifest.json
View File

@ -1,22 +1,18 @@
{
"manifest_version": 2,
"manifest_version": 3,
"name": "Ultrawidify",
"description": "Removes black bars on ultrawide videos and offers advanced options to fix aspect ratio.",
"version": "5.99.5",
"applications": {
"gecko": {
"id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"
}
},
"icons": {
"32":"res/icons/uw-32.png",
"64":"res/icons/uw-64.png"
},
"browser_action": {
"action": {
"default_title": "Ultrawidify",
"default_popup": "popup/popup.html"
},
"content_scripts": [{
"matches": ["*://*/*"],
"js": [
@ -26,10 +22,12 @@
"all_frames": true
}],
"minimum_chrome_version": "93",
"background": {
"persistent": true,
"service_worker": "uw-bg.js",
"module": true,
"scripts": [
"ext/uw-bg.js"
"uw-bg.js"
]
},
@ -40,19 +38,29 @@
},
"web_accessible_resources": [
"./*",
"ext/*",
"res/fonts/*",
"res/css/*",
"res/img/settings/about-bg.png",
"res/icons/*",
"res/img/*",
"csui/*"
{
"resources": [
"./*",
"ext/*",
"res/fonts/*",
"res/css/*",
"res/img/settings/about-bg.png",
"res/icons/*",
"res/img/*",
"csui/*"
],
"matches": [
"*://*/*"
]
}
],
"permissions": [
"storage",
"activeTab",
"<all_urls>"
"scripting"
],
"host_permissions": [
"*://*/*"
],
"optional_permissions": [
"downloads"

60
src/manifest.v2.json Normal file
View File

@ -0,0 +1,60 @@
{
"manifest_version": 2,
"name": "Ultrawidify",
"description": "Removes black bars on ultrawide videos and offers advanced options to fix aspect ratio.",
"version": "5.99.5",
"applications": {
"gecko": {
"id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"
}
},
"icons": {
"32":"res/icons/uw-32.png",
"64":"res/icons/uw-64.png"
},
"browser_action": {
"default_title": "Ultrawidify",
"default_popup": "popup/popup.html"
},
"content_scripts": [{
"matches": ["*://*/*"],
"js": [
"common/lib/browser-polyfill.js",
"ext/uw.js"
],
"all_frames": true
}],
"background": {
"persistent": true,
"scripts": [
"ext/uw-bg.js"
]
},
"options_ui": {
"page": "options/options.html",
"browser_style": false,
"open_in_tab": true
},
"web_accessible_resources": [
"./*",
"ext/*",
"res/fonts/*",
"res/css/*",
"res/img/settings/about-bg.png",
"res/icons/*",
"res/img/*",
"csui/*"
],
"permissions": [
"storage",
"activeTab",
"<all_urls>"
],
"optional_permissions": [
"downloads"
]
}

12
src/popup/App.vue
View File

@ -129,12 +129,12 @@ export default {
cmd: 'unmark-player',
forwardToAll: true,
});
if (BrowserDetect.anyChromium) {
chrome.extension.getBackgroundPage().sendUnmarkPlayer({
cmd: 'unmark-player',
forwardToAll: true,
});
}
// if (BrowserDetect.anyChromium) {
// chrome.extension.getBackgroundPage().sendUnmarkPlayer({
// cmd: 'unmark-player',
// forwardToAll: true,
// });
// }
});
// get info about current site from background script

8
src/ext/uw-bg.js → src/uw-bg.js
View File

@ -1,9 +1,9 @@
/**
* NOTE: we cannot get rid of this js file. I tried for 30 seconds and I couldn't get
* NOTE: we cannot get rid of this js file. I tried for 30 seconds and I couldn't get
* extension to work unless I kept this part of extension out of the ts file.
*/
import UWServer from './UWServer';
import UWServer from './ext/UWServer';
var BgVars = {
arIsActive: true,
@ -12,7 +12,3 @@ var BgVars = {
}
const server = new UWServer();
window.sendUnmarkPlayer = (message) => {
server.sendUnmarkPlayer(message)
}

12
webpack.config.js
View File

@ -13,7 +13,7 @@ const config = {
context: __dirname + '/src',
entry: {
'ext/uw': './ext/uw.js',
'ext/uw-bg': './ext/uw-bg.js',
'uw-bg': './uw-bg.js',
'popup/popup': './popup/popup.js',
'options/options': './options/options.js',
'csui/csui': './csui/csui.js',
@ -138,9 +138,9 @@ const config = {
const jsonContent = JSON.parse(content);
// jsonContent.version = version;
if (config.mode === 'development') {
jsonContent['content_security_policy'] = "script-src 'self' 'unsafe-eval'; object-src 'self'";
}
// if (config.mode === 'development') {
// jsonContent['content_security_policy'] = "script-src 'self' 'unsafe-eval'; object-src 'self'";
// }
if (process.env.CHANNEL === 'nightly') {
jsonContent.name = "Ultrawidify - nightly";
@ -178,8 +178,10 @@ const config = {
if (process.env.BROWSER !== 'firefox') {
jsonContent.version = jsonContent.version.replace(/[a-zA-Z-]/g, '');
delete jsonContent.applications;
delete jsonContent.options_ui.browser_style;
delete jsonContent.background.scripts;
} else {
delete jsonContent.background.service_worker;
}
return JSON.stringify(jsonContent, null, 2);