small changes

This commit is contained in:
Avad3 2024-07-12 18:01:34 -04:00
parent 30adf894aa
commit a0ef702b54
16 changed files with 124 additions and 113 deletions

View file

@ -1,3 +1,5 @@
import { encodeUrl, rewriteCss, rewriteHtml, rewriteJs, rewriteSrcset } from "../bundle";
// object
// iframe
// embed
@ -37,25 +39,26 @@ Object.keys(attribs).forEach((attrib: string) => {
const descriptor = Object.getOwnPropertyDescriptor(element.prototype, attrib);
Object.defineProperty(element.prototype, attrib, {
get() {
return descriptor.get.call(this, [this.dataset[`_${attrib}`]]);
return this.dataset[attrib];
},
set(value) {
this.dataset[`_${attrib}`] = value;
this.dataset[attrib] = value;
if (/nonce|integrity|csp/.test(attrib)) {
this.removeAttribute(attrib);
} else if (/src|href|data|action|formaction/.test(attrib)) {
// @ts-expect-error
if (value instanceof TrustedScriptURL) {
return;
}
value = self.__scramjet$bundle.rewriters.url.encodeUrl(value);
value = encodeUrl(value);
} else if (attrib === "srcdoc") {
value = self.__scramjet$bundle.rewriters.rewriteHtml(value);
value = rewriteHtml(value);
} else if (/(image)?srcset/.test(attrib)) {
value = self.__scramjet$bundle.rewriters.rewriteSrcset(value);
value = rewriteSrcset(value);
} else if (attrib === "style") {
value = self.__scramjet$bundle.rewriters.rewriteCss(value);
value = rewriteCss(value);
}
descriptor.set.call(this, value);
@ -68,7 +71,7 @@ HTMLElement.prototype.getAttribute = new Proxy(Element.prototype.getAttribute, {
apply(target, thisArg, argArray) {
console.log(thisArg);
if (Object.keys(attribs).includes(argArray[0])) {
argArray[0] = `_${argArray[0]}`;
argArray[0] = `data-${argArray[0]}`;
}
return Reflect.apply(target, thisArg, argArray);
@ -89,13 +92,13 @@ HTMLElement.prototype.setAttribute = new Proxy(Element.prototype.setAttribute, {
return;
} else if (/src|href|data|action|formaction/.test(argArray[0])) {
console.log(thisArg);
argArray[1] = self.__scramjet$bundle.rewriters.url.encodeUrl(argArray[1]);
argArray[1] = encodeUrl(argArray[1]);
} else if (argArray[0] === "srcdoc") {
argArray[1] = self.__scramjet$bundle.rewriters.rewriteHtml(argArray[1]);
argArray[1] = rewriteHtml(argArray[1]);
} else if (/(image)?srcset/.test(argArray[0])) {
argArray[1] = self.__scramjet$bundle.rewriters.rewriteSrcset(argArray[1]);
argArray[1] = rewriteSrcset(argArray[1]);
} else if (argArray[1] === "style") {
argArray[1] = self.__scramjet$bundle.rewriters.rewriteCss(argArray[1]);
argArray[1] = rewriteCss(argArray[1]);
}
}
@ -108,14 +111,16 @@ const innerHTML = Object.getOwnPropertyDescriptor(Element.prototype, "innerHTML"
Object.defineProperty(HTMLElement.prototype, "innerHTML", {
set(value) {
if (this instanceof HTMLScriptElement) {
// @ts-expect-error
if (!(value instanceof TrustedScript)) {
value = self.__scramjet$bundle.rewriters.rewriteJs(value);
value = rewriteJs(value);
}
} else if (this instanceof HTMLStyleElement) {
value = self.__scramjet$bundle.rewriters.rewriteCss(value);
value = rewriteCss(value);
} else {
// @ts-expect-error
if (!(value instanceof TrustedHTML)) {
value = self.__scramjet$bundle.rewriters.rewriteHtml(value);
value = rewriteHtml(value);
}
}