@denevads/dnv-smo 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@denevads/dnv-smo",
-    "version": "1.0.21",
+    "version": "1.0.23",
     "description": "SMO module",
     "main": "./src/index.js",
     "types": "./src/index.d.ts",

package/src/smo.ts

@@ -49,7 +49,7 @@ export  class SMO  {
         if(window.objJS){
             // @ts-ignore
             window.sendToIframefromNet = (target, iframeID, objData) => {
-                console.log("sendToIframefromNet->",target);
+                console.log("sendToIframefromNet->",JSON.stringify(target));
                 switch (target) {
                     case "SMO.setDatasource":
                         this.events.setDatasource.next(objData)
@@ -58,44 +58,7 @@ export  class SMO  {
                          this.events.checkHealthPrinter.next(objData);
                          break;
                     }
-            // @ts-ignore
-            window.parent.postMessage = (target,objData,idSmo)=> {
-                switch (target.target) {
-                    case "Dnv.smoCallbacks.onSmoLoad":
-                        // @ts-ignore
-                        window.objJS.onSmoLoad();
-                        break;
 
-                    case "Dnv.smoCallbacks.printTextLine":
-                        // @ts-ignore
-                        window.objJS.printTextLine(objData.txt);
-                        break;
-                    case "Dnv.smoCallbacks.printBarcode":
-                        // @ts-ignore
-                        window.objJS.printBarcode(objData.code, objData.width, objData.height);
-                        break;
-                    case "Dnv.smoCallbacks.cutPaper":
-                        // @ts-ignore
-                        window.objJS.cutPaper(objData.percent);
-                        break;
-                    case "Dnv.smoCallbacks.printImage":
-                        // @ts-ignore
-                        window.objJS.printImage(idSmo, objData.image);
-                        break;
-                    case "Dnv.smoCallbacks.checkHealthPrinter":
-                        console.log('llamo a checkhealthprinter');
-                        // @ts-ignore
-
-                        window.objJS.checkHealthPrinter(idSmo);
-                        break;
-                    case "Dnv.smoCallbacks.checkHealth":
-                        // @ts-ignore
-                        window.objJS.checkHealth();
-                        break;
-
-
-                }
-            }
 
             }
 
@@ -315,7 +278,7 @@ class SmoEvents{
     public getRecursosRelleno: Subject<GetRecursosRelleno> = new Subject<GetRecursosRelleno>();
     public getVariableStorage: Subject<variable> = new Subject<variable>();
     public checkHealth: Subject<string> = new Subject<string>();
-    public checkHealthPrinter: Subject<String> = new Subject<String>();
+    public checkHealthPrinter: Subject<string> = new Subject<string>();
     constructor(smo:SMO){}
 }
 class smoCallBacks{
@@ -324,14 +287,14 @@ class smoCallBacks{
         this.smo =_smo;
      }
     public onSmoLoad():void {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.onSmoLoad",
             objData: undefined,
             idSmo: this.smo.id
         }, "*");
     }
     public onSmoReady():void {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.onSmoReady",
             objData: undefined,
             idSmo: this.smo.id
@@ -355,7 +318,7 @@ class smoCallBacks{
             console.error(msn);
         }
         if (window.parent != window) {
-            window.parent.postMessage({
+            this.smo.utils.sendToParent({
                 target: "Dnv.smoCallbacks.smoLog",
                 objData: {
                     level: level,
@@ -367,7 +330,7 @@ class smoCallBacks{
 
     }
     public smoAlarma(msn:string, level:AlarmaLevel):void {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.smoAlarma",
             objData: {
                 level: level,
@@ -377,7 +340,7 @@ class smoCallBacks{
         }, "*");
     }
     public smoLogStash(msn:string):void {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.smoLogStash",
             objData: {
                 txt: msn
@@ -386,7 +349,7 @@ class smoCallBacks{
         }, "*");
     }
     public smoLogNowShowing(msn:any):void {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.smoNowShowing",
             objData: msn,
             idSmo: this.smo.id
@@ -394,7 +357,7 @@ class smoCallBacks{
     }
     public reiniciarDispositivo(msn:string):void {
         //Permite reiniciar el player, proporcionando una razón para el reinicio. Solo Player HTML5
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.reiniciarDispositivo",
             objData: {
                 txt: msn // Razón del reinicio
@@ -404,7 +367,7 @@ class smoCallBacks{
     }
     urlNext():void {
         //Permite avanzar plantilla. Solo si Reloj Maestro activado.
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.urlNext",
             objData: undefined,
             idSmo: this.smo.id
@@ -412,7 +375,7 @@ class smoCallBacks{
     }
     exitInteractivity():void {
         //Para canales interactivos, vuelve al canal de reposo. Solo Android y Player PC.
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.exitInteractivity",
             objData: undefined,
             idSmo: this.smo.id
@@ -428,7 +391,7 @@ class smoCallBacks{
         /* NOT IMPLEMENTED */
     }
     setVariable(variable:string, valor:string) {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.setVariable",
             objData: {
                 variable: variable,
@@ -438,7 +401,7 @@ class smoCallBacks{
         }, "*");
     }
     getVariable(variable:string):void {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getVariable",
             objData: {
                 variable: variable
@@ -447,15 +410,16 @@ class smoCallBacks{
         }, "*");
         /* MIRAR SMO.getVariable */
     }
+
     getFile(file:string):void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getFile",
             objData: file,
             idSmo: this.smo.id
         }, "*");
     }
     setLocalData(variable:string, valor:string):void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.setLocalData",
             objData: {
                 nameData: variable,
@@ -465,7 +429,7 @@ class smoCallBacks{
         }, "*");
     }
     getLocalData(variable:string):void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getLocalData",
             objData: variable, // nameData
             idSmo: this.smo.id
@@ -473,8 +437,7 @@ class smoCallBacks{
         /* MIRAR SMO.setDatasource */
     }
     getCurrentStream():void {
-
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getCurrentStream",
             objData: undefined,
             idSmo: this.smo.id
@@ -482,21 +445,21 @@ class smoCallBacks{
         /* MIRAR SMO.setCurrentStream' */
     }
     finAviso(id:string):void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.finAviso",
             objData: id, // id del aviso
             idSmo: this.smo.id
         }, "*");
     }
     refreshDatasource(codigo:string):void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.refreshDatasource",
             objData: codigo, // Codigo del datasource
             idSmo: this.smo.id
         }, "*");
     }
     getLocation():void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getLocation",
             objData: undefined,
             idSmo: this.smo.id
@@ -504,7 +467,7 @@ class smoCallBacks{
         /* MIRAR SMO.infoCurrentLocation   */
     }
     getSalidaData(data:string):void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getSalidaData",
             objData: data, // Nombre del "data" que solicita. El player recibe ese string y hace un select case del mismo para devolver un json con datos al smo\html5 que le ha invocado.
             idSmo: this.smo.id
@@ -516,7 +479,7 @@ class smoCallBacks{
                 funcion: "", // Nombre de la función que se debe ejecutar
                 params: "" // Parámetros que debemos enviarle a la funcion. sin separadores ni nada, un string y se usa como tal. Solo esta implementada en un caso y se usa como tal sin parsear ni nada
             } */
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.ejecutaFuncion",
             objData: data,
             idSmo: this.smo.id
@@ -525,7 +488,7 @@ class smoCallBacks{
     addObserver(data:string):void {
         /*data ="fruta"
          */
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.addObserver",
             objData: data,
             idSmo: this.smo.id
@@ -536,7 +499,7 @@ class smoCallBacks{
                 destino: "fruta",
                 value: "{'fruta':'manzana', 'color':'roja'}"
             } */
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.notify",
             objData: data,
             idSmo: this.smo.id
@@ -544,24 +507,24 @@ class smoCallBacks{
         }, "*");
     }
     playOnceChannelByTrigger(trigger:string):void {
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.playOnceChannelByTrigger",
             objData: { triggerCanal: trigger },
             idSmo: this.smo.id
         }, "*");
     }
     stopPlayOnceChannelByTrigger():void {
-        parent.postMessage({ target: "Dnv.smoCallbacks.stopPlayOnceChannelByTrigger", objData: {}, idSmo: this.smo.id }, "*");
+        this.smo.utils.sendToParent({ target: "Dnv.smoCallbacks.stopPlayOnceChannelByTrigger", objData: {}, idSmo: this.smo.id }, "*");
     }
     playOnceChannel(codigoCanal:string):void {
-        parent.postMessage({ target: "Dnv.smoCallbacks.playOnceChannel", objData: { codigoCanal: codigoCanal, params: "PLAYONCE_CHANNEL|" + codigoCanal }, idSmo: this.smo.id }, "*");
+        this.smo.utils.sendToParent({ target: "Dnv.smoCallbacks.playOnceChannel", objData: { codigoCanal: codigoCanal, params: "PLAYONCE_CHANNEL|" + codigoCanal }, idSmo: this.smo.id }, "*");
     }
     stopPlayChannel():void {
-        parent.postMessage({ target: "Dnv.smoCallbacks.stopPlayOnceChannel", objData: {}, idSmo: this.smo.id }, "*");
+        this.smo.utils.sendToParent({ target: "Dnv.smoCallbacks.stopPlayOnceChannel", objData: {}, idSmo: this.smo.id }, "*");
     }
     editWrapperStyle(obj: any):void{
      /*{"posX": "0px","posY": "0px","alto": "0px","ancho": "0px","overflow": "hidden","scale": 0.1,"zindex": 0.1,"opacidad": 0.1,"isMaestro": true,duracionTransition: "1s", transitionTiming: "lineal", css: string} */
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.editWrapperStyle",
             objData: obj,
             idSmo: this.smo.id
@@ -569,7 +532,7 @@ class smoCallBacks{
     }
     getRecursosByCodigo(codigos: any):void{
         /** ["123456","654321"] */
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getRecursosByCodigo",
             objData: {
                 recursos : codigos
@@ -578,25 +541,25 @@ class smoCallBacks{
         }, "*");
     }
     getRecursos():void{
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getRecursos",
             idSmo: this.smo.id
         }, "*");
     }
     getRecursosDefault():void{
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getRecursosDefault",
             idSmo: this.smo.id
         }, "*");
     }
     getRecursosRelleno():void{
-        parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getRecursosRelleno",
             idSmo: this.smo.id
         }, "*");
     }
     setVariableStorage(variable:string, valor:string) {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.setVariableStorage",
             objData: {
                 variable: variable,
@@ -606,7 +569,7 @@ class smoCallBacks{
         }, "*");
     }
     getVariableStorage(variable:string):void {
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.getVariableStorage",
             objData: {
                 variable: variable
@@ -616,7 +579,7 @@ class smoCallBacks{
         /* MIRAR SMO.getVariable */
     }
     printTextLine(txt:string):void{
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.printTextLine",
             objData: {
                 txt: txt
@@ -625,7 +588,7 @@ class smoCallBacks{
         }, "*");
     }
     printBarcode(code:string, width:number, height:number):void{
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.printBarcode",
             objData: {
                 code: code,
@@ -636,7 +599,7 @@ class smoCallBacks{
         }, "*");
     }
     cutPaper(percent:number):void{
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.cutPaper",
             objData: {
                 percent: percent
@@ -645,19 +608,19 @@ class smoCallBacks{
         }, "*");
     }
     checkHealth(){
-        window.parent.postMessage({
-            target: "Dnv.smoCallbacks.checkHealth",
-            idSmo: this.smo.id
-        }, "*");
+       this.smo.utils.sendToParent({
+           target: "Dnv.smoCallbacks.checkHealth",
+           idSmo: this.smo.id
+       }, "*");
     }
     checkHealthPrinter(){
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.checkHealthPrinter",
             idSmo: this.smo.id
         }, "*");
     }
     printImage(image:string):void{
-        window.parent.postMessage({
+        this.smo.utils.sendToParent({
             target: "Dnv.smoCallbacks.printImage",
             objData: {
                 image: image
@@ -689,6 +652,88 @@ class Utils{
         let rejsn = JSON.stringify(js_obj, undefined, 2).replace(/(\\t|\\r|\\n)/g, '').replace(/"",[\n\t\r\s]+""[,]*/g, '').replace(/(\n[\t\s\r]*\n)/g, '').replace(/[\s\t]{2,}""[,]{0,1}/g, '').replace(/"[\s\t]{1,}"[,]{0,1}/g, '').replace(/\[[\t\s]*\]/g, '""');
         return (rejsn.indexOf('"parsererror": {') == -1) ? rejsn : 'Invalid XML format';
     }
+    sendToParent(obj:any,dest:string){
+        console.log('sendToParent->',JSON.stringify(obj));
+        //@ts-ignore
+        if(window.objJS){
+            switch (obj.target) {
+                case "Dnv.smoCallbacks.onSmoLoad":
+                    // @ts-ignore
+                    window.objJS.onSmoLoad();
+                    break;
+
+                case "Dnv.smoCallbacks.printTextLine":
+                    // @ts-ignore
+                    window.objJS.printTextLine(obj.txt);
+                    break;
+                case "Dnv.smoCallbacks.printBarcode":
+                    // @ts-ignore
+                    window.objJS.printBarcode(obj.code, obj.width, obj.height);
+                    break;
+                case "Dnv.smoCallbacks.cutPaper":
+                    // @ts-ignore
+                    window.objJS.cutPaper(obj.percent);
+                    break;
+                case "Dnv.smoCallbacks.printImage":
+                    // @ts-ignore
+                    window.objJS.printImage(obj.idSmo, obj.image);
+                    break;
+                case "Dnv.smoCallbacks.checkHealthPrinter":
+                    console.log('llamo a checkhealthprinter');
+                    // @ts-ignore
+                    window.objJS.checkHealthPrinter(obj.idSmo);
+                    break;
+                case "Dnv.smoCallbacks.checkHealth":
+                    // @ts-ignore
+                    window.objJS.checkHealth();
+                    break;
+                case "Dnv.smoCallbacks.getFile":
+                    // @ts-ignore
+                    window.objJS.getFile(dest,obj.objData);
+                    break;
+            }
+        return;
+        }
+        /* // @ts-ignore
+            window.parent.postMessage = (target,objData,idSmo)=> {
+                switch (target.target) {
+                    case "Dnv.smoCallbacks.onSmoLoad":
+                        // @ts-ignore
+                        window.objJS.onSmoLoad();
+                        break;
+
+                    case "Dnv.smoCallbacks.printTextLine":
+                        // @ts-ignore
+                        window.objJS.printTextLine(objData.txt);
+                        break;
+                    case "Dnv.smoCallbacks.printBarcode":
+                        // @ts-ignore
+                        window.objJS.printBarcode(objData.code, objData.width, objData.height);
+                        break;
+                    case "Dnv.smoCallbacks.cutPaper":
+                        // @ts-ignore
+                        window.objJS.cutPaper(objData.percent);
+                        break;
+                    case "Dnv.smoCallbacks.printImage":
+                        // @ts-ignore
+                        window.objJS.printImage(idSmo, objData.image);
+                        break;
+                    case "Dnv.smoCallbacks.checkHealthPrinter":
+                        console.log('llamo a checkhealthprinter');
+                        // @ts-ignore
+
+                        window.objJS.checkHealthPrinter(idSmo);
+                        break;
+                    case "Dnv.smoCallbacks.checkHealth":
+                        // @ts-ignore
+                        window.objJS.checkHealth();
+                        break;
+
+
+                }
+            }*/
+        window.parent.postMessage(obj, dest);
+    }
     setJsonObj(xml: any) {
         let js_obj = {} as any;
         if (xml.nodeType == 1) { // Element