mirror of
https://github.com/MercuryWorkshop/scramjet.git
synced 2025-05-12 22:10:01 -04:00
chore: defaultFlags -> flags, sync xhr fixes
This commit is contained in:
parent
ef8735f95a
commit
00de00e7ca
5 changed files with 8 additions and 9 deletions
|
@ -33,7 +33,7 @@ export default function (client: ScramjetClient, self: Self) {
|
|||
if (!flagEnabled("syncxhr", client.url)) {
|
||||
console.warn("ignoring request - sync xhr disabled in flags");
|
||||
|
||||
return;
|
||||
return ctx.return(undefined);
|
||||
}
|
||||
|
||||
// it's a sync request
|
||||
|
|
|
@ -7,7 +7,7 @@ export class ScramjetController {
|
|||
|
||||
constructor(config: Partial<ScramjetConfig>) {
|
||||
// sane ish defaults
|
||||
const defaultConfig: Partial<ScramjetConfig> = {
|
||||
const defaultConfig: ScramjetConfig = {
|
||||
prefix: "/scramjet/",
|
||||
globals: {
|
||||
wrapfn: "$scramjet$wrap",
|
||||
|
@ -26,7 +26,7 @@ export class ScramjetController {
|
|||
client: "/scramjet.client.js",
|
||||
sync: "/scramjet.sync.js",
|
||||
},
|
||||
defaultFlags: {
|
||||
flags: {
|
||||
serviceworkers: false,
|
||||
naiiveRewriter: false,
|
||||
captureErrors: true,
|
||||
|
|
|
@ -27,7 +27,7 @@ export function loadCodecs() {
|
|||
}
|
||||
|
||||
export function flagEnabled(flag: keyof ScramjetFlags, url: URL): boolean {
|
||||
const value = $scramjet.config.defaultFlags[flag];
|
||||
const value = $scramjet.config.flags[flag];
|
||||
for (const regex in $scramjet.config.siteFlags) {
|
||||
const partialflags = $scramjet.config.siteFlags[regex];
|
||||
if (new RegExp(regex).test(url.href) && flag in partialflags) {
|
||||
|
|
2
src/types.d.ts
vendored
2
src/types.d.ts
vendored
|
@ -54,7 +54,7 @@ interface ScramjetConfig {
|
|||
client: string;
|
||||
sync: string;
|
||||
};
|
||||
defaultFlags: ScramjetFlags;
|
||||
flags: ScramjetFlags;
|
||||
siteFlags: Record<string, Partial<ScramjetFlags>>;
|
||||
codec: {
|
||||
encode: string;
|
||||
|
|
|
@ -6,10 +6,9 @@ const scramjet = new ScramjetController({
|
|||
shared: "/scram/scramjet.shared.js",
|
||||
sync: "/scram/scramjet.sync.js",
|
||||
},
|
||||
siteFlags: {
|
||||
"https://worker-playground.glitch.me/.*": {
|
||||
serviceworkers: true,
|
||||
},
|
||||
flags: {
|
||||
serviceworkers: true,
|
||||
syncxhr: true,
|
||||
},
|
||||
});
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue