fix: script with last line commented #1447

frangoteam · Nov 10, 2024 · e4d2bcc · e4d2bcc
1 parent 5b2aedb
commit e4d2bcc
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/client/dist/index.html b/client/dist/index.html
@@ -45,6 +45,6 @@
             </div>
         </div>
     </app-root>
-<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.985153ed84327cf6.js" type="module"></script>
+<script src="runtime.8ef63094e52a66ba.js" type="module"></script><script src="polyfills.df504f67f09f2fbb.js" type="module"></script><script src="scripts.a58f5e48421f8dfe.js" defer></script><script src="main.83185fc62bdb31b8.js" type="module"></script>
 
 </body></html>
diff --git a/client/dist/main.985153ed84327cf6.js → client/dist/main.83185fc62bdb31b8.js b/client/dist/main.985153ed84327cf6.js → client/dist/main.83185fc62bdb31b8.js
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa",
-  "version": "1.2.1-2019",
+  "version": "1.2.1-2020",
   "keywords": [],
   "author": "frangoteam <[email protected]>",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",

diff --git a/client/src/app/_services/script.service.ts b/client/src/app/_services/script.service.ts
@@ -27,7 +27,7 @@ export class ScriptService {
 
     runScript(script: Script) {
         return new Observable((observer) => {
-            if (!script.mode || script.mode == ScriptMode.SERVER) {
+            if (!script.mode || script.mode === ScriptMode.SERVER) {
                 if (environment.serverEnabled) {
                     let header = new HttpHeaders({ 'Content-Type': 'application/json' });
                     let params = { script: script };
@@ -55,7 +55,7 @@ export class ScriptService {
                 });
                 try {
                     const code = `${parameterToAdd}${script.code}`;
-                    const asyncScript = `(async () => { ${this.addSysFunctions(code)} })();`;
+                    const asyncScript = `(async () => { ${this.addSysFunctions(code)} \n})();`;
                     const result = eval(asyncScript);
                     observer.next(result);
                 } catch (err) {
@@ -72,7 +72,7 @@ export class ScriptService {
             console.warn('TODO: Script with mode CLIENT not work with parameters.');
         }
         try {
-            const asyncScript = `(async () => { ${this.addSysFunctions(script.code)} })();`;
+            const asyncScript = `(async () => { ${this.addSysFunctions(script.code)} \n})();`;
             eval(asyncScript);
         } catch (err) {
             console.error(err);

diff --git a/client/src/app/home/home.component.ts b/client/src/app/home/home.component.ts
@@ -188,7 +188,7 @@ export class HomeComponent implements OnInit, AfterViewInit, OnDestroy {
     private initScheduledScripts() {
         this.intervalsScript.clearIntervals();
         this.projectService.getScripts()?.forEach((script: Script) => {
-            if (script.mode == ScriptMode.CLIENT && script.scheduling?.interval > 0) {
+            if (script.mode === ScriptMode.CLIENT && script.scheduling?.interval > 0) {
                 this.intervalsScript.addInterval(
                     script.scheduling.interval * 1000,
                     this.scriptService.evalScript,

diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fuxa-server",
-  "version": "1.2.1-2019",
+  "version": "1.2.1-2020",
   "description": "Web-based Process Visualization (SCADA/HMI/Dashboard) software",
   "main": "main.js",
   "scripts": {

diff --git a/server/runtime/scripts/msm.js b/server/runtime/scripts/msm.js
@@ -56,7 +56,7 @@ function MyScriptsModule(_events, _logger) {
     }
 
     this.runScript = function (_script) {
-        if (scriptsModule) {            
+        if (scriptsModule) {
             var paramsValue = _script.parameters.map(p => utils.isNullOrUndefined(p.value) ? p : p.value);
             if (!_script.name) {
                 _script = Object.values(scriptsMap).find(s => s.id === _script.id);
@@ -105,7 +105,7 @@ function MyScriptsModule(_events, _logger) {
                             if (params.length) params += ',';
                             params += `${script.parameters[i].name}`;
                         }
-                        functions += `async function ${script.name} (${params}) { try { ${script.code} } catch (fuxaError) { console.log(fuxaError); return JSON.stringify(fuxaError); } }`;
+                        functions += `async function ${script.name} (${params}) { try { ${script.code} \n} catch (fuxaError) { console.log(fuxaError); return JSON.stringify(fuxaError); } }`;
                         toexport += `${script.name}: ${script.name}, `;
                         result.scriptsMap[script.name] = script;
                     } else {