Update to 2.14.2

andr-bot1 · andr-bot1 · commit 336e75cb2a32 · 2025-01-13T17:50:23.000+02:00
diff --git a/examples/htmlserverload/html/home.html b/examples/htmlserverload/html/home.html
@@ -3,5 +3,7 @@
 <body>
 <span>HTML Server Load Example</span>
 <div>Hello, {{profileName}}</div>
+<div id="app-screen" exe="node" js="exeAppScreen">
+</div>
 </body>
 </html>
diff --git a/examples/htmlserverload/server_example.js b/examples/htmlserverload/server_example.js
@@ -47,8 +47,15 @@ for (var p in PAGES) {
 var currentSessionData = { profileName: "LoggedUser1" };
 
 const watchers = htcache.getWatchers(null, 500, true, true);
-
-htcache.setPages(PAGES, htmlparser.HTMLParser, watchers, true);
+function decorateParser(hpinst, o, p, op, pages) {
+	hpinst.jsonSpace = 2;
+	hpinst.exeMethods.exeAppScreen = function (el, htcache, hpinst, p, op, pages) {
+		console.log("#exe", el);
+		el.elements.push(hpinst.getElement("div", false, { id: "app-screen-inset" }));
+		el.elements.push("\n");
+	};
+}
+htcache.setPages(PAGES, htmlparser.HTMLParser, watchers, true, decorateParser);
 
 function isLocal(req) {
 	return ["::1", "127.0.0.1"].indexOf(req.connection.remoteAddress) !== -1;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "protoss-nodejs-basic",
-	"version": "2.14.1",
+	"version": "2.14.2",
 	"author": "Zeta Ret",
 	"license": "MIT",
 	"type": "commonjs",
diff --git a/protossdox.json b/protossdox.json
@@ -9,6 +9,6 @@
 	"relative": true,
 	"markdown": true,
 	"ext": ["js", "ts"],
-	"version": "2.14.1",
+	"version": "2.14.2",
 	"license": "MIT"
 }
diff --git a/utils/html/HTMLCache.js b/utils/html/HTMLCache.js
@@ -127,21 +127,33 @@ class HTMLCache {
 		o.exePage(page, pdata.execfg);
 	}
 
-	setPages(pages, HTMLParser, watchers, log) {
+	setPages(pages, HTMLParser, watchers, log, decorateParser) {
 		var o = this;
 		var hpinst, p, op;
 
 		for (p in pages) {
 			op = pages[p];
 			hpinst = new HTMLParser();
+			if (decorateParser) decorateParser(hpinst, o, p, op, pages);
 			hpinst.useAutomaton = op.useAutomaton || false;
 			hpinst.debug = op.debug || false;
 			if (op.closeTags) hpinst.closeTags = op.closeTags;
 			if (op.cfgParser) op.cfgParser(hpinst, p, op);
 			hpinst.parseFromFile(op.hfile, op.dir);
 			o.addPage(op.id, hpinst, op.hfile, op.dir);
+			var exes = hpinst.search(null, hpinst.exeOn, hpinst.exeAttr);
+			if (exes.length > 0) {
+				exes.forEach((el) => {
+					let method = el.attr[hpinst.exeJS];
+					if (hpinst.exeMethods[method]) {
+						hpinst.exeMethods[method](el, o, hpinst, p, op, pages);
+					}
+				});
+			}
 			if (log) {
+				console.log("\x1b[34m #Get Dom JSON:\x1b[0m");
 				console.log(hpinst.getDomJSON());
+				console.log("\x1b[34m #Dom To String:\x1b[0m");
 				console.log(hpinst.domToString());
 			}
 		}
@@ -159,12 +171,19 @@ class HTMLCache {
 		o.events.emit(EVENTS.SWAP_CSS, page, pdata, o);
 		hpinst.search("link", "type", "text/css").forEach((e) => {
 			var swap,
+				browserpath,
 				pr,
 				f = e.attr.href,
-				prefix = e.attr.prefix;
+				fileid = f.split("/").pop(),
+				prefix = e.attr.prefix,
+				base = e.attr.base;
 
-			if (prefix) {
-				var browserpath = path.join(prefix, f).split("\\").join("/");
+			if (base) {
+				browserpath = path.join(base, fileid).split("\\").join("/");
+				delete e.attr.base;
+				e.attr.href = browserpath;
+			} else if (prefix) {
+				browserpath = path.join(prefix, f).split("\\").join("/");
 				delete e.attr.prefix;
 				e.attr.href = browserpath;
 			} else if (f) {
@@ -192,12 +211,19 @@ class HTMLCache {
 		o.events.emit(EVENTS.SWAP_JS, page, pdata, o);
 		hpinst.search("script", "type", "text/javascript").forEach((e) => {
 			var swap,
+				browserpath,
 				pr,
 				f = e.attr.src,
-				prefix = e.attr.prefix;
+				fileid = f.split("/").pop(),
+				prefix = e.attr.prefix,
+				base = e.attr.base;
 
-			if (prefix) {
-				var browserpath = path.join(prefix, f).split("\\").join("/");
+			if (base) {
+				browserpath = path.join(base, fileid).split("\\").join("/");
+				delete e.attr.base;
+				e.attr.src = browserpath;
+			} else if (prefix) {
+				browserpath = path.join(prefix, f).split("\\").join("/");
 				delete e.attr.prefix;
 				e.attr.src = browserpath;
 			} else if (f) {
diff --git a/utils/html/HTMLCache.json b/utils/html/HTMLCache.json
@@ -3,7 +3,7 @@
 	"description": "HTML page cache utility",
 	"text": "Swap JS/CSS from filepath into tag as relative, cache as page content",
 	"requires": "fs, path, events",
-	"version": "1.8.1",
+	"version": "1.8.2",
 	"date": "2019 - Today",
 	"supername": "zetaret.node.utils.html::HTMLCache",
 	"inherits": null,
diff --git a/utils/html/HTMLCache.md b/utils/html/HTMLCache.md
@@ -2,7 +2,7 @@
 > __HTML page cache utility__  
 # Swap JS/CSS from filepath into tag as relative, cache as page content  
 > *Requires: fs, path, events*  
-> *Version: 1.8.1*  
+> *Version: 1.8.2*  
 > *Date: 2019 - Today*  
 
 __required*__
diff --git a/utils/html/HTMLParser.js b/utils/html/HTMLParser.js
@@ -57,6 +57,12 @@ class HTMLParser {
 			"+": "type",
 			"?": "_",
 		};
+		o.exeMethods = {};
+		o.exeOn = "exe";
+		o.exeAttr = "node";
+		o.exeJS = "js";
+		o.jsonReplacer = null;
+		o.jsonSpace = null;
 	}
 
 	getFilePath(file, dir) {
@@ -99,7 +105,7 @@ class HTMLParser {
 	}
 
 	getDomJSON() {
-		return JSON.stringify(this.dom);
+		return JSON.stringify(this.dom, this.jsonReplacer, this.jsonSpace);
 	}
 
 	domToString(dom, nowhite, pretty, prefix) {
diff --git a/utils/html/HTMLParser.json b/utils/html/HTMLParser.json
@@ -3,7 +3,7 @@
 	"description": "Simple HTML parser",
 	"text": "RegExp XML processor to object and reversed conversion to HTML",
 	"requires": "fs, path, events",
-	"version": "1.9.1",
+	"version": "1.9.2",
 	"date": "2019 - Today",
 	"supername": "zetaret.node.utils.html::HTMLParser",
 	"inherits": null,
diff --git a/utils/html/HTMLParser.md b/utils/html/HTMLParser.md
@@ -2,7 +2,7 @@
 > __Simple HTML parser__  
 # RegExp XML processor to object and reversed conversion to HTML  
 > *Requires: fs, path, events*  
-> *Version: 1.9.1*  
+> *Version: 1.9.2*  
 > *Date: 2019 - Today*  
 
 __required*__

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "protoss-nodejs-basic",`
`3`		`- "version": "2.14.1",`
	`3`	`+ "version": "2.14.2",`
`4`	`4`	`"author": "Zeta Ret",`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"type": "commonjs",`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`"relative": true,`
`10`	`10`	`"markdown": true,`
`11`	`11`	`"ext": ["js", "ts"],`
`12`		`- "version": "2.14.1",`
	`12`	`+ "version": "2.14.2",`
`13`	`13`	`"license": "MIT"`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,12 @@ class HTMLParser {`
`57`	`57`	`"+": "type",`
`58`	`58`	`"?": "_",`
`59`	`59`	`};`
	`60`	`+ o.exeMethods = {};`
	`61`	`+ o.exeOn = "exe";`
	`62`	`+ o.exeAttr = "node";`
	`63`	`+ o.exeJS = "js";`
	`64`	`+ o.jsonReplacer = null;`
	`65`	`+ o.jsonSpace = null;`
`60`	`66`	`}`
`61`	`67`
`62`	`68`	`getFilePath(file, dir) {`
`@@ -99,7 +105,7 @@ class HTMLParser {`
`99`	`105`	`}`
`100`	`106`
`101`	`107`	`getDomJSON() {`
`102`		`- return JSON.stringify(this.dom);`
	`108`	`+ return JSON.stringify(this.dom, this.jsonReplacer, this.jsonSpace);`
`103`	`109`	`}`
`104`	`110`
`105`	`111`	`domToString(dom, nowhite, pretty, prefix) {`