From be2f3ecbd75ccd0f6b9f68accc084c7f8a2674d2 Mon Sep 17 00:00:00 2001
From: Matthias Kleine <github.com9@emailu.de>
Date: Thu, 22 May 2025 16:05:44 +0200
Subject: [PATCH 1/3] Added possibility to escape chars in formatTimeDiff

---
 README.md             |  4 ++++
 docs/en/javascript.md |  2 ++
 lib/sandbox.js        | 34 ++++++++++++++++++++++------------
 test/testFunctions.js |  6 +++++-
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 6b1025d11..101ed50a9 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,10 @@ Executes Javascript, Typescript Scripts.
 <!--
 	### **WORK IN PROGRESS**
 -->
+### **WORK IN PROGRESS**
+
+* (@klein0r) Added possibility to escape chars in formatTimeDiff
+
 ### 8.9.2 (2025-04-27)
 
 * (@GermanBluefox) Updated packages for GUI
diff --git a/docs/en/javascript.md b/docs/en/javascript.md
index fcfdc51bd..3f7ccab6b 100644
--- a/docs/en/javascript.md
+++ b/docs/en/javascript.md
@@ -1299,6 +1299,8 @@ formatTimeDiff(milliseconds, format);
 * ss, сс(cyrillic) - full seconds, e.g. "05"
 * s, с(cyrillic) - short seconds, e.g., "5"
 
+You can use escape charachter `\` to avoid the replacement. e.g. `DD \Day\s, h \hour\s, m \minute, ss \second\s`
+
 #### Example
 
 ```js
diff --git a/lib/sandbox.js b/lib/sandbox.js
index ea35875ae..c3cf52b33 100644
--- a/lib/sandbox.js
+++ b/lib/sandbox.js
@@ -3537,50 +3537,60 @@ function sandBox(script, name, verbose, debug, context) {
             const neg = diff < 0;
             diff = Math.abs(diff);
 
-            if (/DD|TT|ДД|D|T|Д/.test(text)) {
+            if (/(?<!\\)(D|T|Д)/.test(text)) {
                 const days = Math.floor(diff / day);
 
-                text = text.replace(/DD|TT|ДД/, days < 10 ? `0${days}` : days);
-                text = text.replace(/D|T|Д/, days);
+                text = text
+                    .replace(/(?<!\\)(DD|TT|ДД)/g, days < 10 ? `0${days}` : days)
+                    .replace(/(?<!\\)(D|T|Д)/g, days);
 
                 sandbox.verbose && sandbox.log(`formatTimeDiff(format=${format}, text=${text}, days=${days})`, 'debug');
 
                 diff -= days * day;
             }
 
-            if (/hh|SS|чч|h|S|ч/.test(text)) {
+            if (/(?<!\\)(h|S|ч)/.test(text)) {
                 const hours = Math.floor(diff / hour);
 
-                text = text.replace(/hh|SS|чч/, hours < 10 ? `0${hours}` : hours);
-                text = text.replace(/h|S|ч/, hours);
+                text = text
+                    .replace(/(?<!\\)(hh|SS|чч)/g, hours < 10 ? `0${hours}` : hours)
+                    .replace(/(?<!\\)(h|S|ч)/g, hours);
 
                 sandbox.verbose && sandbox.log(`formatTimeDiff(format=${format}, text=${text}, hours=${hours})`, 'debug');
 
                 diff -= hours * hour;
             }
 
-            if (/mm|мм|m|м/.test(text)) {
+            if (/(?<!\\)(m|м)/.test(text)) {
                 const minutes = Math.floor(diff / minute);
 
-                text = text.replace(/mm|мм/, minutes < 10 ? `0${minutes}` : minutes);
-                text = text.replace(/m|м/, minutes);
+                text = text
+                    .replace(/(?<!\\)(mm|мм)/g, minutes < 10 ? `0${minutes}` : minutes)
+                    .replace(/(?<!\\)(m|м)/g, minutes);
 
                 sandbox.verbose && sandbox.log(`formatTimeDiff(format=${format}, text=${text}, minutes=${minutes})`, 'debug');
 
                 diff -= minutes * minute;
             }
 
-            if (/ss|сс|мм|s|с/.test(text)) {
+            if (/(?<!\\)(s|с)/.test(text)) {
                 const seconds = Math.floor(diff / second);
 
-                text = text.replace(/ss|сс/, seconds < 10 ? `0${seconds}` : seconds);
-                text = text.replace(/s|с/, seconds);
+                text = text
+                    .replace(/(?<!\\)(ss|сс)/g, seconds < 10 ? `0${seconds}` : seconds)
+                    .replace(/(?<!\\)(s|с)/g, seconds);
 
                 sandbox.verbose && sandbox.log(`formatTimeDiff(format=${format}, text=${text}, seconds=${seconds})`, 'debug');
 
                 diff -= seconds * second;
             }
 
+            text = text
+                .replace(/\\(D|T|Д)/g, '$1')
+                .replace(/\\(h|S|ч)/g, '$1')
+                .replace(/\\(m|м)/g, '$1')
+                .replace(/\\(s|с)/g, '$1');
+
             sandbox.verbose && sandbox.log(`formatTimeDiff(format=${format}, text=${text})`, 'debug');
 
             return neg ? `-${text}` : text;
diff --git a/test/testFunctions.js b/test/testFunctions.js
index c594b0649..1b3d9dfb1 100644
--- a/test/testFunctions.js
+++ b/test/testFunctions.js
@@ -1946,7 +1946,8 @@ describe.only('Test JS', function () {
                 source:         `createState('test_formatTimeDiff', { type: 'string', role: 'json', read: true, write: false }, () => {\n` +
                                 `    const diff1 = formatTimeDiff(172800000 + 10800000 + 540000 + 15000, 'hh:mm:ss');\n` +
                                 `    const diff2 = formatTimeDiff((172800000 + 10800000 + 540000 + 15000) * -1, 'mm:ss');\n` +
-                                `    setState('test_formatTimeDiff', { val: JSON.stringify({ diff1, diff2 }), ack: true });\n` +
+                                `    const diff3 = formatTimeDiff(374501000, 'DD \\Day\\s, h \\hour\\s, m \\minute, ss \\second\\s');\n` +
+                                `    setState('test_formatTimeDiff', { val: JSON.stringify({ diff1, diff2, diff3 }), ack: true });\n` +
                                 `});`,
             },
             native: {},
@@ -1961,6 +1962,9 @@ describe.only('Test JS', function () {
                 expect(obj.diff2).to.be.a('string');
                 expect(obj.diff2).to.be.equal('-3069:15');
 
+                expect(obj.diff3).to.be.a('string');
+                expect(obj.diff3).to.be.equal('04 Days, 8 hours, 1 minute, 41 seconds');
+
                 removeStateChangedHandler(onStateChanged);
                 done();
             }

From 702156bcf0c8365b236138374482010955d0d6be Mon Sep 17 00:00:00 2001
From: Matthias Kleine <github.com9@emailu.de>
Date: Fri, 23 May 2025 09:51:02 +0200
Subject: [PATCH 2/3] Fixed integration test

---
 test/testFunctions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/testFunctions.js b/test/testFunctions.js
index 1b3d9dfb1..de5a63dd1 100644
--- a/test/testFunctions.js
+++ b/test/testFunctions.js
@@ -1946,7 +1946,7 @@ describe.only('Test JS', function () {
                 source:         `createState('test_formatTimeDiff', { type: 'string', role: 'json', read: true, write: false }, () => {\n` +
                                 `    const diff1 = formatTimeDiff(172800000 + 10800000 + 540000 + 15000, 'hh:mm:ss');\n` +
                                 `    const diff2 = formatTimeDiff((172800000 + 10800000 + 540000 + 15000) * -1, 'mm:ss');\n` +
-                                `    const diff3 = formatTimeDiff(374501000, 'DD \\Day\\s, h \\hour\\s, m \\minute, ss \\second\\s');\n` +
+                                `    const diff3 = formatTimeDiff(374501000, 'DD \\\\Day\\\\s, h \\\\hour\\s, m \\\\minute, ss \\\\second\\\\s');\n` +
                                 `    setState('test_formatTimeDiff', { val: JSON.stringify({ diff1, diff2, diff3 }), ack: true });\n` +
                                 `});`,
             },

From 387254a80b03a45d9ecf215f969ec06ab819cc4b Mon Sep 17 00:00:00 2001
From: Matthias Kleine <github.com9@emailu.de>
Date: Fri, 23 May 2025 10:45:39 +0200
Subject: [PATCH 3/3] Fixed integration test

---
 test/testFunctions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/testFunctions.js b/test/testFunctions.js
index de5a63dd1..738dec5b0 100644
--- a/test/testFunctions.js
+++ b/test/testFunctions.js
@@ -1946,7 +1946,7 @@ describe.only('Test JS', function () {
                 source:         `createState('test_formatTimeDiff', { type: 'string', role: 'json', read: true, write: false }, () => {\n` +
                                 `    const diff1 = formatTimeDiff(172800000 + 10800000 + 540000 + 15000, 'hh:mm:ss');\n` +
                                 `    const diff2 = formatTimeDiff((172800000 + 10800000 + 540000 + 15000) * -1, 'mm:ss');\n` +
-                                `    const diff3 = formatTimeDiff(374501000, 'DD \\\\Day\\\\s, h \\\\hour\\s, m \\\\minute, ss \\\\second\\\\s');\n` +
+                                `    const diff3 = formatTimeDiff(374501000, 'DD \\\\Day\\\\s, h \\\\hour\\\\s, m \\\\minute, ss \\\\second\\\\s');\n` +
                                 `    setState('test_formatTimeDiff', { val: JSON.stringify({ diff1, diff2, diff3 }), ack: true });\n` +
                                 `});`,
             },