Finish refactoring types in AeroSandbox

src/AeroSandbox/build/customBuilds/frankenUV.workers.ts

@@ -1,4 +1,4 @@
-import { UVRewriterWorkerMembers } from "$types/index.d";
+import { UVRewriterWorkerMembers } from "$types/customBuilds";
 import type { UVConfig } from "@titaniumnetwork-dev/ultraviolet";
 
 import { defaultProxyFeatures } from "../../build/featureMembers";

src/AeroSandbox/build/featureMembers.ts

@@ -1,26 +1,26 @@
-import { InterceptionFeaturesEnum } from "$types/index.d";
+import { InterceptionFeaturesEnum } from "$types/apiInterceptors";
 
 // TODO: Put all of these terms in the API Interception Glossary
 
 /** @note: These do not cover Origin Isolation although Origin Emulation is a type of Origin Isolation. Origin Emulation is a superset of Origin Isolation. */
 const originEmulationFeatures =
-	InterceptionFeaturesEnum.corsEmulation |
-	InterceptionFeaturesEnum.cacheEmulation |
-	InterceptionFeaturesEnum.privacySandbox |
-	InterceptionFeaturesEnum.nestedSWs;
+  InterceptionFeaturesEnum.corsEmulation |
+  InterceptionFeaturesEnum.cacheEmulation |
+  InterceptionFeaturesEnum.privacySandbox |
+  InterceptionFeaturesEnum.nestedSWs;
 /** @note: These do not cover Origin Concealers although Origin Isolation is a type of Origin Concealing. Origin Isolation is a superset of Origin Concealment. */
 const miscOriginIsolators = InterceptionFeaturesEnum.messageIsolation;
 const miscOriginConcealers =
-	InterceptionFeaturesEnum.elementConcealment |
-	InterceptionFeaturesEnum.errorConcealment;
+  InterceptionFeaturesEnum.elementConcealment |
+  InterceptionFeaturesEnum.errorConcealment;
 const defaultSWProxyFeatures = originEmulationFeatures | miscOriginConcealers;
 const defaultProxyFeatures =
-	defaultSWProxyFeatures | InterceptionFeaturesEnum.requestUrlProxifier;
+  defaultSWProxyFeatures | InterceptionFeaturesEnum.requestUrlProxifier;
 
 export {
-	originEmulationFeatures,
-	miscOriginIsolators,
-	miscOriginConcealers,
-	defaultSWProxyFeatures,
-	defaultProxyFeatures
+  originEmulationFeatures,
+  miscOriginIsolators,
+  miscOriginConcealers,
+  defaultSWProxyFeatures,
+  defaultProxyFeatures,
 };

src/AeroSandbox/src/init$aero.ts

@@ -0,0 +1,4 @@
+import { AeroGlobalType } from "$types/$aero.d";
+
+// The rest of the aero props are set in the SW injects before this file is executed
+// I have no use for this file yet

src/AeroSandbox/src/interceptors/concealer/blob.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor } from "$types/index.d";
+import { APIInterceptor } from "$types/apiInterceptors";
 import isHtml from "$shared/isHTML";
 
 export default {

src/AeroSandbox/src/interceptors/concealer/css.ts

@@ -6,7 +6,7 @@
  */
 
 import { afterPrefix } from "$shared/getProxyUrl";
-import { APIInterceptor, ExposedContextsEnum } from "$types/index.d";
+import { APIInterceptor, ExposedContextsEnum } from "$types/apiInterceptors";
 
 // Proxy the getters for shadow root stylesheets
 

src/AeroSandbox/src/interceptors/concealer/error.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, SupportEnum } from "$types/index.d";
+import { APIInterceptor, SupportEnum } from "$types/apiInterceptors";
 
 import config from "$aero/config";
 const { aeroPrefix } = config;

src/AeroSandbox/src/interceptors/concealer/launchQueue.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, SupportEnum } from "$types/index.d";
+import { APIInterceptor, SupportEnum } from "$types/apiInterceptors";
 
 import { afterPrefix } from "$shared/getProxyUrl";
 

src/AeroSandbox/src/interceptors/concealer/misc/scriptSandboxing.ts

@@ -2,7 +2,7 @@ import {
   APIInterceptor,
   ExposedContextsEnum,
   proxifiedObjGeneratorContext,
-} from "$types/index.d";
+} from "$types/apiInterceptors";
 
 import locationProxy from "$shared/proxyLocation";
 

src/AeroSandbox/src/interceptors/concealer/moduleScripts.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor } from "$types/index.d";
+import { APIInterceptor } from "$types/apiInterceptors";
 import { proxyLocation } from "$shared/proxyLocation";
 
 /**

src/AeroSandbox/src/interceptors/concealer/navigation.ts

@@ -1,14 +1,10 @@
 // Not finished
 
-import config from "$aero/config";
-const { flags } = config;
-
-import { afterPrefix } from "$shared";
+import { afterPrefix } from "$shared/getProxyUrl";
 
 import { proxyLocation } from "$shared/proxyLocation";
 
-import proxyMessage from "$shared/proxyMessage";
-import { APIInterceptor, SupportEnum } from "$types/index.d";
+import { APIInterceptor, SupportEnum } from "$types/apiInterceptors";
 
 export default [
   // Entries

src/AeroSandbox/src/interceptors/concealer/payment.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, SupportEnum } from "$types/index.d";
+import { APIInterceptor, SupportEnum } from "$types/apiInterceptors";
 
 import { proxyGetString } from "$shared/stringProxy";
 

src/AeroSandbox/src/interceptors/concealer/presentation.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, SupportEnum } from "$types/index.d";
+import { APIInterceptor, SupportEnum } from "$types/apiInterceptors";
 
 import { proxyGetString } from "$shared/stringProxy";
 

src/AeroSandbox/src/interceptors/concealer/push.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, ExposedContextsEnum } from "$types/index.d";
+import { APIInterceptor, ExposedContextsEnum } from "$types/apiInterceptors";
 import { proxyGetString } from "$shared/stringProxy";
 
 export default {

src/AeroSandbox/src/interceptors/concealer/secure.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, ExposedContextsEnum } from "$types/index.d";
+import { APIInterceptor, ExposedContextsEnum } from "$types/apiInterceptors";
 
 import config from "config";
 const { flags } = config;

src/AeroSandbox/src/interceptors/loc/history.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, ExposedContextsEnum } from "$types/index.d";
+import { APIInterceptor, ExposedContextsEnum } from "$types/apiInterceptors";
 
 import rewriteSrc from "$shared/src";
 

src/AeroSandbox/src/interceptors/loc/open.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, ExposedContextsEnum } from "$types/index.d";
+import { APIInterceptor, ExposedContextsEnum } from "$types/apiInterceptors";
 
 import rewriteSrc from "$shared/src";
 

src/AeroSandbox/src/interceptors/originIsolators/privacySandbox/credentials.ts

@@ -4,7 +4,7 @@
  * This whole file encompasses the {@link https://developer.mozilla.org/en-US/docs/Web/API/Web_Authentication_API WebAuthn}, {@link https://developer.mozilla.org/en-US/docs/Web/API/FedCM_API FedCM}, {@link https://wicg.github.io/web-otp WebOTP} APIs
  */
 
-import { APIInterceptor, ExposedContextsEnum } from "$types/index.d";
+import { APIInterceptor, ExposedContextsEnum } from "$types/apiInterceptors";
 
 import { proxyLocation } from "$shared/proxyLocation";
 import { afterPrefix } from "$shared/getProxyUrl";

src/AeroSandbox/src/interceptors/req/eventSource.ts

@@ -1,7 +1,7 @@
 import {
   APIInterceptor,
   SpecialInterceptionFeaturesEnum,
-} from "$types/index.d";
+} from "$types/apiInterceptors";
 
 import { proxyConstructString } from "$shared/stringProxy";
 

src/AeroSandbox/src/interceptors/req/fetch.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, ExposedContextsEnum } from "$types/index.d";
+import { APIInterceptor, ExposedContextsEnum } from "$types/apiInterceptors";
 import { handleFetchEvent } from "$aero_browser/util/swlessUtils";
 
 export default {

src/AeroSandbox/src/interceptors/req/wrtc.ts

@@ -2,7 +2,7 @@ import {
   AltProtocolEnum,
   APIInterceptor,
   ExposedContextsEnum,
-} from "$types/index.d";
+} from "$types/apiInterceptors";
 
 import config from "$aero/config";
 const { wrtcBackends } = config;

src/AeroSandbox/src/interceptors/req/ws.ts

@@ -1,4 +1,4 @@
-import { AltProtocolEnum, APIInterceptor } from "$types/index.d";
+import { AltProtocolEnum, APIInterceptor } from "$types/apiInterceptors";
 
 import { BareClient } from "@mercuryworkshop/bare-mux";
 

src/AeroSandbox/src/interceptors/req/wt.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor } from "$types/index.d";
+import { APIInterceptor } from "$types/apiInterceptors";
 
 // Only supported on Chromium
 export default {

src/AeroSandbox/src/interceptors/storage/iDB.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor } from "$types/index.d";
+import { APIInterceptor } from "$types/apiInterceptors";
 
 import config from "$aero/config";
 

src/AeroSandbox/src/interceptors/storage/sharedStorage.ts

@@ -1,5 +1,5 @@
 import config from "$aero/config";
-import { APIInterceptor } from "$types/index.d";
+import { APIInterceptor } from "$types/apiInterceptors";
 const { prefix } = config;
 
 import { storageNomenclature } from "./shared";

src/AeroSandbox/src/interceptors/storage/sql.ts

@@ -1,4 +1,4 @@
-import { APIInterceptor, SupportEnum } from "$types/index.d";
+import { APIInterceptor, SupportEnum } from "$types/apiInterceptors";
 
 import config from "$aero/config";
 const { prefix } = config;

src/AeroSandbox/src/sandboxers/JS/JSRewriter.ts

@@ -4,7 +4,7 @@ import {
   aerogelParser,
   astParser,
   astWalker,
-} from "../../../types/aeroSandbox";
+} from "../../../types/rewriters/js";
 
 import ASTRewriter from "./backends/AST";
 import AeroGel from "./backends/AeroGel";

src/AeroSandbox/src/sandboxers/JS/backends/AeroGel.ts

@@ -1,8 +1,8 @@
 import {
-	AeroGelConfig,
-	aerogelParser,
-	keywordReplacementType
-} from "../../../../types/index";
+  AeroGelConfig,
+  aerogelParser,
+  keywordReplacementType,
+} from "../../../../types/aeroSandbox";
 
 //import esniff from "esniff";
 
@@ -11,25 +11,25 @@ var INCLUDE_ESNIFF: boolean;
 
 // TODO: Setup test cases
 export default class AeroGel {
-	config: AeroGelConfig;
-	constructor(config: AeroGelConfig) {
-		this.config = config;
-	}
-	applyNewConfig(config: AeroGelConfig) {
-		this.config = config;
-	}
-	static supportedParsers(): aerogelParser[] {
-		let supports: aerogelParser[] = [];
-		if (INCLUDE_ESNIFF) supports.push("esniff");
-		return supports;
-	}
-	/** This essentially the rewriter
-	 * @param script The script to jail. Before it is jailed the let/const to fake vars RegExp rewriting occurs.
-	 * @param isModule Module scripts don't need to be rewritten because they don't require fake vars for scope emulation since module scripts run in their own isolated scope.
-	 * @example TODO: Provide an example
-	 */
-	jailScript(script: string, isModule: boolean) {
-		return /* js */ `
+  config: AeroGelConfig;
+  constructor(config: AeroGelConfig) {
+    this.config = config;
+  }
+  applyNewConfig(config: AeroGelConfig) {
+    this.config = config;
+  }
+  static supportedParsers(): aerogelParser[] {
+    let supports: aerogelParser[] = [];
+    if (INCLUDE_ESNIFF) supports.push("esniff");
+    return supports;
+  }
+  /** This essentially the rewriter
+   * @param script The script to jail. Before it is jailed the let/const to fake vars RegExp rewriting occurs.
+   * @param isModule Module scripts don't need to be rewritten because they don't require fake vars for scope emulation since module scripts run in their own isolated scope.
+   * @example TODO: Provide an example
+   */
+  jailScript(script: string, isModule: boolean) {
+    return /* js */ `
 			!() => {
 				${isModule ? script : this.rewriteScript(script)}
 		  	}().call({
@@ -38,10 +38,10 @@ export default class AeroGel {
 				location: ${this.config.objPaths.proxy.location}
 		 	 });
 		`;
-	}
-	/** This method is specifically for `var keyword rewriting` */
-	rewriteScript(script: string): string {
-		/*
+  }
+  /** This method is specifically for `var keyword rewriting` */
+  rewriteScript(script: string): string {
+    /*
 		if (INCLUDE_ESNIFF) {
 			let letIndicies = [];
 			let constIndicies = [];
@@ -73,27 +73,23 @@ export default class AeroGel {
 			script = this.replaceKeywords(script, keywordReplacements);
 		}
 		*/
-		return script;
-	}
-	replaceKeywords(
-		str: string,
-		keywordReplacements: keywordReplacementType
-	): string {
-		const charArr = Array.from(str);
-		let totalAddedToIndex = 0;
-		for (const [indexStr, replacementData] of Object.entries(
-			keywordReplacements
-		)) {
-			const { keywordLen, replacementStr } = replacementData;
-			const index = parseInt(indexStr);
-			const replacementArr = Array.from(replacementStr);
-			totalAddedToIndex += replacementArr.length - keywordLen;
-			charArr.splice(
-				index + totalAddedToIndex,
-				keywordLen,
-				replacementStr
-			);
-		}
-		return charArr.join("");
-	}
+    return script;
+  }
+  replaceKeywords(
+    str: string,
+    keywordReplacements: keywordReplacementType
+  ): string {
+    const charArr = Array.from(str);
+    let totalAddedToIndex = 0;
+    for (const [indexStr, replacementData] of Object.entries(
+      keywordReplacements
+    )) {
+      const { keywordLen, replacementStr } = replacementData;
+      const index = parseInt(indexStr);
+      const replacementArr = Array.from(replacementStr);
+      totalAddedToIndex += replacementArr.length - keywordLen;
+      charArr.splice(index + totalAddedToIndex, keywordLen, replacementStr);
+    }
+    return charArr.join("");
+  }
 }

src/AeroSandbox/tsconfig.json

@@ -19,7 +19,6 @@
   },
   "include": [
     "src/**/*.ts",
-    "build/customBuilds/**/*.ts",
     "./config.ts",
     "types/**/*.d.ts",
     "src/interceptors/concealer/element.ts.old",

src/AeroSandbox/types/$aero.d.ts

@@ -1,13 +1,14 @@
-import type { AeroSandboxLogger } from "$aero/src/shared/Loggers";
-import type { BareTransport } from "@mercuryworkshop/bare-mux";
+import type { AeroSandboxLogger } from "$shared/Loggers";
+import type BareClient from "@mercuryworkshop/bare-mux";
 
-interface AeroGlobalType {
+export interface AeroGlobalType {
   $sec: {
     csp: string;
     init: string;
   };
   $bc: BareClient;
   logger: AeroSandboxLogger;
+  prefix: string;
 }
 
 declare global {

src/AeroSandbox/types/aeroSandbox.d.ts

@@ -0,0 +1,21 @@
+import { SupportEnum, InterceptionFeaturesEnum } from "$types/apiInterceptors";
+
+import type { BareTransport } from "@mercuryworkshop/bare-mux";
+
+export interface AeroSandboxConfig {
+  proxyConfig: ProxyConfig;
+  /** These enum members enable code inside of the Proxy handler that provide other things you may want to use AeroSandbox for */
+  specialInterceptionFeatures?: InterceptionFeaturesEnum;
+  supports: SupportEnum;
+  proxyGlobalContext: "$aero";
+}
+
+// This is the typical proxy config. This is only what is used to format and unformat urls.
+export type ProxyConfig = {
+  BareTransport: BareTransport;
+  prefix: string;
+  encodeUrl: (url: string) => string;
+  decodeUrl: (url: string) => string;
+  // This is for WebRTC proxying. The API is disabled, if this isn't provided.
+  webrtcTurnServers?: string[];
+};