@denevads/dnv-smo 1.1.1 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@denevads/dnv-smo",
-    "version": "1.1.1",
+    "version": "1.1.3",
     "description": "SMO module",
     "main": "./src/index.js",
     "types": "./src/index.d.ts",
@@ -15,7 +15,8 @@
     "author": "Xavier",
     "license": "MIT",
     "devDependencies": {
-        "@types/node": "^20.1.4"
+        "@types/node": "^20.1.4",
+        "typescript": "^6.0.3"
     },
     "dependencies": {
         "mitt": "^3.0.0",

package/src/interfaces/callbacks.ts

@@ -2,6 +2,12 @@
 export interface setDatasource{
     xml:string
 }
+export interface setBorradoAviso{
+    args:any
+}
+export interface setAviso{
+    args:any
+}
 export interface start{
     
 }

package/src/smo.ts

@@ -1,5 +1,7 @@
 import {
     setDatasource,
+    setAviso,
+    setBorradoAviso,
     variable,
     location,
     DataSalida,
@@ -32,6 +34,7 @@ export  class SMO  {
         this.utils = new Utils(this,this.smoCallBacks);
         this.events =new SmoEvents(this);
         this.init();
+        this.utils.writeVars();
     }
     public init():void{
         let match,
@@ -40,12 +43,10 @@ export  class SMO  {
             decode = function(s:string) {
                 return decodeURIComponent(s.replace(pl, " "));
             },
-            query = window.location.href.slice(window.location.href.indexOf("?") + 1);
-
+            query = window.location.search.substring(1);
         while (match = search.exec(query)) {
             this.vars[decode(match[1])] = decode(match[2]);
         }
-        
         //console.log("vars->",JSON.stringify(this.vars));
         // @ts-ignore
         //console.log( "resultados " +window.objJS != undefined  + "  " + window !== window.parent  + "  " + this.vars.ontop != undefined  + "  " + this.vars.ontop != "");
@@ -57,6 +58,12 @@ export  class SMO  {
             window.sendToIframefromNet = (target, iframeID, objData) => {
                 console.log("sendToIframefromNet->",JSON.stringify(target));
                 switch (target) {
+                    case "SMO.setAvisos":
+                        this.events.setAvisos.next(objData)
+                        break;
+                    case "SMO.setBorradoAviso":
+                        this.events.setBorradoAviso.next(objData)
+                        break;
                     case "SMO.setDatasource":
                         this.events.setDatasource.next(objData)
                         break;
@@ -78,6 +85,8 @@ export  class SMO  {
                 // @ts-ignore
                 FinAviso:  window.objJS.finAviso,
                 // @ts-ignore
+                SetEstadoAviso:  window.objJS.setEstadoAviso,
+                // @ts-ignore
                 ExitInteractivity: window.objJS.exitInteractivity,
                 // @ts-ignore
                 LogWeb: window.objJS.logWeb,
@@ -189,23 +198,34 @@ export  class SMO  {
                     selft.setDatasource(e.data.objData);
                     return;
                 }
+                /* METODOS DE AVISOS */ 
+                if(func == SMO_EVENT_TYPE.setAvisoArgs || func == SMO_EVENT_TYPE.setAvisoDuracionArgs || func == SMO_EVENT_TYPE.setAvisoLogotipoArgs){
+                    selft.setAvisos(e.data.objData);
+                    return;
+                }
+                if(func == SMO_EVENT_TYPE.setBorradoAviso){
+                    selft.setBorradoAviso(e.data.objData);
+                    return;
+                }
+                /* ----------------------------------- */
+
                 if(func == SMO_EVENT_TYPE.getVariable){
                     selft.getVariable(e.data.objData);
                     return;
                 }
-                if(func ==SMO_EVENT_TYPE.setCurrentStream){
+                if(func == SMO_EVENT_TYPE.setCurrentStream){
                    selft.setCurrentStream(e.data.objData);
                    return;
                 }
-                if(func==SMO_EVENT_TYPE.infoCurrentLocation){
+                if(func == SMO_EVENT_TYPE.infoCurrentLocation){
                     selft.infoCurrentLocation(e.data.objData);
                     return;
                 }
-                if(func==SMO_EVENT_TYPE.setSalidaData){
+                if(func == SMO_EVENT_TYPE.setSalidaData){
                     selft.setSalidaData(e.data.objData);
                     return;
                 }
-                if(func ==SMO_EVENT_TYPE.updatefromsalida){
+                if(func == SMO_EVENT_TYPE.updatefromsalida){
                     selft.updatefromsalida(e.data.objData);
                     return;
                 }
@@ -267,6 +287,12 @@ export  class SMO  {
         this.events.setDatasource.next(datasource);
         this.events.setDatasourceJson.next(this.utils.xmlToJSON(datasource.xml));
     }
+    setAvisos(aviso:setAviso):void {
+        this.events.setAvisos.next(aviso);
+    }
+    setBorradoAviso(aviso:setBorradoAviso):void {
+        this.events.setBorradoAviso.next(aviso);
+    }
     getVariable(variable:variable):void{
         this.events.getVariable.next(variable);
     }
@@ -322,6 +348,8 @@ class SmoEvents{
     public start: Subject<start> = new Subject<start>();
     public dispose: Subject<start> = new Subject<dispose>();
     public setDatasource: Subject<setDatasource> = new Subject<setDatasource>();
+    public setAvisos: Subject<setAviso> = new Subject<setAviso>();
+    public setBorradoAviso: Subject<setBorradoAviso> = new Subject<setBorradoAviso>();
     public setDatasourceJson: Subject<any> = new Subject<any>();
     public getVariable: Subject<variable> = new Subject<variable>();
     public setCurrentStream: Subject<string> = new Subject<string>();
@@ -374,7 +402,7 @@ class smoCallBacks{
         if (level == LogLevel.Warning) {
             console.warn(msn);
         }
-        if (level == LogLevel.Error) {
+        if (level == LogLevel.Error || level == LogLevel.Fatal) {
             console.error(msn);
         }
         if (window.parent != window) {
@@ -511,6 +539,13 @@ class smoCallBacks{
             idSmo: this.smo.id
         }, this.smo.vars.idSmo);
     }
+    setEstadoAviso(params:string):void {
+        this.smo.utils.sendToParent({
+            target: "Dnv.smoCallbacks.setEstadoAviso",
+            objData: params, // id del aviso
+            idSmo: this.smo.id
+        }, this.smo.vars.idSmo);
+    }
     refreshDatasource(codigo:string):void {
         this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.refreshDatasource",
@@ -751,6 +786,15 @@ class Utils{
     this.smo = _smo;
     this.smoCallBacks =_smoCallBacks;
     }
+
+    writeVars(): void {
+        let out = "";
+        for (const k in this.smo.vars) {
+            if (this.smo.vars.hasOwnProperty(k)) out += k + "=" + this.smo.vars[k] + "&";
+        }
+        if (out) this.smoCallBacks.smoLog(out, LogLevel.Debug);
+    }
+
     // Funciones para XML to JSON
     xmlToJSON(xml:string) {
         let getxml = new DOMParser();
@@ -919,6 +963,10 @@ export enum SMO_EVENT_TYPE{
     start = "start",
     dispose = "dispose",
     setDatasource = "setDatasource",
+    setAvisoArgs = "setAvisoArgs",
+    setAvisoLogotipoArgs = "setAvisoLogotipoArgs",
+    setAvisoDuracionArgs = "setAvisoDuracionArgs",
+    setBorradoAviso = "setBorradoAviso",
     getVariable = "getVariable",
     setCurrentStream = "setCurrentStream",
     infoCurrentLocation = "infoCurrentLocation",
@@ -941,7 +989,8 @@ export enum LogLevel {
     Debug= 0,
     Info= 1,
     Warning= 2,
-    Error= 3
+    Error= 3,
+    Fatal= 4
 }
 export enum AlarmaLevel {
 Ok_off= 0,
@@ -957,6 +1006,7 @@ export interface ObjJSType {
     logFlash: () => void;
     pageInit: () => void;
     finAviso: () => void;
+    setEstadoAviso: () => void;
     exitInteractivity: () => void;
     logWeb: () => void;
     refreshPage: () => void;

package/tsconfig.json

@@ -12,6 +12,7 @@
     "declaration": true,
     /* Language and Environment */
     "target": "es5",                                     /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "ignoreDeprecations": "6.0",
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for TC39 stage 2 draft decorators. */
@@ -25,7 +26,7 @@
    
     /* Modules */
     "module": "commonjs",                                /* Specify what module code is generated. */
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    "rootDir": "./src",                                   /* Specify the root folder within your source files. */
     // "moduleResolution": "node",                       /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */

package/.idea/denevads_dnv-smo.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/denevads_dnv-smo.iml" filepath="$PROJECT_DIR$/.idea/denevads_dnv-smo.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>