Inline the RegExWorker in index.html

Author: wdamien

assets/workers/RegExWorker.js

@@ -1,10 +1,16 @@
+/**
+ * This file is now added to the index.html file
+ * in .regexWorker
+ *
+ * Its currently manually minified. But that should move to the build process.
+ */
 
 // in plain JS for now:
 onmessage = function (evt) {
 	postMessage("onload");
 	var data = evt.data, text = data.text, tests = data.tests, mode = data.mode;
 	var regex = new RegExp(data.pattern, data.flags);
-	
+
 	// shared between BrowserSolver & RegExWorker
 	var matches = [], match, index, error;
 	if (mode === "tests") {

dev/src/helpers/BrowserSolver.js

@@ -19,45 +19,47 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 import Utils from "../utils/Utils";
 
 export default class BrowserSolver {
-	
-	
+
+	constructor() {
+		const workerBlob = new Blob([
+			document.querySelector('#regexWorker').textContent
+		], { type: "text/javascript" });
+		this._workerObjectURL = URL.createObjectURL(workerBlob);
+	}
+
 	solve(o, callback) {
 		this._callback = callback;
 		this._req = o;
-		
+
 		let regex, text=o.text, tests=o.tests, mode = o.mode;
 		try {
 			this._regex = regex = new RegExp(o.pattern, o.flags);
 		} catch(e) {
 			return this._onRegExComplete({id:"regexparse", name: e.name, message: e.message}, null, mode);
 		}
-		
+
 		if (window.Worker) {
-			if (!this._worker) {
-				this._worker = new Worker("assets/workers/RegExWorker.js");
-			}
+			const worker = new Worker(this._workerObjectURL);
 
-			this._worker.onmessage = (evt) => {
+			worker.onmessage = (evt) => {
 				if (evt.data === "onload") {
 					this._startTime = Utils.now();
 					this._timeoutId = setTimeout(() => {
-						this._worker.terminate();
-						this._worker = null;
-						this._onRegExComplete({id: "timeout"}); // TODO: make this a warning, and return all results so far.
+						worker.terminate();
+						this._onRegExComplete({id: "timeout"}, null, mode); // TODO: make this a warning, and return all results so far.
 					}, 250);
 				} else {
 					clearTimeout(this._timeoutId);
+					worker.terminate();
 					this._onRegExComplete(evt.data.error, evt.data.matches, evt.data.mode);
 				}
 			};
 
-			clearTimeout(this._timeoutId);
-
 			// we need to pass the pattern and flags as text, because Safari strips the unicode flag when passing a RegExp to a Worker
-			this._worker.postMessage({pattern:o.pattern, flags:o.flags, text, tests, mode});
+			worker.postMessage({pattern:o.pattern, flags:o.flags, text, tests, mode});
 		} else {
 			this._startTime = Utils.now();
-			
+
 			// shared between BrowserSolver & RegExWorker
 			var matches = [], match, index, error;
 			if (mode === "tests") {
@@ -78,19 +80,19 @@ export default class BrowserSolver {
 				}
 			}
 			// end share
-			
+
 			this._onRegExComplete(error, matches, mode);
 		}
 	}
-	
+
 	_onRegExComplete(error, matches, mode) {
 		let result = {
 			time: error ? null : Utils.now()-this._startTime,
 			error,
 			mode,
 			matches
 		};
-		
+
 		let tool = this._req.tool;
 		if (tool) {
 			result.tool = { id: tool.id };
@@ -101,22 +103,22 @@ export default class BrowserSolver {
 		}
 		this._callback(result);
 	}
-	
+
 	_getReplace(str) {
 		return this._req.text.replace(this._regex, str);
 	}
-	
+
 	_getList(str) {
 		// TODO: should we move this into a worker?
 		let source = this._req.text, result = "", repl, ref, trimR = 0, regex;
-		
+
 		// build a RegExp without the global flag:
 		try {
 			regex = new RegExp(this._req.pattern, this._req.flags.replace("g", ""));
 		} catch(e) {
 			return null;
 		}
-		
+
 		if (str.search(/\$[&1-9`']/) === -1) {
 			trimR = str.length;
 			str = "$&"+str;
@@ -132,4 +134,4 @@ export default class BrowserSolver {
 		if (trimR) { result = result.substr(0,result.length-trimR); }
 		return result;
 	}
-}
+}

index.html

@@ -13,6 +13,11 @@
 	gtag('config', 'UA-3579542-6');
 	</script>
 
+	<!-- source for this is in ./assets/workers/RegExWorker.js -->
+	<script id="regexWorker" type="javascript/worker">
+		onmessage=function(e){postMessage("onload");var t,s,n,a=e.data,i=a.text,d=a.tests,l=a.mode,r=new RegExp(a.pattern,a.flags),o=[];if("tests"===l)for(var g=0,x=d.length;g<x;g++){let e=d[g];i=e.text,r.lastIndex=0,t=r.exec(i),o[g]=t?{i:t.index,l:t[0].length,id:e.id}:{id:e.id}}else for(;t=r.exec(i);){s===r.lastIndex&&(n={id:"infinite",warning:!0},++r.lastIndex),s=r.lastIndex;var f=t.reduce(function(e,t,s){return(0===s||e.push({s:t}))&&e},[]);if(o.push({i:t.index,l:t[0].length,groups:f}),!r.global)break}postMessage({error:n,matches:o,mode:l})};
+	</script>
+
 	<link href="https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400;700&family=Source+Code+Pro:wght@200;400;700&display=swap" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="<%= css_file %>">