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

Jump to bottom

feat: Attributes support for script rule #38

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: Attributes support for script rule #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a270d67
feat: attributes support for script rule action processor
nsrCodes Apr 2, 2024
1faea3d
chore: version bump to v1.3.0
nsrCodes Apr 2, 2024
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
64 changes: 43 additions & 21 deletions dist/components/proxy-middleware/rule_action_processor/processors/insert_processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,39 @@ const handleCSSScripts = (cssScripts, incomingDOM) => {
*/
const includeCSS = (script, incomingDOM) => {
if (script.type === requestly_core_1.CONSTANTS.SCRIPT_TYPES.URL) {
addRemoteCSS(script.value, incomingDOM);
addRemoteCSS(script.value, script.attributes, incomingDOM);
}
else if (script.type === requestly_core_1.CONSTANTS.SCRIPT_TYPES.CODE) {
embedCSS(script.value, incomingDOM);
embedCSS(script.value, script.attributes, incomingDOM);
}
};
const addRemoteCSS = (src, incomingDOM) => {
const addRemoteCSS = (src, attributes, incomingDOM) => {
var link = incomingDOM.createElement("link");
if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
link.setAttribute(attrName, attrVal !== null && attrVal !== void 0 ? attrVal : "");
});
}
else {
link.type = "text/css";
link.rel = "stylesheet";
}
link.href = src;
link.type = "text/css";
link.rel = "stylesheet";
link.className = getScriptClassAttribute();
link.classList.add(getScriptClassAttribute());
(incomingDOM.head || incomingDOM.documentElement).appendChild(link);
};
const getScriptClassAttribute = () => {
return requestly_core_1.CONSTANTS.PUBLIC_NAMESPACE + "SCRIPT";
};
const embedCSS = (css, incomingDOM) => {
const embedCSS = (css, attributes, incomingDOM) => {
var style = incomingDOM.createElement("style");
style.type = "text/css";
style.appendChild(incomingDOM.createTextNode(css));
style.className = getScriptClassAttribute();
if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
style.setAttribute(attrName, attrVal !== null && attrVal !== void 0 ? attrVal : "");
});
}
style.classList.add(getScriptClassAttribute());
(incomingDOM.head || incomingDOM.documentElement).appendChild(style);
};
const handleJSLibraries = (libraries, incomingDOM) => {
Expand All @@ -86,21 +97,28 @@ const addLibraries = (libraries, indexArg, incomingDOM) => {
addLibraries(libraries, index + 1, incomingDOM);
};
if (library) {
addRemoteJS(library.src, addNextLibraries, incomingDOM);
addRemoteJS(library.src, null, addNextLibraries, incomingDOM);
}
else {
addNextLibraries();
}
};
const addRemoteJS = (src, callback, incomingDOM) => {
const addRemoteJS = (src, attributes, callback, incomingDOM) => {
var script = incomingDOM.createElement("script");
// NOT WORKING
// if (typeof callback === "function") {
// script.onload = callback
// }
script.type = "text/javascript";
if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
script.setAttribute(attrName, attrVal !== null && attrVal !== void 0 ? attrVal : "");
});
}
else {
script.type = "text/javascript";
}
script.src = src;
script.className = getScriptClassAttribute();
script.classList.add(getScriptClassAttribute());
(incomingDOM.head || incomingDOM.documentElement).appendChild(script);
// HOTFIX
callback();
Expand Down Expand Up @@ -132,23 +150,27 @@ const includeJSScriptsInOrder = (scripts, callback, indexArg, incomingDOM) => {
};
const includeJS = (script, callback, incomingDOM) => {
if (script.type === requestly_core_1.CONSTANTS.SCRIPT_TYPES.URL) {
addRemoteJS(script.value, callback, incomingDOM);
addRemoteJS(script.value, script.attributes, callback, incomingDOM);
return;
}
if (script.type === requestly_core_1.CONSTANTS.SCRIPT_TYPES.CODE) {
executeJS(script.value, null, incomingDOM);
executeJS(script.value, script.attributes, incomingDOM);
}
typeof callback === "function" && callback();
};
const executeJS = (code, shouldRemove, incomingDOM) => {
const executeJS = (code, attributes, incomingDOM) => {
const script = incomingDOM.createElement("script");
script.type = "text/javascript";
script.className = getScriptClassAttribute();
if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
script.setAttribute(attrName, attrVal !== null && attrVal !== void 0 ? attrVal : "");
});
}
else {
script.type = "text/javascript";
}
script.classList.add(getScriptClassAttribute());
script.appendChild(incomingDOM.createTextNode(code));
const parent = incomingDOM.head || incomingDOM.documentElement;
parent.appendChild(script);
if (shouldRemove) {
parent.removeChild(script);
}
};
exports.default = process_insert_action;
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@requestly/requestly-proxy",
"version": "1.2.1",
"version": "1.3.0",
"description": "Proxy that gives superpowers to all the Requestly clients",
"main": "dist/index.js",
"scripts": {
Expand Down
70 changes: 49 additions & 21 deletions src/components/proxy-middleware/rule_action_processor/processors/insert_processor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,30 +64,45 @@ const handleCSSScripts = (cssScripts, incomingDOM) => {
*/
const includeCSS = (script, incomingDOM) => {
if (script.type === GLOBAL_CONSTANTS.SCRIPT_TYPES.URL) {
addRemoteCSS(script.value, incomingDOM);
addRemoteCSS(script.value, script.attributes, incomingDOM);
} else if (script.type === GLOBAL_CONSTANTS.SCRIPT_TYPES.CODE) {
embedCSS(script.value, incomingDOM);
embedCSS(script.value, script.attributes, incomingDOM);
}
};

const addRemoteCSS = (src, incomingDOM) => {
const addRemoteCSS = (src, attributes, incomingDOM) => {
var link = incomingDOM.createElement("link");

if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
link.setAttribute(attrName, attrVal ?? "");
});
} else {
link.type = "text/css";
link.rel = "stylesheet";
}

link.href = src;
link.type = "text/css";
link.rel = "stylesheet";
link.className = getScriptClassAttribute();
link.classList.add(getScriptClassAttribute());

(incomingDOM.head || incomingDOM.documentElement).appendChild(link);
};

const getScriptClassAttribute = () => {
return GLOBAL_CONSTANTS.PUBLIC_NAMESPACE + "SCRIPT";
};

const embedCSS = (css, incomingDOM) => {
const embedCSS = (css, attributes, incomingDOM) => {
var style = incomingDOM.createElement("style");
style.type = "text/css";
style.appendChild(incomingDOM.createTextNode(css));
style.className = getScriptClassAttribute();

if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
style.setAttribute(attrName, attrVal ?? "");
});
}

style.classList.add(getScriptClassAttribute());
(incomingDOM.head || incomingDOM.documentElement).appendChild(style);
};

Expand All @@ -109,21 +124,28 @@ const addLibraries = (libraries, indexArg, incomingDOM) => {
};

if (library) {
addRemoteJS(library.src, addNextLibraries, incomingDOM);
addRemoteJS(library.src, null, addNextLibraries, incomingDOM);
} else {
addNextLibraries();
}
};

const addRemoteJS = (src, callback, incomingDOM) => {
const addRemoteJS = (src, attributes, callback, incomingDOM) => {
var script = incomingDOM.createElement("script");
// NOT WORKING
// if (typeof callback === "function") {
// script.onload = callback
// }
script.type = "text/javascript";
if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
script.setAttribute(attrName, attrVal ?? "");
});
} else {
script.type = "text/javascript";
}

script.src = src;
script.className = getScriptClassAttribute();
script.classList.add(getScriptClassAttribute());
(incomingDOM.head || incomingDOM.documentElement).appendChild(script);

// HOTFIX
Expand Down Expand Up @@ -173,27 +195,33 @@ const includeJSScriptsInOrder = (scripts, callback, indexArg, incomingDOM) => {

const includeJS = (script, callback, incomingDOM) => {
if (script.type === GLOBAL_CONSTANTS.SCRIPT_TYPES.URL) {
addRemoteJS(script.value, callback, incomingDOM);
addRemoteJS(script.value, script.attributes, callback, incomingDOM);
return;
}

if (script.type === GLOBAL_CONSTANTS.SCRIPT_TYPES.CODE) {
executeJS(script.value, null, incomingDOM);
executeJS(script.value, script.attributes, incomingDOM);
}

typeof callback === "function" && callback();
};

const executeJS = (code, shouldRemove, incomingDOM) => {
const executeJS = (code, attributes, incomingDOM) => {
const script = incomingDOM.createElement("script");
script.type = "text/javascript";
script.className = getScriptClassAttribute();

if (attributes) {
attributes.forEach(({ name: attrName, value: attrVal }) => {
script.setAttribute(attrName, attrVal ?? "");
});
} else {
script.type = "text/javascript";
}

script.classList.add(getScriptClassAttribute());

script.appendChild(incomingDOM.createTextNode(code));
const parent = incomingDOM.head || incomingDOM.documentElement;
parent.appendChild(script);
if (shouldRemove) {
parent.removeChild(script);
}
};

export default process_insert_action;