WIP

SAP · Nov 6, 2020 · 21d85ef · 21d85ef
1 parent ae5b8b5
commit 21d85ef
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/lib/processors/uglifier.js b/lib/processors/uglifier.js
@@ -3,7 +3,7 @@ const workerpool = require("workerpool");
 let _pool;
 
 const MIN_WORKERS = 2;
-const MAX_WORKERS = Infinity;
+const MAX_WORKERS = 4;
 const osCpus = require("os").cpus().length;
 const maxWorkers = Math.max(Math.min((osCpus || 1) - 1, MAX_WORKERS), MIN_WORKERS);
 
@@ -23,6 +23,8 @@ function pool({taskUtil}) {
 	return _pool;
 }
 
+let uglifyWorker;
+
 /**
  * Minifies the supplied resources.
  *
@@ -36,10 +38,21 @@ function pool({taskUtil}) {
 module.exports = function({resources, taskUtil}) {
 	return Promise.all(resources.map(async (resource) => {
 		const code = await resource.getString();
-		const uglifiedCode = await pool({taskUtil}).exec("uglify", [{
-			filePath: resource.getPath(),
-			code
-		}]);
+		let uglifiedCode;
+		if (taskUtil) {
+			uglifiedCode = await pool({taskUtil}).exec("uglify", [{
+				filePath: resource.getPath(),
+				code
+			}]);
+		} else {
+			if (!uglifyWorker) {
+				uglifyWorker = require("./uglifier_worker");
+			}
+			uglifiedCode = await uglifyWorker({
+				filePath: resource.getPath(),
+				code
+			});
+		}
 		resource.setString(uglifiedCode);
 		return resource;
 	}));

diff --git a/lib/processors/uglifier_worker.js b/lib/processors/uglifier_worker.js
@@ -33,7 +33,14 @@ async function uglify({filePath, code}) {
 	}
 }
 
-// create a worker and register public functions
-workerpool.worker({
-	uglify
-});
+if (!workerpool.isMainThread) {
+	// create a worker and register public functions
+	workerpool.worker({
+		uglify
+	});
+} else {
+	// Normal use without worker
+	module.exports = uglify;
+}
+
+
diff --git a/lib/tasks/uglify.js b/lib/tasks/uglify.js
@@ -21,12 +21,14 @@ module.exports = function({workspace, taskUtil, options: {pattern}}) {
 					return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsBundle);
 				});
 			}
+			console.time("uglifyProcessor");
 			return uglifyProcessor({
 				resources,
 				taskUtil
 			});
 		})
 		.then((processedResources) => {
+			console.timeEnd("uglifyProcessor");
 			return Promise.all(processedResources.map((resource) => {
 				return workspace.write(resource);
 			}));