From 2e2af3e16916fc310c81fbafbf99a17d80ba8060 Mon Sep 17 00:00:00 2001 From: Exequiel Aramburu Date: Sun, 27 Sep 2026 20:04:22 -0300 Subject: [PATCH] Cambios --- build/Deb64/DEBIAN/postinst | 37 + build/Deb64/DEBIAN/postrm | 4 + build/Deb64/DEBIAN/preinst | 55 ++ build/Deb64/etc/emalibre_modo | 1 + build/Deb64/etc/init.d/emalibre | 207 ++++++ .../etc/udev/rules.d/99-emalibreusb.rules | 3 + .../usr/share/applications/emalibre.desktop | 18 + build/Deb64/usr/share/doc/emaLibre/AUTHORS | 24 + build/Deb64/usr/share/doc/emaLibre/COPYING | 674 ++++++++++++++++++ build/Deb64/usr/share/doc/emaLibre/README | 0 build/Deb64/usr/share/menu/emalibre | 4 + build/conf/ConfiguracionGeneral.js | 31 + build/controlDeb/control_arm_gui | 15 + build/controlDeb/control_arm_web | 17 + build/controlDeb/control_linux_gui | 15 + build/controlDeb/control_linux_web | 15 + generarDeb64.sh | 473 ++++++------ generarDebArm.sh | 8 +- src/CHANGELOG | 7 +- src/core/ema.js | 5 +- src/core/reporte.js | 2 +- src/gui_common/controlador/admingui.js | 20 +- src/gui_web/controlador/funcionesgenerales.js | 32 +- src/gui_web/express.js | 48 +- src/logs/debug.log | 283 ++++++++ src/package.json | 1 - 26 files changed, 1721 insertions(+), 278 deletions(-) create mode 100755 build/Deb64/DEBIAN/postinst create mode 100755 build/Deb64/DEBIAN/postrm create mode 100755 build/Deb64/DEBIAN/preinst create mode 100755 build/Deb64/etc/emalibre_modo create mode 100755 build/Deb64/etc/init.d/emalibre create mode 100755 build/Deb64/etc/udev/rules.d/99-emalibreusb.rules create mode 100755 build/Deb64/usr/share/applications/emalibre.desktop create mode 100755 build/Deb64/usr/share/doc/emaLibre/AUTHORS create mode 100755 build/Deb64/usr/share/doc/emaLibre/COPYING create mode 100755 build/Deb64/usr/share/doc/emaLibre/README create mode 100755 build/Deb64/usr/share/menu/emalibre create mode 100755 build/conf/ConfiguracionGeneral.js create mode 100644 build/controlDeb/control_arm_gui create mode 100644 build/controlDeb/control_arm_web create mode 100644 build/controlDeb/control_linux_gui create mode 100644 build/controlDeb/control_linux_web diff --git a/build/Deb64/DEBIAN/postinst b/build/Deb64/DEBIAN/postinst new file mode 100755 index 0000000..3dd2bed --- /dev/null +++ b/build/Deb64/DEBIAN/postinst @@ -0,0 +1,37 @@ +#!/bin/sh +# postinst script for EmaLibre +set -e +printf "\033[1;4m3) Se aplican los permisos necesarios.\033[0m" +chmod -R 777 /usr/share/emalibre +chmod a-x /usr/share/menu/emalibre +chmod 777 /usr/share/applications/emalibre.desktop +printf "\033[1;32m --> OK. \033[0m\n" +printf "\033[1;4m4) Se actualizan los menus del sistema.\033[0m" +if [ "$1" = "configure" ] && [ -x /usr/bin/update-menus ]; then update-menus ; fi +printf "\033[1;32m --> OK. \033[0m\n" +printf "\033[1;4m5) Se actualizan las reglas de udev..\033[0m" +udevadm control --reload-rules +printf "\033[1;32m --> OK. \033[0m\n" +if [ -f "/tmp/ConfiguracionGeneral.js" ]; then + printf "\033[1;4m6) Se restaura el archivo de configuracion.\033[0m" + if [ -d "/usr/share/emalibre/conf/" ]; then + mv -f /tmp/ConfiguracionGeneral.js /usr/share/emalibre/conf/ + chmod 777 /usr/share/emalibre/conf/ConfiguracionGeneral.js || true + printf "\033[1;32m --> OK. \033[0m\n" + elif [ -d "/usr/share/emalibre/package.nw/conf/" ]; then + mv -f /tmp/ConfiguracionGeneral.js /usr/share/emalibre/package.nw/conf/ + chmod 777 /usr/share/emalibre/package.nw/conf/ConfiguracionGeneral.js || true + printf "\033[1;32m --> OK. \033[0m\n" + else + echo "" + echo "IMPORTANTE: No se encontró directorio de configuración. Por favor configurelo antes de comenzar: " + printf "\033[1;36m --> /usr/share/emalibre/conf/ConfiguracionGeneral.js. \033[0m\n" + echo "" + fi +else + echo "" + echo "IMPORTANTE: Archivo de configuracion por defecto. Por favor configurelo antes de comenzar: " + printf "\033[1;36m --> /usr/share/emalibre/conf/ConfiguracionGeneral.js. \033[0m\n" + echo "" +fi +exit 0 diff --git a/build/Deb64/DEBIAN/postrm b/build/Deb64/DEBIAN/postrm new file mode 100755 index 0000000..a2b4290 --- /dev/null +++ b/build/Deb64/DEBIAN/postrm @@ -0,0 +1,4 @@ +#!/bin/sh +set -e +echo "Se actualiza los menus y reglas de control..." +if [ "$1" = "configure" ] && [ -x /usr/bin/update-menus ]; then update-menus ; fi diff --git a/build/Deb64/DEBIAN/preinst b/build/Deb64/DEBIAN/preinst new file mode 100755 index 0000000..8ebc98a --- /dev/null +++ b/build/Deb64/DEBIAN/preinst @@ -0,0 +1,55 @@ +#!/bin/sh +# preinstalador script for Emalibre +# resumen de los parametros de este script: +# * `install' +# * `install' +# * `upgrade' +# * `abort-upgrade' +set -e +pidFile="/var/run/emalibre.pid" +pidMonitorFile="/var/run/monitor_emalibre.pid" +echo "" +printf "\033[1;35m***************************************************************\n" +printf "Gracias por instalar EMA Libre Cliente (Carpincho)!!.\n" +printf '***************************************************************\033[0m\n' +echo "" +printf "\033[1;4m1) Comenzamos por verificar si ya existe configuracion personal...\033[0m\n" +case "$1" in + install|upgrade) + + printf "\033[1;10m * 1.0) Se verifica y detiene si existe EMA Libre corriendo.\033[0m" + # 0. Se detiene emalibre si existe instancia corriendo. + if [ -f $pidFile ]; then + rm -f /var/run/emalibre.pid + rm -f /var/run/emalibre.log + fi + if [ -f $pidMonitorFile ]; then + rm -f /var/run/monitor_emalibre.pid + rm -f /var/run/monitor_emalibre.log + fi + printf "\033[1;32m --> OK. \033[0m\n" + # 1. Se consulta si existe el archivo de configuracion + if [ -f "/usr/share/emalibre/conf/ConfiguracionGeneral.js" ]; then + printf "\033[1;10m * 1.1) Existe un archivo de configuración en conf/, se realiza backup.\033[0m" + cp -f /usr/share/emalibre/conf/ConfiguracionGeneral.js /tmp || true + printf "\033[1;32m --> OK. \033[0m\n" + elif [ -f "/usr/share/emalibre/package.nw/conf/ConfiguracionGeneral.js" ]; then + printf "\033[1;10m * 1.1) Existe un archivo de configuración en package.nw/conf/, se realiza backup.\033[0m" + cp -f /usr/share/emalibre/package.nw/conf/ConfiguracionGeneral.js /tmp || true + printf "\033[1;32m --> OK. \033[0m\n" + else + printf "\033[1;10m * 1.1) Es una instalación nueva, no existe archivo de configuración.\033[0m" + printf "\033[1;32m --> OK. \033[0m\n" + fi + printf "\033[1;4m2) Comienza la instalación:\033[0m\n" + ;; + abort-upgrade) + printf "\033[1;31m Opps... ocurrio un error!!. \033[0m\n" + ;; + + *) + printf "\033[1;31mOpps. preinst llamado con un argumento desconocido \`$1' \033[0m\n" >&2 + exit 1 + ;; +esac +exit 0 diff --git a/build/Deb64/etc/emalibre_modo b/build/Deb64/etc/emalibre_modo new file mode 100755 index 0000000..c077218 --- /dev/null +++ b/build/Deb64/etc/emalibre_modo @@ -0,0 +1 @@ +web diff --git a/build/Deb64/etc/init.d/emalibre b/build/Deb64/etc/init.d/emalibre new file mode 100755 index 0000000..0809888 --- /dev/null +++ b/build/Deb64/etc/init.d/emalibre @@ -0,0 +1,207 @@ +#!/bin/bash +### BEGIN INIT INFO +# Provides: EMA Libre Carpincho +# Required-Start: $syslog +# Required-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: EMA Libre Carpincho demonio +# Description: Start/stop/Restart EMA Libre Carpincho +### END INIT INFO + +### CONFIG ZONE +# Get function from functions library +#set -e +. /lib/lsb/init-functions + +RETVAL=0 + +# Nombre del servicio. +serviceName="emalibre" + +# Ubicacion de la APP +appFilePath="/usr/share/emalibre" + +# Archivo de Inicio. +web="gui_web/express.js" + +### END CONFIG ZONE + +# Ubicacion de logs y del pid. +pidFile="/var/run/$serviceName.pid" +logFile="/var/run/$serviceName.log" + +# Ubicacion de node como modulo de carpincho. +nodemodule="$appFilePath/node_modules/node/bin" + +# Ubicacion de forever como modulo de carpincho. +foreverApp="$appFilePath/node_modules/forever/bin/forever" + +# Ubicacion de logs de EMA Libre +emaLogs="$appFilePath/logs/debug.log" + +export PATH=$PATH:$nodemodule + +start() { + if [ ! -f /etc/emalibre_modo ] + then + `echo "web" > /etc/emalibre_modo` + fi + MODO=`cat /etc/emalibre_modo` + if [ -f $pidFile ]; then + log_daemon_msg "EMA libre Carpincho se encuentra corriendo." + RETVAL=$? + else + if [ $MODO = 'web' ] + then + log_daemon_msg "Comenzando EMA Libre Carpincho en modo web" + echo "$(date '+%d/%m/%Y %H:%M:%S') - 0|SERVICIO|Inicio el servicio en modo web." >> $emaLogs + $foreverApp start --uid "EMA_Web" --id "EMA_Web" --minUptime 5000 --spinSleepTime 5000 --sourceDir $appFilePath --workingDir $appFilePath --pidFile $pidFile -l $logFile -a -d -c node "$web" iniciar + RETVAL=$? + fi + fi + RETVAL=$? +} + +restart() { + log_daemon_msg "Reiniciando EMA Libre Carpincho" + echo "$(date '+%d/%m/%Y %H:%M:%S') - 0|SERVICIO|Reiniciando el servicio." >> $emaLogs + $foreverApp restart $nodemodule + RETVAL=$? +} + +stop() { + if [ -f $pidFile ]; then + log_daemon_msg "Deteniendo EMA Libre Carpincho." + echo "$(date '+%d/%m/%Y %H:%M:%S') - 0|SERVICIO|Detenido el servicio." >> $emaLogs + $foreverApp stopall + RETVAL=$? + else + log_daemon_msg "EMA libre Carpincho no se encuentra ejecutandose." + fi + RETVAL=$? +} + + +status() { + log_daemon_msg "Mostrando estado nativo del servicio." + RETVAL=$? +} + + +uptime() { + echo "$(date '+%d/%m/%Y %H:%M:%S') - 0|SERVICIO|Mostrando el uptime del servicio (consola)." >> $emaLogs + $foreverApp list + RETVAL=$? +} + +reporte() { + echo "$(date '+%d/%m/%Y %H:%M:%S') - 0|SERVICIO|Mostrando el reporte de consola." >> $emaLogs + pushd "$appFilePath" + "$nodemodule/node" core/reporte.js + RETVAL=$? +} + +if [ -d /usr/share/emalibre/gui_web ] +then + # SI EXISTE EL MODULO GUI_WEB se habilitan algunas opciones + case "$1" in + start) + start + + ;; + stop) + stop + + ;; + status) + status + + ;; + restart) + restart + + ;; + reporte) + reporte + + ;; + uptime) + uptime + + ;; + set-inicio-enabled) + log_daemon_msg "Se Habilito el servicio para inicio automatico." + systemctl enable emalibre + "$nodemodule/node" -e " + const fs = require('fs'); + const cfgPath = '/usr/share/emalibre/conf/ConfiguracionGeneral.js'; + const cfg = require(cfgPath); + cfg.ConfGeneral.inicio_automatico = true; + fs.writeFileSync( + cfgPath, + 'module.exports = ' + JSON.stringify(cfg, null, 2) + ';\n' + ); + " + + ;; + set-inicio-disable) + log_daemon_msg "Se Deshabilito el inicio automatico del servicio." + systemctl disable emalibre + "$nodemodule/node" -e " + const fs = require('fs'); + const cfgPath = '/usr/share/emalibre/conf/ConfiguracionGeneral.js'; + const cfg = require(cfgPath); + cfg.ConfGeneral.inicio_automatico = false; + fs.writeFileSync( + cfgPath, + 'module.exports = ' + JSON.stringify(cfg, null, 2) + ';\n' + ); + " + ;; + view-conf) + log_daemon_msg "Configuración de EMA Libre Carpincho" + log_daemon_msg "-------------------------------------" + CFG=/usr/share/emalibre/conf/ConfiguracionGeneral.js + if [ -f /etc/emalibre_modo ] + then + log_daemon_msg "Modo actual: `cat /etc/emalibre_modo` " + else + `echo "consola" > /etc/emalibre_modo` + log_daemon_msg "Modo actual: `cat /etc/emalibre_modo` " + fi + log_daemon_msg "Inicio Automatico (servicio): `systemctl is-enabled emalibre 2> echo`" + log_daemon_msg "" + log_daemon_msg "----------------------" + log_daemon_msg "Configuracion Global:" + log_daemon_msg "->`grep "Version" /usr/share/emalibre/conf/ConfiguracionGlobal.js`" + log_daemon_msg "->`grep "Nombre" /usr/share/emalibre/conf/ConfiguracionGlobal.js`" + log_daemon_msg "----------------------" + log_daemon_msg "Configuracion General:" + log_daemon_msg "" + CFG=/usr/share/emalibre/conf/ConfiguracionGeneral.js + log_daemon_msg "-> Tiempo de Recolección: $(sed -nE 's/^[[:space:]]*"Tiempo_de_Recoleccion"[[:space:]]*:[[:space:]]*([0-9]+),?/\1/p' $CFG)" + log_daemon_msg "-> UTC: $(sed -nE 's/^[[:space:]]*"UTC"[[:space:]]*:[[:space:]]*(-?[0-9]+),?/\1/p' $CFG)" + log_daemon_msg "-> Sistema Métrico: $(sed -nE 's/^[[:space:]]*"SistemaMetrico"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + log_daemon_msg "-> Nivel Debug: $(sed -nE 's/^[[:space:]]*"debug"[[:space:]]*:[[:space:]]*([0-9]+),?/\1/p' $CFG)" + log_daemon_msg "-> Tamaño Debug: $(sed -nE 's/^[[:space:]]*"debugTamanio"[[:space:]]*:[[:space:]]*([0-9]+),?/\1/p' $CFG)" + log_daemon_msg "-> Nombre Estación: $(sed -nE 's/^[[:space:]]*"NombreEstacion"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + log_daemon_msg "-> Modo: $(sed -nE 's/^[[:space:]]*"Modo"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + log_daemon_msg "-> Llave R: $(sed -nE 's/^[[:space:]]*"Llave_R"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + log_daemon_msg "-> Inicio automático: $(sed -nE 's/^[[:space:]]*"inicio_automatico"[[:space:]]*:[[:space:]]*(true|false),?/\1/p' $CFG)" + log_daemon_msg "-> Audio: $(sed -nE 's/^[[:space:]]*"Audio"[[:space:]]*:[[:space:]]*(true|false),?/\1/p' $CFG)" + log_daemon_msg "-> Notificar cambios: $(sed -nE 's/^[[:space:]]*"notificar_cambios"[[:space:]]*:[[:space:]]*(true|false),?/\1/p' $CFG)" + log_daemon_msg "-> Audio Voces: $(sed -nE 's/^[[:space:]]*"audioVoces"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + log_daemon_msg "-> IP: $(sed -nE 's/^[[:space:]]*"IP"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + log_daemon_msg "-> Puerto: $(sed -nE 's/^[[:space:]]*"Puerto"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + log_daemon_msg "-> Ruta: $(sed -nE 's/^[[:space:]]*"Ruta"[[:space:]]*:[[:space:]]*"([^"]+)",?/\1/p' $CFG)" + ;; + *) + echo "Utilice: {start|stop|status|restart|set-inicio-enabled|set-inicio-disable|view-conf|reporte|uptime}" + exit 1 + + ;; + esac +fi + +exit $RETVAL diff --git a/build/Deb64/etc/udev/rules.d/99-emalibreusb.rules b/build/Deb64/etc/udev/rules.d/99-emalibreusb.rules new file mode 100755 index 0000000..8e9b268 --- /dev/null +++ b/build/Deb64/etc/udev/rules.d/99-emalibreusb.rules @@ -0,0 +1,3 @@ +SUBSYSTEM=="input", GROUP="input", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1941", ATTRS{idProduct}=="8021", MODE:="666", GROUP="plugdev" +KERNEL=="hidraw*", ATTRS{idVendor}=="1941", ATTRS{idProduct}=="8021", MODE="0666", GROUP="plugdev" \ No newline at end of file diff --git a/build/Deb64/usr/share/applications/emalibre.desktop b/build/Deb64/usr/share/applications/emalibre.desktop new file mode 100755 index 0000000..91b42bb --- /dev/null +++ b/build/Deb64/usr/share/applications/emalibre.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Type=Application +Terminal=false +Exec=emalibre --user-data-dir=/tmp/emalibre/cache_temporal +Name=EMA Libre +GenericName=EMA Libre +Comment=Estación Meteorológica Automática Libre +Categories=Utility; +Icon=/usr/share/emalibre/gui_common/iconos/icono_app.png +Actions=RootWindow;Window + +[Desktop Action Window] +Name=EmaLibre +Exec=emalibre --user-data-dir=/tmp/emalibre/cache_temporal + +[Desktop Action RootWindow] +Name=emalibre +Exec=gnome-terminal -e "bash -c 'sudo -i emalibre --user-data-dir=/tmp/emalibre/cache_temporal;'" \ No newline at end of file diff --git a/build/Deb64/usr/share/doc/emaLibre/AUTHORS b/build/Deb64/usr/share/doc/emaLibre/AUTHORS new file mode 100755 index 0000000..125ec8b --- /dev/null +++ b/build/Deb64/usr/share/doc/emaLibre/AUTHORS @@ -0,0 +1,24 @@ +EMA Libre Cliente nace en el 2018 de la formulación de un proyecto de Investigación +denominado proyecto EMA Libre, este software es parte de un conjunto de tres sistema: +EMA Libre Cliente (Capincho), EMA Libre Center (Capibara) y EMA Liber Visor (Ronsoco). + +Desarrollado por el Laboratorio de Investigación Gugler perteneciente a la Facultad +de Ciencia y Tecnología de la Universidad Autónoma de Entre Ríos. A continuación +se detalla la lista de colaboradores y desarrolladores: + + Exequiel Aramburu . + Mario Martin Sbarbaro . + José Luis Mengarelli . + Federico Bonnet . + Alexis Sostersich . + Marcos Elias Rios Nuñez . + +Se agradece a la Facultad de Ciencia y Tecnología de la Universidad Autónoma de Entre Ríos +por permitir la conformación de este equipo interdisciplinario de profesionales y alumnos +colaboradores. Para llevar acabo una investigación de esta magnitud, permitiendo mostrar +las cualidades y bondades del Software Libre. + +Finalmente, no se solicito declaración de renuncia de copyright a la facultad, ya que por Medio +de la Resolución CS Nº 063/18, el Consejo Directivo de la Facultad de Ciencia y Tecnología +de la Universidad Autónoma de Entre Ríos, aprueba el proyecto Investigación, el cual especifica +que el software utilizara una licencia libre. diff --git a/build/Deb64/usr/share/doc/emaLibre/COPYING b/build/Deb64/usr/share/doc/emaLibre/COPYING new file mode 100755 index 0000000..f288702 --- /dev/null +++ b/build/Deb64/usr/share/doc/emaLibre/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/build/Deb64/usr/share/doc/emaLibre/README b/build/Deb64/usr/share/doc/emaLibre/README new file mode 100755 index 0000000..e69de29 diff --git a/build/Deb64/usr/share/menu/emalibre b/build/Deb64/usr/share/menu/emalibre new file mode 100755 index 0000000..ecb110d --- /dev/null +++ b/build/Deb64/usr/share/menu/emalibre @@ -0,0 +1,4 @@ +?package(emalibre):needs="X11" section="Applications" \ +title="emalibre" command="emalibre --user-data-dir=/tmp/emalibre/cache_temporal" \ +description="Estación Meteorológica Automática Libre" \ +icon="/usr/share/emalibre/gui_common/iconos/icono_app.png" diff --git a/build/conf/ConfiguracionGeneral.js b/build/conf/ConfiguracionGeneral.js new file mode 100755 index 0000000..8afda72 --- /dev/null +++ b/build/conf/ConfiguracionGeneral.js @@ -0,0 +1,31 @@ +// Configuraciones generales de EMA RECOLECTOR + +module.exports = { + "ConfGeneral": { + "Tiempo_de_Recoleccion": 60, + "UTC": -3, + "SistemaMetrico": "SI", + "debug": 3, + "debugTamanio": 10, + "NombreEstacion": "-", + "Modo": "Recolector", + "Llave_R": "e5303ab3-2a8b-4d42-90ab-1c8367d8521d", + "inicio_automatico": false, + "Audio": false, + "notificar_cambios": false, + "audioVoces": "Spanish_(Latin_America) espeak-ng", + "IP": "", + "Puerto": "", + "Ruta": "" + }, + "ConfEmail": { + "ActivarCorreos": false, + "ReceptorEmail": "", + "Servicio": "Deshabilitado", + "Usuario": "", + "Password": "", + "Server": "", + "Puerto": "" + }, + "ConfPublicador": [] +}; diff --git a/build/controlDeb/control_arm_gui b/build/controlDeb/control_arm_gui new file mode 100644 index 0000000..002f9f5 --- /dev/null +++ b/build/controlDeb/control_arm_gui @@ -0,0 +1,15 @@ +Package: emalibre-gui +Architecture: armhf +Version: 1.36 +Priority: optional +Section: application +Maintainer: Laboratorio de Investigacion Gugler +Homepage: https://ema.gugler.com.ar +Depends: +Conflicts: emalibre-web +Description: EMA Libre Cliente (Carpincho) - Software Libre en modo GUI (desktop) para Estaciones Meteorológica Automáticas. + EMA Libre es Libre y Gratuito desarrollado por el Laboratorio de Investigación Gugler + perteneciente a la Facultad de Ciencia y Tecnología de la Universidad + Autónoma de Entre Ríos, con el objetivo de recolectar, registrar y publicar + información meteorológica a través de los diferentes sensores de una estación USB y/o IP compatible + (ej: ws1080, wh3101, wh3104 y otras). diff --git a/build/controlDeb/control_arm_web b/build/controlDeb/control_arm_web new file mode 100644 index 0000000..00f577a --- /dev/null +++ b/build/controlDeb/control_arm_web @@ -0,0 +1,17 @@ +Package: emalibre-web +Architecture: arm64 +Version: 1.36 +Priority: optional +Section: utils +Maintainer: Laboratorio de Investigacion Gugler +Homepage: https://ema.gugler.com.ar +Depends: nodejs (>= 14), libusb-1.0-0, libudev1 +Conflicts: emalibre-gui +Description: EMA Libre Cliente (Carpincho) + Software Libre en modo web y consola para Estaciones Meteorológicas Automáticas. + EMA Libre es software libre y gratuito desarrollado por el Laboratorio de + Investigación Gugler perteneciente a la Facultad de Ciencia y Tecnología de la + Universidad Autónoma de Entre Ríos, con el objetivo de recolectar, registrar y + publicar información meteorológica a través de sensores USB y/o IP compatibles + (ej: ws1080, wh3101, wh3104 y otros). + Diseñado para Raspberry Pi OS 64-bit. diff --git a/build/controlDeb/control_linux_gui b/build/controlDeb/control_linux_gui new file mode 100644 index 0000000..0b22911 --- /dev/null +++ b/build/controlDeb/control_linux_gui @@ -0,0 +1,15 @@ +Package: emalibre-gui +Architecture: amd64 +Version: 1.36 +Priority: optional +Section: application +Maintainer: Laboratorio de Investigacion Gugler +Homepage: https://ema.gugler.com.ar +Depends: +Conflicts: emalibre-web +Description: EMA Libre Cliente (Carpincho) - Software Libre en modo GUI (desktop) para Estaciones Meteorológica Automáticas. + EMA Libre es Libre y Gratuito desarrollado por el Laboratorio de Investigación Gugler + perteneciente a la Facultad de Ciencia y Tecnología de la Universidad + Autónoma de Entre Ríos, con el objetivo de recolectar, registrar y publicar + información meteorológica a través de los diferentes sensores de una estación USB y/o IP compatible + (ej: ws1080, wh3101, wh3104 y otras). diff --git a/build/controlDeb/control_linux_web b/build/controlDeb/control_linux_web new file mode 100644 index 0000000..e5beeaa --- /dev/null +++ b/build/controlDeb/control_linux_web @@ -0,0 +1,15 @@ +Package: emalibre-web +Architecture: amd64 +Version: 1.36 +Priority: optional +Section: application +Maintainer: Laboratorio de Investigacion Gugler +Homepage: https://ema.gugler.com.ar +Depends: +Conflicts: emalibre-gui +Description: EMA Libre Cliente (Carpincho) - Software Libre en modo web y consola para Estaciones Meteorológica Automáticas. + EMA Libre es Libre y Gratuito desarrollado por el Laboratorio de Investigación Gugler + perteneciente a la Facultad de Ciencia y Tecnología de la Universidad + Autónoma de Entre Ríos, con el objetivo de recolectar, registrar y publicar + información meteorológica a través de los diferentes sensores de una estación USB y/o IP compatible + (ej: ws1080, wh3101, wh3104 y otras). diff --git a/generarDeb64.sh b/generarDeb64.sh index 82c62dc..4d70e64 100755 --- a/generarDeb64.sh +++ b/generarDeb64.sh @@ -1,16 +1,33 @@ #!/bin/bash +set -e -#PARAMETRIA -VERSION=`grep Version src/conf/ConfiguracionGlobal.js | sed -e "s/'Version': //g" | sed -e "s/,//g" | sed -e "s/^[ \t]*//"` -NWJS_VERSION='0.94.0' +# Pide la contraseña de sudo al principio (si no tiene permisos) +if ! sudo -v; then + echo "Este script requiere permisos de sudo para algunas operaciones." + exit 1 +fi -# DEPENDENCIAS -NW_GYP_INST=`npm list -g | grep nw-gyp@ | grep -v deduped | wc -l` -NW_BUILDER_INST=`npm list | grep nw-builder@ | grep -v deduped | wc -l` -node=`node -v | wc -l` -npm=`npm -v | wc -l` +# Refresca el tiempo de sudo mientras el script corre +while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null & + +# ======================= +# VARIABLES Y FUNCIONES +# ======================= +BUILD_DIR="build" +DEB_DIR="$BUILD_DIR/Deb64" +DEBS_OUT="$BUILD_DIR/debs" +TMP_DIR="$BUILD_DIR/tmp" +EMALIBRE_DIR="$BUILD_DIR/emalibre" +EMALIBRE_NOGUI="$TMP_DIR/emalibre_nogui" +CONTROL_DEB="$BUILD_DIR/controlDeb" +LOG_FILE="/tmp/ema.log" + +function log_info() { printf "\033[1;10m$1\033[0m"; } +function log_ok() { printf "\033[1;32m$1\033[0m\n"; } +function log_warn() { printf "\033[1;33m$1\033[0m\n"; } +function log_error() { printf "\033[1;31m$1\033[0m\n"; } +function log_final() { printf "\033[5;10m$1\033[0m\n"; } -# Metodo Spinner function spinner() { local info="$1" local pid=$! @@ -29,252 +46,242 @@ function spinner() { done printf " \b\b\b\b" } -# *********************************************************** -# EJECUCION DE CODIGO -- LIMPIA Y VERIFICA ENTORNO -# *********************************************************** + +# ======================= +# VERSIONES +# ======================= +VERSION=$(grep Version src/conf/ConfiguracionGlobal.js | sed -e "s/'Version': //g" | sed -e "s/,//g" | sed -e "s/^[ \t]*//") +NWJS_VERSION='0.94.0' + +# ======================= +# INICIO +# ======================= echo "" echo "*************************************************" echo "* Comprobando y preparando el entorno ***" echo "*************************************************" echo "" -printf "\033[1;4m--->Version de EmaL: $VERSION \033[0m\n" -printf "\033[1;4m--->Version de NWJs: $NWJS_VERSION \033[0m\n" +log_info "--->Versión de EmaLibre: $VERSION \n" +log_info "----- >Versión de NW.Js: $NWJS_VERSION \n" echo "" -printf "\033[1;10m1) Limpiando compilacion anterior. \033[0m" -sudo mkdir build/Deb64/usr/bin 2> /dev/null -sudo mkdir build/Deb64/usr/share/emalibre 2> /dev/null -sudo rm -fr build/emalibre/* -sudo rm -fr build/tmp/emalibre_nogui -sudo rm -fr build/Deb64/usr/bin/* -sudo rm -fr build/Deb64/usr/share/emalibre/* -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m2) Instalando/comprobando paquetes con APT necesarios. \033[0m" + +# ======================= +# LIMPIEZA Y PREPARACIÓN +# ======================= +log_info "1) Limpiando compilación anterior." +mkdir -p "$DEB_DIR/usr/bin" "$DEB_DIR/usr/share/emalibre" "$DEBS_OUT" +sudo rm -rf "$EMALIBRE_DIR"/* "$TMP_DIR/emalibre_nogui" "$DEB_DIR/usr/bin/"* "$DEB_DIR/usr/share/emalibre/"* +log_ok " --> OK." + +# ======================= +# DEPENDENCIAS DEL SISTEMA +# ======================= +log_info "2) Instalando/comprobando paquetes con APT necesarios." sudo apt-get -y -qq install build-essential git wget libusb-1.0-0 libusb-1.0-0-dev libudev-dev -sudo chmod -R 777 build/Deb64 -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m3) Verificando node y dependencias: \033[0m\n" -printf "\033[1;10m 3.1) Comprobando si esta node global. \033[0m" -if [ $node -eq 1 ] -then - printf "\033[1;32m --> OK. \033[0m\n" - else - printf "\033[1;31m --> NO. \033[0m" - printf "\033[1;32m --> Se sale, por favor instale manualmente. \033[0m\n" - exit 0 +sudo chmod -R 755 "$DEB_DIR" +log_ok " --> OK." + +# ======================= +# DEPENDENCIAS NODE/NPM +# ======================= +log_info "3) Verificando node y dependencias:\n" + +if ! command -v node >/dev/null 2>&1; then + log_error " --> Node.js no está instalado. Instálelo manualmente." + exit 1 +else + log_ok " 3.1) Node.js OK." fi -printf "\033[1;10m 3.2) Comprobando si esta /npm global. \033[0m" -if [ $npm -eq 1 ] -then - printf "\033[1;32m --> OK. \033[0m\n" - else - printf "\033[1;31m --> NO. \033[0m" - printf "\033[1;32m --> Se sale, por favor instale manualmente. \033[0m\n" - exit 0 + +if ! command -v npm >/dev/null 2>&1; then + log_error " --> npm no está instalado. Instálelo manualmente." + exit 1 +else + log_ok " 3.2) npm OK." fi -printf "\033[1;10m 3.3) Comprobando si esta nw-gyp como global. \033[0m" -if [ $NW_GYP_INST -eq 1 ] -then - printf "\033[1;32m --> OK. \033[0m\n" - else - printf "\033[1;31m --> NO. \033[0m" - npm install -g nw-gyp -no-audit -silent 2> /tmp/ema.log 1> /dev/null - printf "\033[1;32m --> Se instalo. \033[0m\n" + +if ! npm list -g --depth=0 | grep -q nw-gyp@; then + log_warn " 3.3) nw-gyp no encontrado globalmente. Instalando..." + npm install -g nw-gyp --no-audit --silent 2>>"$LOG_FILE" 1>/dev/null + log_ok " --> nw-gyp instalado." +else + log_ok " 3.3) nw-gyp OK." fi -printf "\033[1;10m 3.4) Comprobando si nw-builder localmente. \033[0m" -if [ $NW_BUILDER_INST -eq 1 ] -then - printf "\033[1;32m --> OK. \033[0m\n" - else - printf "\033[1;31m --> NO. \033[0m" - npm install -no-audit -silent 2> /tmp/ema.log 1> /dev/null - printf "\033[1;32m --> Se instalo. \033[0m\n" + +if ! npm list --depth=0 | grep -q nw-builder@; then + log_warn " 3.4) nw-builder no encontrado localmente. Instalando..." + npm install --no-audit --silent 2>>"$LOG_FILE" 1>/dev/null + log_ok " --> nw-builder instalado." +else + log_ok " 3.4) nw-builder OK." fi -printf "\033[1;10m4) Empaquetando el proyecto emalibre. \033[0m" -CHECK_EMPAQUETADO=`node empaquetarLinux.js | grep "Correcto!" | wc -l` -if [ "${CHECK_EMPAQUETADO}" -eq "1" ]; then printf "\033[1;32m --> OK. \033[0m\n"; else printf "\033[5;91m --> ERROR. Problema empaquetando con nw-builder. \033[0m\n";exit 1; fi -printf "\033[1;10m5) Aplicando Permisos al proyecto. \033[0m" -sudo chmod -R 777 build/emalibre/package.nw & spinner "Procesando..." -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m6) Eliminando node_modules del proyecto. \033[0m" -sudo rm -fr build/emalibre/package.nw/node_modules & spinner "Procesando..." -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m7) Generando node_modules con NPM del proyecto. \033[0m" -cd build/emalibre/package.nw -npm install ---production -no-audit -silent 2> /tmp/ema.log 1> /dev/null -printf "\033[1;32m --> OK. \033[0m\n"; -printf "\033[1;10m8) Se purgan los tanques y logs. \033[0m" -sudo echo "" > logs/debug.log -sudo echo "[]" > logs/TanquePendientes.log -sudo echo "[]" > logs/registro_diario.log -printf "\033[1;32m --> OK. \033[0m\n"; -printf "\033[1;10m9) Se blanquea el archivo de Configuracion General. \033[0m" -sudo cp ../../conf/ConfiguracionGeneral.js conf/ConfiguracionGeneral.js -printf "\033[1;32m --> OK. \033[0m\n"; -cd ../.. -sudo cp -R emalibre tmp/emalibre_nogui # Se copia antes del postLINUX (que implementa NWJS) para el modo consola y web -sudo chmod -R 777 tmp/emalibre_nogui -cd emalibre/package.nw -npm run postLINUX -no-audit -silent 2> /tmp/ema.log 1> /dev/null & spinner "Procesando..." -CHECK_NW_NODE_BUILD=`cat /tmp/ema.log | grep "gyp info ok" | wc -l` -if [ "${CHECK_NW_NODE_BUILD}" -eq "1" ]; then printf "\033[1;32m --> OK. \033[0m\n"; else printf "\033[5;91m --> ERROR. Verifique el modulo NW con node-hid. \033[0m\n";exit 1; fi + +# ======================= +# EMPAQUETADO +# ======================= +log_info "4) Empaquetando el proyecto emalibre." + +if node empaquetarLinux.js | grep -q "Correcto!"; then + log_ok " --> OK. " +else + log_error " --> ERROR. Problema empaquetando con nw-builder." + exit 1 +fi + +# ======================= +# PERMISOS Y NODE_MODULES +# ======================= +log_info "5) Aplicando Permisos al proyecto." +sudo chmod -R 755 "$EMALIBRE_DIR/package.nw" +log_ok " --> OK." + +log_info "6) Eliminando node_modules del proyecto." +rm -rf "$EMALIBRE_DIR/package.nw/node_modules" +log_ok " --> OK." + +log_info "7) Generando node_modules con NPM del proyecto." +cd "$EMALIBRE_DIR/package.nw" +npm ci --only=production --no-audit --silent 2>>"$LOG_FILE" 1>/dev/null +log_ok " --> OK." + +# ======================= +# LIMPIEZA DE LOGS Y CONFIG +# ======================= +log_info "8) Se purgan los tanques y logs." +: > logs/debug.log +echo "[]" > logs/TanquePendientes.log +echo "[]" > logs/registro_diario.log +log_ok " --> OK." + +log_info "9) Se blanquea el archivo de Configuracion General." +cp ../../conf/ConfiguracionGeneral.js conf/ConfiguracionGeneral.js +log_ok " --> OK." cd ../../.. -# ************************************************************** -# Compilar EMA Libre Cliente (Carpincho) en modo GRAFICO Desktop -# ************************************************************** -echo "" -echo "" -echo "*************************************************" -echo "* Build EMA Libre Cliente Grafico - GNU/Linux *" -echo "*************************************************" -echo "" -printf "\033[1;10m1) Limpiando archivos temporales. \033[0m" -sudo rm -f build/Deb64/DEBIAN/control -sudo rm -fr build/Deb64/usr/bin/* -sudo rm -fr build/Deb64/usr/share/emalibre/* -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m2) Copiando los fuentes de EMA Libre para 64bit. \033[0m" -sudo cp -R build/emalibre/* build/Deb64/usr/share/emalibre/ -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m3) Remplazando el archivo de control DEB. \033[0m" -sudo cp -f build/controlDeb/control_linux_gui build/Deb64/DEBIAN/control & spinner "Procesando..." -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m4) Aplicando permisos necesarios. \033[0m" -sudo chmod +x build/Deb64/usr/share/emalibre/emalibre -sudo chmod 0755 build/Deb64/DEBIAN -sudo chmod 0755 build/Deb64/DEBIAN/postrm -sudo chmod 0755 build/Deb64/DEBIAN/postinst -sudo chmod 0755 build/Deb64/DEBIAN/preinst -sudo chown -R root:root build/Deb64 -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m5) Generando enlaces simbolicos del binario. \033[0m" -cd build/Deb64/usr/bin/ -sudo ln -s ../share/emalibre/emalibre emalibre +log_info "9.1) Se copia emalibre antes de implementar el módulo node-hid con NWJS." +cp -R "$EMALIBRE_DIR" "$TMP_DIR/emalibre_nogui" +chmod -R 755 "$TMP_DIR/emalibre_nogui" +cd "$EMALIBRE_DIR/package.nw" +log_ok " --> OK." + +log_info "10) Corriendo el post-script para el rebuild del módulo node-hid en i64." +npm run postLINUX --no-audit --silent 2>>"$LOG_FILE" 1>/dev/null & spinner "Procesando..." +if grep -q "gyp info ok" "$LOG_FILE"; then + log_ok " --> OK. " +else + log_error " --> ERROR. Verifique el módulo NW con node-hid." + exit 1 +fi cd ../../.. -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m6) Eliminando node/web/express/forever/servicio para modo GUI y la intefaz para consola/web. \033[0m" -# se mueve el servicio desde al temporal -sudo mv Deb64/etc/init.d tmp -sudo mv Deb64/etc/emalibre_modo tmp -sudo rm -fr Deb64/usr/share/emalibre/node_modules/node -sudo rm -fr Deb64/usr/share/emalibre/node_modules/express -sudo rm -fr Deb64/usr/share/emalibre/node_modules/forever -sudo rm -fr Deb64/usr/share/emalibre/node_modules/forever-agent -sudo rm -fr Deb64/usr/share/emalibre/node_modules/forever-monitor -sudo rm -fr Deb64/usr/share/emalibre/gui_web -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m7) Generando Paquete Deb para GUI 64bit Linux. \033[0m\n" -sudo dpkg -b Deb64 debs/"emalibre-gui-linux_$VERSION.deb" -# se vuelve el servicio desde el temporal -sudo mv tmp/init.d Deb64/etc -sudo mv tmp/emalibre_modo Deb64/etc/emalibre_modo -printf "\033[5;10m Finalizo con exito, build/debs/emalibre-gui-linux_$VERSION.deb. \033[0m" -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m8) Limpiando archivos temporales. \033[0m" + +# ======================= +# BUILD GUI DESKTOP +# ======================= +echo "" +echo "*************************************************" +echo "* Build EMA Libre Cliente Gráfico - GNU/Linux *" +echo "*************************************************" +echo "" +log_info "1) Limpiando archivos temporales." +sudo rm -f "$DEB_DIR/DEBIAN/control" +sudo rm -rf "$DEB_DIR/usr/bin/"* "$DEB_DIR/usr/share/emalibre/"* +log_ok " --> OK." + +log_info "2) Copiando los fuentes de EMA Libre para 64 bits." +sudo cp -R "$EMALIBRE_DIR/"* "$DEB_DIR/usr/share/emalibre/" +log_ok " --> OK." + +log_info "3) Reemplazando el archivo de control DEB." +sudo cp -f "$CONTROL_DEB/control_linux_gui" "$DEB_DIR/DEBIAN/control" +log_ok " --> OK." + +log_info "4) Aplicando permisos necesarios." +sudo chmod +x "$DEB_DIR/usr/share/emalibre/emalibre" +sudo chmod 0755 "$DEB_DIR/DEBIAN" "$DEB_DIR/DEBIAN/postrm" "$DEB_DIR/DEBIAN/postinst" "$DEB_DIR/DEBIAN/preinst" +sudo chown -R root:root "$DEB_DIR" +log_ok " --> OK." + +log_info "5) Generando enlaces simbólicos del binario." +cd "$DEB_DIR/usr/bin/" +sudo ln -sf ../share/emalibre/emalibre emalibre +cd ../../.. +log_ok " --> OK." + +log_info "6) Eliminando node/web/express/forever/servicio para modo GUI y la interfaz para el modo web." +sudo mv "$DEB_DIR/etc/init.d" "$TMP_DIR" 2>/dev/null || true +sudo mv "$DEB_DIR/etc/emalibre_modo" "$TMP_DIR" 2>/dev/null || true +sudo rm -rf "$DEB_DIR/usr/share/emalibre/node_modules/node" \ + "$DEB_DIR/usr/share/emalibre/node_modules/express" \ + "$DEB_DIR/usr/share/emalibre/node_modules/forever" \ + "$DEB_DIR/usr/share/emalibre/node_modules/forever-agent" \ + "$DEB_DIR/usr/share/emalibre/node_modules/forever-monitor" \ + "$DEB_DIR/usr/share/emalibre/gui_web" +log_ok " --> OK." + +log_info "7) Generando Paquete DEB para GUI 64 bits Linux." +#sudo dpkg -b Deb64 debs/"emalibre-gui-linux_$VERSION.deb" +sudo dpkg-deb -Zxz -b Deb64 debs/"emalibre-gui-linux_$VERSION.deb" + cd .. -sudo rm -f build/Deb64/DEBIAN/control -sudo rm -fr build/Deb64/usr/bin/* -sudo rm -fr build/Deb64/usr/share/emalibre/* -printf "\033[1;32m --> OK. \033[0m\n" +mv "$TMP_DIR/init.d" "$DEB_DIR/etc" 2>/dev/null || true +mv "$TMP_DIR/emalibre_modo" "$DEB_DIR/etc/emalibre_modo" 2>/dev/null || true +log_final " Finalizó con éxito, build/debs/emalibre-gui-linux_$VERSION.deb." +log_ok " --> OK." +log_info "8) Limpiando archivos temporales." +sudo rm -f "$DEB_DIR/DEBIAN/control" +sudo rm -rf "$DEB_DIR/usr/bin/"* "$DEB_DIR/usr/share/emalibre/"* +log_ok " --> OK." -# *********************************************************** -# Compilar EMA Libre Cliente (Carpincho) en modo CONSOLA/WEB -# *********************************************************** -echo "" +# ======================= +# BUILD CONSOLA/WEB +# ======================= echo "" echo "*************************************************" echo "* Build EMA Libre Cliente Web - GNU/Linux *" echo "*************************************************" echo "" -printf "\033[1;10m1) Limpiando archivos temporales. \033[0m" -sudo rm -f build/Deb64/DEBIAN/control -sudo rm -fr build/Deb64/usr/bin/* -sudo rm -fr build/Deb64/usr/share/emalibre/* -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m2) Copiando los fuentes de EMA Libre para 64bit. \033[0m" -sudo cp -R build/tmp/emalibre_nogui/package.nw/core build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/logs build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/conf build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/gui_web build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/gui_common build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/node_modules build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/CHANGELOG build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/COPYING build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/AUTHORS build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.nw/package.json build/Deb64/usr/share/emalibre/ -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m3) Remplazando el archivo de control DEB. \033[0m" -sudo cp -f build/controlDeb/control_linux_web build/Deb64/DEBIAN/control & spinner "Procesando..." -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m4) Aplicando permisos necesarios. \033[0m" -sudo echo "web" > build/Deb64/etc/emalibre_modo -sudo chmod 0755 build/Deb64/DEBIAN -sudo chmod 0755 build/Deb64/DEBIAN/postrm -sudo chmod 0755 build/Deb64/DEBIAN/postinst -sudo chmod 0755 build/Deb64/DEBIAN/preinst -sudo chown -R root:root build/Deb64 -printf "\033[1;32m --> OK. \033[0m\n" -cd build -printf "\033[1;10m7) Generando Paquete Deb para Web 64bit Linux. \033[0m\n" -sudo dpkg -b Deb64 debs/"emalibre-web-linux_$VERSION.deb" -printf "\033[5;10m Finalizo con exito, build/debs/emalibre-console-linux_$VERSION.deb. \033[0m" -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m8) Limpiando archivos temporales. \033[0m" +log_info "1) Limpiando archivos temporales." +rm -f "$DEB_DIR/DEBIAN/control" +rm -rf "$DEB_DIR/usr/bin/"* "$DEB_DIR/usr/share/emalibre/"* +log_ok " --> OK." +log_info "2) Copiando los fuentes de EMA Libre para 64bit." +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/core" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/logs" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/conf" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/gui_web" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/gui_common" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/node_modules" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/CHANGELOG" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/COPYING" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/AUTHORS" "$DEB_DIR/usr/share/emalibre/" +sudo cp -R "$TMP_DIR/emalibre_nogui/package.nw/package.json" "$DEB_DIR/usr/share/emalibre/" + +log_ok " --> OK." + +log_info "3) Remplazando el archivo de control DEB." +sudo cp -f "$CONTROL_DEB/control_linux_web" "$DEB_DIR/DEBIAN/control" +log_ok " --> OK." + +log_info "4) Aplicando permisos necesarios." +sudo chmod 0755 "$DEB_DIR/DEBIAN" "$DEB_DIR/DEBIAN/postrm" "$DEB_DIR/DEBIAN/postinst" "$DEB_DIR/DEBIAN/preinst" +sudo chown -R root:root "$DEB_DIR" +log_ok " --> OK." + +cd "$BUILD_DIR" +log_info "7) Generando Paquete DEB para Web 64bit Linux." +#sudo dpkg -b Deb64 debs/"emalibre-web-linux_$VERSION.deb" +sudo dpkg-deb -Zxz -b Deb64 debs/"emalibre-web-linux_$VERSION.deb" + cd .. -sudo rm -f build/Deb64/DEBIAN/control -sudo rm -fr build/Deb64/usr/bin/* -sudo rm -fr build/Deb64/usr/share/emalibre/* -sudo rm -fr build/emalibre -printf "\033[1;32m --> OK. \033[0m\n" +log_final " Finalizó con éxito, build/debs/emalibre-web-linux_$VERSION.deb." +log_ok " --> OK." + +log_info "8) Limpiando archivos temporales." +sudo rm -f "$DEB_DIR/DEBIAN/control" +sudo rm -rf "$DEB_DIR/usr/bin/"* "$DEB_DIR/usr/share/emalibre/"* +sudo rm -rf "$EMALIBRE_DIR" +log_ok " --> OK." echo "" -exit 0 - -# *********************************************************** -# Compilar EMA Libre Cliente (Carpincho) en modo CONSOLA -# *********************************************************** -echo "" -echo "" -echo "*************************************************" -echo "* Build EMA Libre Cliente Consola - GNU/Linux *" -echo "*************************************************" -echo "" -printf "\033[1;10m1) Limpiando archivos temporales. \033[0m" -sudo rm -f build/Deb64/DEBIAN/control -sudo rm -fr build/Deb64/usr/bin/* -sudo rm -fr build/Deb64/usr/share/emalibre/* -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m2) Copiando los fuentes de EMA Libre para 64bit. \033[0m" -sudo cp -R build/tmp/emalibre_nogui/core build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/logs build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/conf build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/tmp build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/node_modules build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/CHANGELOG build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/COPYING build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/AUTHORS build/Deb64/usr/share/emalibre/ -sudo cp -R build/tmp/emalibre_nogui/package.json build/Deb64/usr/share/emalibre/ -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m3) Remplazando el archivo de control DEB. \033[0m" -sudo cp -f build/controlDeb/control_linux_console build/Deb64/DEBIAN/control & spinner "Procesando..." -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m4) Aplicando permisos necesarios. \033[0m" -sudo chmod 0755 build/Deb64/DEBIAN -sudo chmod 0755 build/Deb64/DEBIAN/postrm -sudo chmod 0755 build/Deb64/DEBIAN/postinst -sudo chmod 0755 build/Deb64/DEBIAN/preinst -sudo chown -R root:root build/Deb64 -printf "\033[1;32m --> OK. \033[0m\n" -cd build -printf "\033[1;10m7) Generando Paquete Deb para Consola 64bit Linux. \033[0m\n" -sudo dpkg -b Deb64 debs/"emalibre-consola-linux_$VERSION.deb" -printf "\033[5;10m Finalizo con exito, build/debs/emalibre-console-linux_$VERSION.deb. \033[0m" -printf "\033[1;32m --> OK. \033[0m\n" -printf "\033[1;10m8) Limpiando archivos temporales. \033[0m" -cd .. -sudo rm -f build/Deb64/DEBIAN/control -sudo rm -fr build/Deb64/usr/bin/* -sudo rm -fr build/Deb64/usr/share/emalibre/* -printf "\033[1;32m --> OK. \033[0m\n" -echo "" +exit 0 \ No newline at end of file diff --git a/generarDebArm.sh b/generarDebArm.sh index c94540e..34b2bbc 100755 --- a/generarDebArm.sh +++ b/generarDebArm.sh @@ -4,9 +4,11 @@ VERSION=`grep Version src/conf/ConfiguracionGlobal.js | sed -e "s/'Version': //g" | sed -e "s/,//g" | sed -e "s/^[ \t]*//"` NWJS_VERSION='0.28.4' # Es la ultima compilada para ARM, siempre mirar la url https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases #NWJS_ARM='https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/v' Se comenta se copio el tar al server de gugler por velocidad- + NODE_CONSOLE='https://nodejs.org/dist/v14.4.0/node-v14.14.0-linux-armv7l.tar.xz' # Version node, siempre mirar la url NODE_NOMBRE='node-v14.14.0-linux-armv7l' -DESCARGA_NWJS='https://nube.gugler.com.ar/index.php/s/iznYtBE7aBtXYdN/download' #server de gugler nwjs 28.4 +#DESCARGA_NWJS='https://nube.gugler.com.ar/index.php/s/iznYtBE7aBtXYdN/download' #server de gugler nwjs 28.4 +DESCARGA_NWJS='https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/nw60_2022-01-07/nw60_2022-01-07.tar.gz' # DEPENDENCIAS NW_GYP_INST=`npm list -g | grep nw-gyp@ | wc -l` @@ -164,7 +166,7 @@ printf "\033[1;10m2) Copiando los fuentes de EMA Libre para 64bit. \033[0m" sudo cp -R build/emalibre/arm/* build/Deb64/usr/share/emalibre/ printf "\033[1;32m --> OK. \033[0m\n" printf "\033[1;10m3) Remplazando el archivo de control DEB. \033[0m" -sudo cp -f build/controlDeb/control_arm_gui build/Deb64/DEBIAN/control & spinner "Procesando..." +sudo cp -f build/controlDeb/control_arm_gui build/Deb64/DEBIAN/control printf "\033[1;32m --> OK. \033[0m\n" printf "\033[1;10m4) Aplicando permisos necesarios. \033[0m" sudo chmod +x build/Deb64/usr/share/emalibre/emalibre @@ -235,7 +237,7 @@ sudo cp -R build/emalibre/arm/AUTHORS build/Deb64/usr/share/emalibre/ sudo cp -R build/emalibre/arm/package.json build/Deb64/usr/share/emalibre/ printf "\033[1;32m --> OK. \033[0m\n" printf "\033[1;10m3) Remplazando el archivo de control DEB. \033[0m" -sudo cp -f build/controlDeb/control_arm_web build/Deb64/DEBIAN/control & spinner "Procesando..." +sudo cp -f build/controlDeb/control_arm_web build/Deb64/DEBIAN/control printf "\033[1;32m --> OK. \033[0m\n" printf "\033[1;10m4) Aplicando permisos necesarios. \033[0m" sudo chmod 0755 build/Deb64/DEBIAN diff --git a/src/CHANGELOG b/src/CHANGELOG index a31f057..8abb574 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,8 +1,9 @@ -** Versión 1.36: (Julio 10 , 2025) +** Versión 1.36: (Enero 10 , 2026) + Se incorporó recolectar por WIFI/IP. + Mejoras menores de estilo(ej:iconos en logs). - + Se actualizó la funcion de registrar logs para que solo - registre en el nivel parametrizado (1-9), los 0 se registran siempre. + + Mejoras en el empaquetador. + + Se actualizó la funcion de registrar logs para que solo registre en el nivel parametrizado (1-9), los 0 se registran siempre. + + Se mantiene la versión de nwjs por compatibilidad con node-hid. + Se incorporó la opcion para ir al sitio oficial de la red, en el menu de redes. + Se actualizó la versión de : diff --git a/src/core/ema.js b/src/core/ema.js index 5d04cd6..03ce661 100644 --- a/src/core/ema.js +++ b/src/core/ema.js @@ -613,14 +613,15 @@ APP = module.exports = { server.on('error', (err) => { if (err.code === 'EADDRINUSE') { APP.RegistrarLog(`0|CORE| ❌ Error: El puerto ${PORT} ya está en uso.`); - APP.Configuracion.Errores = '❌ Error el puerto ya está en uso.'; + //APP.Configuracion.Errores = '❌ Error el puerto ya está en uso.'; } else if (err.code === 'EACCES') { APP.RegistrarLog(`0|CORE| ❌ Error: Permiso denegado para usar el puerto ${PORT}.`); APP.Configuracion.Errores = '❌ Permiso denegado para usar el puerto.'; } else { APP.RegistrarLog(`0|CORE| ❌ Error al iniciar servidor: ${err.message}`); APP.Configuracion.Errores = '❌ Error al iniciar servidor.'; - } + } + }); }else{ // RECOLECTOR USB diff --git a/src/core/reporte.js b/src/core/reporte.js index 5e318d9..de75a8d 100644 --- a/src/core/reporte.js +++ b/src/core/reporte.js @@ -257,7 +257,7 @@ function MostrarUltimoRegistro(modo) }); }); //Ultimo Registro REDES ENVIADAS - http.get('http://127.0.0.1:8080/UltimoRegistro', (res) => { + http.get('http://127.0.0.1:8080/UltimoPublicado', (res) => { const { statusCode } = res; term.moveTo( 1 , 19 , '' ) ; term.wrapColumn( { x: 2 , width: 80, height: 50, offset: 0, continue:true } ); diff --git a/src/gui_common/controlador/admingui.js b/src/gui_common/controlador/admingui.js index 608edbc..70339c8 100644 --- a/src/gui_common/controlador/admingui.js +++ b/src/gui_common/controlador/admingui.js @@ -242,14 +242,14 @@ async function iniciarAutomaticamente () { if (configGeneralEMA.ConfGeneral.inicio_automatico) { await esperar(4000); HABLA(0, 'Iniciando Automaticamente..', 'info'); - if ($('#mensaje').html() === 'Encienda EMA Libre') { + if ($('#mensaje').html() === 'Encienda EMA Libre' || $('#mensaje').html() === 'EMA Libre se encuentra detenida' || $('#mensaje').html()) await esperar(5000); INICIAR(); - } else { - HABLA(0, 'No se pudo iniciar automaticamente, verifique el error', 'info'); - } + } + if ($('#mensaje').html() === 'Recolectado por IP') { + HABLA(0, 'EMA ya se encuentra recolectando', 'info'); + } } -} function killAllTimers() { // Preservar el intervalo de la barra de progreso si existe @@ -899,7 +899,7 @@ async function BarradeProgreso () { // ********************** Menu Acciones ******************************************************************* -function MenuConfig () { +async function MenuConfig () { $('#bloque_secundario').hide(); $('#LlaveR').hide(); @@ -911,10 +911,14 @@ if (['Recolector_USB', 'Recolector_IP'].includes($('#Modo').val())) { if ($('#Modo').val() === 'Recolector_USB') { //nada por ahora :). }else{ //esta en modo Recolector_IP - console.log("entro en modo IP"); + //console.log("entro en modo IP"); $('#bloque_secundario').show(); $('#bloque_por_IP_WIFI').show(); - const interfaces = os.networkInterfaces(); + let interfaces; + if (_IS_NW) { + interfaces = os.networkInterfaces(); + } else {interfaces = await $.get('/interfaces');} + // Limpiar las opciones previas (excepto la de "Seleccionar IP") const $ipGroup = $('#ipGroup'); $ipGroup.find('option:not([value=""])').remove(); diff --git a/src/gui_web/controlador/funcionesgenerales.js b/src/gui_web/controlador/funcionesgenerales.js index 6ced0e7..d2ea47f 100644 --- a/src/gui_web/controlador/funcionesgenerales.js +++ b/src/gui_web/controlador/funcionesgenerales.js @@ -215,16 +215,16 @@ async function EstadoMenuInicio() //Muestra Interior (Temperatura y Humedad) if(($('#interior').hasClass('active') && typeof click === "undefined") || (click === 'interior')) { - //***Temperatura Interna + // ***Temperatura Interna if (UltimoReg.temperatura_interna != Ant_UltimoReg.temperatura_interna){ if (UltimoReg.temperatura_interna > Ant_UltimoReg.temperatura_interna ) {tendenciaTI = Sube + (Ant_UltimoReg.temperatura_interna*TEMP_MULT+TEMP_POND).toFixed(2) + TEMP_S +"|| Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Sube+"'>";}else{tendenciaTI = Baja+(Ant_UltimoReg.temperatura_interna*TEMP_MULT+TEMP_POND).toFixed(2) + TEMP_S + " || Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Baja+"'>";}}else {result = Igual;} $('#temp_int').html((UltimoReg.temperatura_interna*TEMP_MULT+TEMP_POND).toFixed(1) + TEMP_S + tendenciaTI);$('#temp_int_img').html(result); - //*** Maximos y Minimos + // *** Maximos y Minimos $('#temp_int_max').html((UltimoReg.temperatura_interna_max_dia*TEMP_MULT+TEMP_POND).toFixed(1) + TEMP_S); $('#temp_int_min').html((UltimoReg.temperatura_interna_min_dia*TEMP_MULT+TEMP_POND).toFixed(1) + TEMP_S); - //*** humedad interna + // *** humedad interna if (UltimoReg.humedad_interna != Ant_UltimoReg.humedad_interna){ if (UltimoReg.humedad_interna > Ant_UltimoReg.humedad_interna ) {tendenciaHI = Sube + Ant_UltimoReg.humedad_interna+"% || Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Sube+"'>";}else{tendenciaHI = Baja+Ant_UltimoReg.humedad_interna+"% || Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Baja+"'>";}}else {result = Igual;} $('#hum_int').html(UltimoReg.humedad_interna + " % " + tendenciaHI);$('#hum_int_img').html(result); - //*** Maximos y Minimos + // *** Maximos y Minimos $('#hum_int_max').html(UltimoReg.humedad_interna_max_dia + " %" ); $('#hum_int_min').html(UltimoReg.humedad_interna_min_dia + " %" ); } @@ -232,31 +232,31 @@ async function EstadoMenuInicio() if(($('#exterior').hasClass('active') && typeof click === "undefined") || (click === 'exterior')) { //CALCULO DE TENDENCIAS Y MUESTRA REGISTRO - //***Temperatura Externa + // ***Temperatura Externa if (UltimoReg.temperatura_externa != Ant_UltimoReg.temperatura_externa){ if (UltimoReg.temperatura_externa > Ant_UltimoReg.temperatura_externa ) {tendenciaTE = Sube + (Ant_UltimoReg.temperatura_externa*TEMP_MULT+TEMP_POND).toFixed(2)+ TEMP_S +" || Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Sube+"'>";}else{tendenciaTE = Baja+(Ant_UltimoReg.temperatura_externa*TEMP_MULT+TEMP_POND).toFixed(2)+ TEMP_S +" || Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Baja+"'>";}}else {result = Igual;} $('#temp_ext').html((UltimoReg.temperatura_externa*TEMP_MULT+TEMP_POND).toFixed(1)+ TEMP_S + tendenciaTE);$('#temp_ext_img').html(result); //*** Maximos y Minimos $('#temp_ext_max').html((UltimoReg.temperatura_externa_max_dia *TEMP_MULT+TEMP_POND).toFixed(1) + TEMP_S); $('#temp_ext_min').html((UltimoReg.temperatura_externa_min_dia *TEMP_MULT+TEMP_POND).toFixed(1) + TEMP_S); - //*** Punto de Rocio + // *** Punto de Rocio if (UltimoReg.punto_de_rocio != Ant_UltimoReg.punto_de_rocio){ if(UltimoReg.punto_de_rocio > Ant_UltimoReg.punto_de_rocio ) {tendenciaPDR = Sube + (Ant_UltimoReg.punto_de_rocio*TEMP_MULT+TEMP_POND).toFixed(2) + TEMP_S +"|| Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Sube;}else{tendenciaPDR = Baja + (Ant_UltimoReg.punto_de_rocio*TEMP_MULT+TEMP_POND).toFixed(2) + TEMP_S +" || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Baja +"'>";}}else {result = Igual;} $('#punto_ext').html((UltimoReg.punto_de_rocio*TEMP_MULT+TEMP_POND).toFixed(2) + TEMP_S + tendenciaPDR);$('#punto_ext_img').html(result); //*** Maximos y Minimos $('#punto_ext_max').html((UltimoReg.punto_de_rocio_max_dia*TEMP_MULT+TEMP_POND).toFixed(2) + TEMP_S); $('#punto_ext_min').html((UltimoReg.punto_de_rocio_min_dia*TEMP_MULT+TEMP_POND).toFixed(2) + TEMP_S); - //*** humedad Externa + // *** humedad Externa if (UltimoReg.humedad_externa != Ant_UltimoReg.humedad_externa){ if (UltimoReg.humedad_externa > Ant_UltimoReg.humedad_externa ) {tendenciaHE = Sube + Ant_UltimoReg.humedad_externa+"% || Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Sube+"'>";}else{tendenciaHE = Baja+Ant_UltimoReg.humedad_externa+"% || Fecha: "+ Ant_UltimoReg.fecha +"'>";result = Baja+"'>";}}else {result = Igual;} $('#hum_ext').html(UltimoReg.humedad_externa + " % " + tendenciaHE);$('#hum_ext_img').html(result); - //*** Maximos y Minimos + // *** Maximos y Minimos $('#hum_ext_max').html(UltimoReg.humedad_externa_max_dia + " %" ); $('#hum_ext_min').html(UltimoReg.humedad_externa_min_dia + " %" ); - //*** Intenciadad Luz + // *** Intenciadad Luz if(UltimoReg.luxer_intencidad != null) { if (UltimoReg.luxer_intencidad != Ant_UltimoReg.luxer_intencidad){ if (UltimoReg.luxer_intencidad > Ant_UltimoReg.luxer_intencidad ) {tendenciaLI = Sube + Ant_UltimoReg.luxer_intencidad + " Lux || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Sube;}else{tendenciaLI = Baja + Ant_UltimoReg.luxer_intencidad+" Lux || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Baja +"'>";}}else {result = Igual;} $('#luxer_ext').html(UltimoReg.luxer_intencidad + " lux " + tendenciaLI);$('#luxer_ext_img').html(result); - //*** Maximos y Minimos + // *** Maximos y Minimos $('#luxer_ext_max').html((UltimoReg.luxer_intencidad_max_dia*0.001).toFixed(2) + " Klux" ); $('#luxer_ext_min').html((UltimoReg.luxer_intencidad_min_dia*0.001).toFixed(2) + " Klux" ); }else{ @@ -264,12 +264,12 @@ async function EstadoMenuInicio() $('#luxer_ext_min').html('S/D'); $('#luxer_ext_max').html('S/D'); } - //*** Rayos UV + // *** Rayos UV if(UltimoReg.luxer_uv != null) { if (UltimoReg.luxer_uv != Ant_UltimoReg.luxer_uv){ if(UltimoReg.luxer_uv > Ant_UltimoReg.luxer_uv ) {tendenciaR = Sube + Ant_UltimoReg.luxer_uv +" UV || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Sube;}else{tendenciaR = Baja + Ant_UltimoReg.luxer_uv+" UV || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Baja +"'>";}}else {result = Igual;} $('#rayos_ext').html(UltimoReg.luxer_uv + " uv / " +texto_uv + " " + tendenciaR);$('#rayos_img').html(result); - //*** Maximos y Minimos + // *** Maximos y Minimos $('#rayos_ext_max').html(UltimoReg.luxer_uv_max_dia + " uv" ); $('#rayos_ext_min').html(UltimoReg.luxer_uv_min_dia + " uv" ); }else{ @@ -277,16 +277,16 @@ async function EstadoMenuInicio() $('#rayos_ext_min').html('S/D'); $('#rayos_ext_max').html('S/D'); } - //*** Presion Absoluta + // *** Presion Absoluta if (UltimoReg.presion_absoluta != Ant_UltimoReg.presion_absoluta){ if(UltimoReg.presion_absoluta > Ant_UltimoReg.presion_absoluta ) {tendenciaPA = Sube + Ant_UltimoReg.presion_absoluta +" hpa || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Sube;}else{tendenciaPA = Baja + Ant_UltimoReg.presion_absoluta+" hpa || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Baja +"'>";}}else {result = Igual;} $('#presiona_ext').html(UltimoReg.presion_absoluta + " hpa " +tendenciaPA);$('#presiona_ext_img').html(result); - //*** Presion Relativa + // *** Presion Relativa if (UltimoReg.presion_relativa != Ant_UltimoReg.presion_relativa){ if(UltimoReg.presion_relativa > Ant_UltimoReg.presion_relativa ) {tendenciaPR = Sube + Ant_UltimoReg.presion_relativa +" hpa || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Sube;}else{tendenciaPR = Baja + Ant_UltimoReg.presion_relativa+" hpa || Fecha: "+ Ant_UltimoReg.fecha +"'>";result=Baja +"'>";}}else {result = Igual;} $('#presionr_ext').html(UltimoReg.presion_relativa + " hpa " + tendenciaPR);$('#presionr_ext_img').html(result); - //*** Maximos y Minimos + // *** Maximos y Minimos $('#presionr_ext_max').html(UltimoReg.presion_relativa_max_dia + " hpa" ); $('#presionr_ext_min').html(UltimoReg.presion_relativa_min_dia + " hpa" ); - //*** Acumulados Lluvia ----> No tiene tendencias. + // *** Acumulados Lluvia ----> No tiene tendencias. $('#lloviendo_ext').html(UltimoReg.lloviendo + "mm"); $('#totalacuhora_ext').html(UltimoReg.lluvia_acu_hora + "mm"); $('#totalacudia_ext').html(UltimoReg.lluvia_acu_diaria + "mm"); diff --git a/src/gui_web/express.js b/src/gui_web/express.js index 9ba599f..c849f2c 100644 --- a/src/gui_web/express.js +++ b/src/gui_web/express.js @@ -37,6 +37,8 @@ const PORT = process.env.PORT || 8080; // Puerto por defecto. const os = require('os'); var app = express(); var server; +app.use(express.json()); + @@ -77,18 +79,18 @@ app.get('/configGlobalEMA', function (req, res) app.get('/tamanioArchivos', function (req, res) { // Se calcula la Cantidad y tamaño de los Tanques y Debug - if (fsconf.existsSync("logs/registro_diario.log")) + if (fsconf.existsSync("logs/registro_diario.log")) {var estadoarchivoTD = fsconf.statSync("logs/registro_diario.log"); - var TamanioenMegaTD = (estadoarchivoTD.size)/ 1000000.0; + var TamanioenMegaTD = (estadoarchivoTD.size)/ 1000000.0; }else{var TamanioenMegaTD = 'No Existe';} - if (fsconf.existsSync("logs/TanquePendientes.log")) + if (fsconf.existsSync("logs/TanquePendientes.log")) {var estadoarchivoTP = fsconf.statSync("logs/TanquePendientes.log"); - var TamanioenMegaTP = (estadoarchivoTP.size)/ 1000000.0; + var TamanioenMegaTP = (estadoarchivoTP.size)/ 1000000.0; }else{var estadoarchivoTP = 'No Existe';} - if (fsconf.existsSync("logs/debug.log")) + if (fsconf.existsSync("logs/debug.log")) {var estadoarchivoD = fsconf.statSync("logs/debug.log"); - var TamanioenMegaD = (estadoarchivoD.size)/ 1000000.0; - }else{var TamanioenMegaD = 'No Existe';} + var TamanioenMegaD = (estadoarchivoD.size)/ 1000000.0; + }else{var TamanioenMegaD = 'No Existe';} res.json([TamanioenMegaTD.toFixed(2),TamanioenMegaTP.toFixed(2),TamanioenMegaD.toFixed(2)]) }); @@ -106,7 +108,7 @@ app.get('/RepeticionesConError', function (req, res) {res.json(EMA.RepeticionesC app.get('/TiempoActualRecolector', function (req, res) {res.json(EMA.TiempoActualRecolector());}); -app.get('/Visor', function (req, res) { +app.get('/Visor', function (req, res) { var cantreg = 1; EMA.Visor(cantreg, function (error, datos) { if (error != null) { @@ -134,7 +136,7 @@ app.get('/iniciar', function (req, res) {EMA.Conectar();res.json('ok'); }); app.get('/detener', function (req, res) {EMA.Detener(); ;res.json('ok'); }); -app.get('/purgarDebug', function (req, res) +app.get('/purgarDebug', function (req, res) { fsconf.writeFile('logs/debug.log', '',{encoding: 'utf8', autoClose: true}, function(err) { @@ -144,7 +146,7 @@ app.get('/purgarDebug', function (req, res) res.json('ok'); }); -app.get('/purgarPendiente', function (req, res) +app.get('/purgarPendiente', function (req, res) { fsconf.writeFile('logs/TanquePendientes.log', JSON.stringify([], null, 4),{encoding: 'utf8', autoClose: true}, function(err) { @@ -155,7 +157,7 @@ app.get('/purgarPendiente', function (req, res) }); -app.get('/GuardarConf/:configuracion_nueva', function (req, res) +app.get('/GuardarConf/:configuracion_nueva', function (req, res) { var configuracion_nueva = '// Configuraciones generales de EMA RECOLECTOR\n\n' + req.params.configuracion_nueva; fsconf.writeFile('./conf/ConfiguracionGeneral.js', configuracion_nueva, function(err) { @@ -169,6 +171,30 @@ app.get('/GuardarConf/:configuracion_nueva', function (req, res) }); res.json('ok'); }); + +app.post('/GuardarConf', function (req, res) { + + if (!req.body || !req.body.configuracion) { + return res.status(400).json({ ok: false, error: 'Configuración no recibida' }); + } + + const configuracion_nueva = + '// Configuraciones generales de EMA RECOLECTOR\n\n' + + 'module.exports = ' + + JSON.stringify(req.body.configuracion, null, 2) + + ';\n'; + + fsconf.writeFile('./conf/ConfiguracionGeneral.js', configuracion_nueva, function (err) { + if (err) { + EMA.RegistrarLog("0|CORE|❌ Error al guardar configuración"); + return res.status(500).json({ ok: false }); + } + + EMA.Reconfigurar(); + EMA.RegistrarLog("0|CORE|✅ Configuración guardada correctamente"); + res.json({ ok: true }); + }); +}); app.get('/VerHistorico', function (req, res) { diff --git a/src/logs/debug.log b/src/logs/debug.log index 3f53975..8ac4040 100644 --- a/src/logs/debug.log +++ b/src/logs/debug.log @@ -26497,3 +26497,286 @@ 03/11/2025 01:58:39 - 3|RED|🌐 Red Publicada: awekas - Estado:OK 03/11/2025 01:58:39 - 3|RED|🌐 Red Publicada: wunderground - Estado:OK 03/11/2025 01:59:13 - 0|CORE|🔚 SALIR: Se cerro el core de EMA LIBRE. Hasta luego!!!. +31/01/2026 23:58:39 - 0|CORE|🕵️. Buscando Modulo USB para el S.O - linux_x64_gui +31/01/2026 23:58:39 - 0|CORE|✅ Modulo node-hid cargado correctamente. +31/01/2026 23:58:39 - 0|CORE|⏳ Iniciando Ema Libre en Modo gráfico o Web. +31/01/2026 23:59:06 - 0|CORE|Estableciendo Time Zone UTC -3 +31/01/2026 23:59:06 - 0|CORE|Verificando Estado de la EMA... +31/01/2026 23:59:06 - 0|CORE|Conectando.. +31/01/2026 23:59:06 - 0|CORE|Info de Estado: Fuera de Linea. +31/01/2026 23:59:06 - 0|CORE|Info de Detalle: EMA no conectada. +31/01/2026 23:59:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +31/01/2026 23:59:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +31/01/2026 23:59:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +31/01/2026 23:59:46 - 0|CORE|Estableciendo Time Zone UTC -3 +31/01/2026 23:59:46 - 0|CORE|Verificando Estado de la EMA... +31/01/2026 23:59:46 - 0|CORE|Conectando.. +31/01/2026 23:59:46 - 0|CORE|Info de Estado: Fuera de Linea. +31/01/2026 23:59:46 - 0|CORE|Info de Detalle: EMA no conectada. +31/01/2026 23:59:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +31/01/2026 23:59:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +31/01/2026 23:59:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:00:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:00:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:00:26 - 0|CORE|Conectando.. +01/02/2026 00:00:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:00:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:00:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:00:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:00:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:01:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:01:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:01:06 - 0|CORE|Conectando.. +01/02/2026 00:01:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:01:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:01:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:01:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:01:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:01:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:01:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:01:46 - 0|CORE|Conectando.. +01/02/2026 00:01:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:01:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:01:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:01:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:01:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:02:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:02:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:02:26 - 0|CORE|Conectando.. +01/02/2026 00:02:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:02:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:02:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:02:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:02:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:03:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:03:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:03:06 - 0|CORE|Conectando.. +01/02/2026 00:03:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:03:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:03:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:03:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:03:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:03:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:03:46 - 0|CORE|Conectando.. +01/02/2026 00:03:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:03:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:03:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:03:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:03:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:03:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:04:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:04:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:04:26 - 0|CORE|Conectando.. +01/02/2026 00:04:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:04:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:04:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:04:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:04:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:05:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:05:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:05:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:05:06 - 0|CORE|Conectando.. +01/02/2026 00:05:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:05:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:05:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:05:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:05:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:05:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:05:46 - 0|CORE|Conectando.. +01/02/2026 00:05:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:05:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:05:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:05:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:05:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:06:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:06:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:06:26 - 0|CORE|Conectando.. +01/02/2026 00:06:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:06:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:06:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:06:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:06:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:07:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:07:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:07:06 - 0|CORE|Conectando.. +01/02/2026 00:07:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:07:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:07:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:07:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:07:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:07:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:07:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:07:46 - 0|CORE|Conectando.. +01/02/2026 00:07:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:07:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:07:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:07:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:07:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:08:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:08:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:08:26 - 0|CORE|Conectando.. +01/02/2026 00:08:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:08:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:08:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:08:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:08:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:09:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:09:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:09:06 - 0|CORE|Conectando.. +01/02/2026 00:09:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:09:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:09:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:09:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:09:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:09:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:09:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:09:46 - 0|CORE|Conectando.. +01/02/2026 00:09:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:09:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:09:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:09:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:09:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:10:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:10:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:10:26 - 0|CORE|Conectando.. +01/02/2026 00:10:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:10:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:10:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:10:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:10:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:11:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:11:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:11:06 - 0|CORE|Conectando.. +01/02/2026 00:11:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:11:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:11:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:11:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:11:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:11:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:11:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:11:46 - 0|CORE|Conectando.. +01/02/2026 00:11:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:11:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:11:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:11:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:11:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:12:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:12:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:12:26 - 0|CORE|Conectando.. +01/02/2026 00:12:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:12:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:12:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:12:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:12:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:13:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:13:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:13:06 - 0|CORE|Conectando.. +01/02/2026 00:13:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:13:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:13:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:13:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:13:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:13:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:13:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:13:46 - 0|CORE|Conectando.. +01/02/2026 00:13:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:13:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:13:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:13:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:13:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:14:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:14:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:14:26 - 0|CORE|Conectando.. +01/02/2026 00:14:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:14:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:14:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:14:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:14:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:15:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:15:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:15:06 - 0|CORE|Conectando.. +01/02/2026 00:15:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:15:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:15:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:15:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:15:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:15:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:15:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:15:46 - 0|CORE|Conectando.. +01/02/2026 00:15:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:15:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:15:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:15:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:15:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:16:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:16:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:16:26 - 0|CORE|Conectando.. +01/02/2026 00:16:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:16:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:16:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:16:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:16:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:17:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:17:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:17:06 - 0|CORE|Conectando.. +01/02/2026 00:17:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:17:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:17:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:17:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:17:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:17:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:17:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:17:46 - 0|CORE|Conectando.. +01/02/2026 00:17:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:17:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:17:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:17:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:17:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:18:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:18:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:18:26 - 0|CORE|Conectando.. +01/02/2026 00:18:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:18:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:18:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:18:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:18:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:19:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:19:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:19:06 - 0|CORE|Conectando.. +01/02/2026 00:19:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:19:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:19:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:19:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:19:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:19:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:19:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:19:46 - 0|CORE|Conectando.. +01/02/2026 00:19:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:19:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:19:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:19:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:19:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:20:26 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:20:26 - 0|CORE|Conectando.. +01/02/2026 00:20:26 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:20:26 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:20:26 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:20:26 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:20:26 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:20:26 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:21:06 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:21:06 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:21:06 - 0|CORE|Conectando.. +01/02/2026 00:21:06 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:21:06 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:21:06 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB +01/02/2026 00:21:06 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:21:06 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:21:46 - 0|CORE|Estableciendo Time Zone UTC -3 +01/02/2026 00:21:46 - 0|CORE|Verificando Estado de la EMA... +01/02/2026 00:21:46 - 0|CORE|Conectando.. +01/02/2026 00:21:46 - 0|CORE|Info de Estado: Fuera de Linea. +01/02/2026 00:21:46 - 0|CORE|Info de Detalle: EMA no conectada. +01/02/2026 00:21:46 - 0|CORE|Info de Acción: Verifique la conexion USB de la EMA. +01/02/2026 00:21:46 - 0|EXCEP|Se espera 40 segundos y se prueba conectar nuevamente .... +01/02/2026 00:21:46 - 0|EXCEP|Información de la excepcion: -> Error: Problemas con la lectura USB diff --git a/src/package.json b/src/package.json index 80a4ca2..eff6942 100644 --- a/src/package.json +++ b/src/package.json @@ -34,7 +34,6 @@ "scripts": { "desktop": "nw . --disable-logging", "web": "node gui_web/express.js iniciar", - "consola": "node core/ema.js console", "reporte": "node core/reporte.js", "cleanBuild": "nw-gyp clean --directory=node_modules/node-hid", "postLINUX": "nw-gyp rebuild --target=0.94.0 --verbose --arch=x64 --directory=node_modules/node-hid",