Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manifest3 #9

Merged
merged 17 commits into from
Feb 28, 2025
Merged

Manifest3 #9

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
26ba4b3
manifest3: prepare manifest conf
w010 Jun 12, 2024
901799c
manifest3: merge background and environment scripts into one backgrou…
w010 Jun 12, 2024
011080e
manifest3: injecting scripts into tab dom reworked
w010 Jun 12, 2024
07c0cb4
manifest3: setBadge and setFavicon injection libs cleaned and tuned
w010 Jun 12, 2024
ae48e8e
manifest3: options panel code cleanup
w010 Jun 12, 2024
82049f9
manifest3: fixed action icon context menu
w010 Jun 12, 2024
a38b973
manifest3: fix switching backend -> frontend (with fetching current p…
w010 Jun 12, 2024
5fa61ae
manifest3: fix favicon breaking itself sometimes
w010 Jun 13, 2024
c43ff1e
manifest3: open backend with selected page uid retrieved from fronten…
w010 Jun 13, 2024
98e452a
encapsulate injected code
w010 Jun 13, 2024
a756a7a
get rid of pagetree preselect experiments code
w010 Jun 13, 2024
44499f9
put console.log() behind condition
kitzberger Jan 29, 2025
a39ad95
options: hidable help blocks,
w010 Feb 28, 2025
7524537
options: jquery -> 3.7.1, jqueryui -> 1.13.3
w010 Feb 28, 2025
08f50e8
Merge pull request #10 from kitzberger/manifest3
w010 Feb 28, 2025
3dffd07
options: modal messages (manifest3, backend preselect)
w010 Feb 28, 2025
e7db130
version: 2.5.666
w010 Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
manifest3: injecting scripts into tab dom reworked
  • Loading branch information
@w010
w010 committed Jun 12, 2024
commit 011080e420a92f02cb84efedb1a8253ad6860728
131 changes: 77 additions & 54 deletions EXT pub/background.js
View file
Original file line number Diff line number Diff line change
@@ -434,7 +434,7 @@ return;
// depending on what it detects we're currently at, what domain, what url segment to strip (if subdir)
// and try to use the pid from fe to open backend with this page already found and open for us.

chrome.browserAction.onClicked.addListener((tab) => {
chrome.action.onClicked.addListener((tab) => {

// store current tab and its url for later
Switcher._currentTab = tab;
@@ -1007,8 +1007,8 @@ let Env = {
findAndApplyProjectConfigForCurrentTabUrl: function(tabId, _debugEventTriggered) {
let options = Env.options,
projectsAll = Env.projectsAll,
loadFavicon = _debugEventTriggered === 'onUpdated',
loadBadge = _debugEventTriggered === 'onUpdated';
loadFavicon = (_debugEventTriggered === 'onUpdated' || _debugEventTriggered === 'onFocusChanged'),
loadBadge = (_debugEventTriggered === 'onUpdated' || _debugEventTriggered === 'onFocusChanged');

if ( Env.tabs_setup[tabId]?.badgeLoaded === true) {
loadBadge = false;
@@ -1577,35 +1577,47 @@ let Env = {

Env.tabs_setup[tab.id].badgeLoaded = true;

chrome.tabs.executeScript( tab.id, {

code: 'let badge_params = {' +
'DEV: '+Env.DEV+',' +
'DEBUG: '+Env.DEBUG+',' +
'projectLabel: "'+project.name+'",' +
'contextLabel: "'+context.name+'",' +
'contextColor: "'+context.color+'",' +
'projectLabelDisplay: '+( typeof Env.options.env_badge_projectname === 'undefined' || Env.options.env_badge_projectname === true ? 'true' : 'false' )+',' +
'scale: '+( typeof Env.options.env_badge_scale !== 'undefined' ? parseFloat( Env.options.env_badge_scale ) : 1.0 )+',' +
'position: "'+( typeof Env.options.env_badge_position !== 'undefined' ? Env.options.env_badge_position : 'left' )+'",' +
'_debugEventTriggered: "'+_debugEventTriggered+'"' +
'};'

}, function () {
// 1st include the lib, then after - pass the code which calls the object with passed params
chrome.scripting.executeScript({
target: { tabId: tab.id },
files: ['setBadge.js']
}).then(() => {

// on system pages you can't inject any scripts
if ( chrome.runtime.lastError ) {
Env.log('Env.setupBadge(): Error executing code: \n' + chrome.runtime.lastError.message, tab.id, 3, 1);
}
else {
chrome.tabs.executeScript( tab.id, {

file: 'setBadge.js'

Env.log('Error injecting badge script: \n' + chrome.runtime.lastError.message, tab.id, 1, 1);
} else {

let argumentsToInject = {
DEV: Env.DEV,
DEBUG: Env.DEBUG,
projectLabel: project.name,
contextLabel: context.name,
contextColor: context.color,
projectLabelDisplay: ( typeof Env.options.env_badge_projectname === 'undefined' || Env.options.env_badge_projectname === true ? 'true' : 'false' ),
scale: ( typeof Env.options.env_badge_scale !== 'undefined' ? parseFloat( Env.options.env_badge_scale ) : 1.0 ),
position: ( typeof Env.options.env_badge_position !== 'undefined' ? Env.options.env_badge_position : 'left' ),
_debugEventTriggered: _debugEventTriggered,
};
Env.log('------- setBadge.js injected! arguments to pass: ', argumentsToInject, 1, 1);

chrome.scripting.executeScript({
target: { tabId: tab.id },
func: (_incoming_params) => {
if (_incoming_params?.DEBUG > 1) {
console.info('Injected badge params: ', _incoming_params);
console.log('typeof Badge', typeof Badge);
}
Badge.setBadge(_incoming_params);
},
args: [argumentsToInject],
}, () => {
// on system pages you can't inject any scripts
if ( chrome.runtime.lastError ) {
Env.log('Error injecting badge script: \n' + chrome.runtime.lastError.message, tab.id, 1, 1);
if (chrome.runtime.lastError) {
Env.log('Env.setupBadge(): Error injecting CODE/params: \n' + chrome.runtime.lastError.message, tab.id, 3, 1);
} else {
Env.log('Env.setupBadge(): badge_params script injected', tab.id, 0, 1, argumentsToInject);
}
});
}
@@ -1632,34 +1644,45 @@ let Env = {

Env.tabs_setup[tab.id].faviconLoaded = true;

chrome.tabs.executeScript( tab.id, {

code: 'let favicon_params = {' +
'DEV: '+Env.DEV+',' +
'DEBUG: '+Env.DEBUG+',' +
'contextColor: "'+context.color+'",' +
'alpha: '+( typeof Env.options.env_favicon_alpha !== 'undefined' ? parseFloat( Env.options.env_favicon_alpha ) : 0.85 )+',' +
'fill: '+( typeof Env.options.env_favicon_alpha !== 'undefined' ? parseFloat( Env.options.env_favicon_fill ) : 0.25 )+',' +
'position: "'+( typeof Env.options.env_favicon_position !== 'undefined' ? Env.options.env_favicon_position : 'bottom' )+'",' +
'composite: "'+( typeof Env.options.env_favicon_composite !== 'undefined' ? Env.options.env_favicon_composite : 'source-over' )+'",' +
'_debugEventTriggered: "'+_debugEventTriggered+'"' +
'};'

}, function () {

// 1st include the lib, then after - pass the code which calls the object with passed params
chrome.scripting.executeScript({
target: { tabId: tab.id },
files: ['setFavicon.js']
}).then(() => {

// on system pages you can't inject any scripts
if ( chrome.runtime.lastError ) {
Env.log('Env.setupFavicon(): Error executing code: \n' + chrome.runtime.lastError.message, tab.id, 3, 1);
}
else {
chrome.tabs.executeScript( null, {

file: 'setFavicon.js'

Env.log('Error injecting favicon script: \n' + chrome.runtime.lastError.message, tab.id, 1, 1);
} else {

let argumentsToInject = {
DEV: Env.DEV,
DEBUG: Env.DEBUG,
contextColor: context.color,
alpha: ( typeof Env.options.env_favicon_alpha !== 'undefined' ? parseFloat( Env.options.env_favicon_alpha ) : 0.85 ),
fill: ( typeof Env.options.env_favicon_alpha !== 'undefined' ? parseFloat( Env.options.env_favicon_fill ) : 0.25 ),
position: ( typeof Env.options.env_favicon_position !== 'undefined' ? Env.options.env_favicon_position : 'bottom' ),
composite: ( typeof Env.options.env_favicon_composite !== 'undefined' ? Env.options.env_favicon_composite : 'source-over' ),
_debugEventTriggered: _debugEventTriggered,
};
Env.log('------- setFavicon.js injected! arguments to pass: ', argumentsToInject, 1, 1);

chrome.scripting.executeScript({
target: { tabId: tab.id },
func: (_incoming_params) => {
if (_incoming_params?.DEBUG > 1) {
console.info('Injected favicon params: ', _incoming_params);
console.log('typeof Favicon', typeof Badge);
}
Favicon.setFavicon(_incoming_params);
},
args: [argumentsToInject],
}, () => {
// on system pages you can't inject any scripts
if ( chrome.runtime.lastError ) {
Env.log('Error injecting favicon script: \n' + chrome.runtime.lastError.message, tab.id, 1, 1);
if (chrome.runtime.lastError) {
Env.log('Env.setupFavicon(): Error injecting CODE/params: \n' + chrome.runtime.lastError.message, tab.id, 3, 1);
} else {
Env.log('Env.setupFavicon(): favicon_params script injected', tab.id, 0, 1, argumentsToInject);
}
});
}
@@ -1725,14 +1748,14 @@ let Env = {

switch (type) {
case 'active':
chrome.browserAction.setIcon({
chrome.action.setIcon({
path : 'Icons/icon-48-act.png',
tabId: tabId
});
break;

default:
chrome.browserAction.setIcon({
chrome.action.setIcon({
path : 'Icons/icon-48.png',
tabId: tabId
});
@@ -1949,7 +1972,7 @@ let Env = {
* Store log messages in collection, console.log if needed (in debug mode)
* @param msg string
* @param tabId int, Basically a key for grouping logs
* @param severityLevel int [-1-3], Default 0 (log)
* @param severityLevel int [-1-4], Default 0 (log) (blue - purple - yellow[warn] - red[error], 0 = white, -1 = debug?)
* @param logDetailLevel int, Higher number allows not to see it, unless debugLevel >= logLevel. 0 [default] = show always [todo]
* @param variable <misc>, Variable to log
* @param forceOutput bool - For exceptions and other errors
@@ -2013,7 +2036,7 @@ let Env = {
printLogs: function (key) {
//console.log(Env.tabs_log[key]); return;
Object.entries(Env.tabs_log[key] ?? []).forEach(function([i, row]) {
if ( (Env.DEBUG >= row.logLevel) || row?.group || Env.DEV ) {
if ( (Env.DEBUG >= row.logLevel) || row?.group/* || Env.DEV */) {
if (row?.group) {
switch (row.group) {
case 'open':