From d366d2db9728941ffea2ca634a1df5104fe4399a Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Tue, 4 Mar 2025 22:17:30 -0300 Subject: [PATCH] =?UTF-8?q?websocket=20part2=20|=20notifica=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/htmx_views.cpython-310.pyc | Bin 4817 -> 5712 bytes gestaoRaul/comandas/htmx_views.py | 40 ++++++- gestaoRaul/db.sqlite3 | Bin 335872 -> 335872 bytes .../orders/__pycache__/views.cpython-310.pyc | Bin 2743 -> 2747 bytes gestaoRaul/orders/templates/orders.html | 9 +- gestaoRaul/orders/views.py | 2 +- gestaoRaul/templates/base.html | 3 +- .../orders/htmx_list_orders_fila.html | 23 ++-- gestaoRaul/templates/static/base.js | 103 ++++++++++++++++-- .../templates/static/orders/js/orders.js | 50 ++++----- gestaoRaul/websocket/servidor.py | 56 +++++----- 11 files changed, 195 insertions(+), 91 deletions(-) diff --git a/gestaoRaul/comandas/__pycache__/htmx_views.cpython-310.pyc b/gestaoRaul/comandas/__pycache__/htmx_views.cpython-310.pyc index 363284ec5deb901e2e933e11d35172400552d201..7dff6ed0d557c380c325674c35f34d40b7fb67ec 100644 GIT binary patch delta 2254 zcmb7EOKcle6!n`KkH^39C#7zZ1}2U|V;aYGm85M*N~<>gP)OXSeCn2}<9Q>;j^nZ3 zjDc7ad65kp#NsWe`jJ|JgwhqLD;BJZgv6o(u`?19yKWFHQ9zV?#|}TKN}16+@4U}_ zpL_3l-;RDWu3FJ($Oqp~?XSv>!Ozrnp)d80J(J7jj~txHPamGhPvoZ#+`l0l7D$nQ zCmAGj|B!z#85##8HUdx#>$O^eS+r?5HrtQg&+~?SgdF7eN8gb=n6zZrO@M;xm)nhSWv1%N~;%=~-fI0y++9YqsXdm5$E&5E)es|A4 zb=yz(@J|Ez(SBESBd+3x-2ff9<=+sOe3`)oHU#H5)e)_doe|hLmz6W^N$BbXOU%-# zq1#UDSV-I9o28YvHKV56_FQ^3Yv_!owF=$l+19@F(Vf>=o;=z*H=A2-PwqVV=~ff9 ztk#-_C7)u&S(v09cg#9%n{~&W(OUcehhgjbQ%){59mlF~`>N#Bvkg{R)!ABFv+72z zVyw)y)6}f#YZvv>*uGPhn!YcS-toH2?`F%UGndXaOj@Cqoog_&p|eW8oNI05(i)6A ztWqwUY%cBX((TfjXEkCvdPBE++YCH8*!-c=zw==_{E?E;Hsy}wtToI|VAZs3y=->; zHOtUzMaii&EOvgm?)=BuT%^ zSp3p&k}PdWiu|h(#_?T5`9)2tBt-TI>;kM~hydH4A4nLAC*f=SQD~&?3RI+$D^_Ld z2Mkmd(537OfB{gTa!cMI>yi_^6LP|?v_b9?;&c2oNJAB}K|qP&g-ya=7OWWfumrq>*k>C_t5v?iWlTzjyov6pc6vGX`xwjJGR+8x1K$wZif0~*2v0&1F_ zM!=h}LkKenXAu?<77@^?89&SOSHr2WXM}6BB(H{_J#iVRJpiBzGEs=|*YA03OI0F- zy$QpH0I>bxQyPTgdFxC5dH8hOQCu0kAgl+#SHWtC`d7fsPPj^{f-6$_eX_2&;+@D{ zA9yKB15`mzxk}Yf!+>fv27Zm)7HQP;YtV_`NjOP2*!622;?T40bA42G1vlXOaYq{S z-o3Uj6Yo8IY#L6+`T;JoC8X&6<{$t*1rI)X@DcdC7XU-A8z4+-b)zGLN=?UX_5F7k z0@Mo&E_f1Q9w4)e1(0jLHlP<28QYld-FTp<*f4^Z)g#ExAb7F7gv<-xlj7FZL8z;P zH*mTqfdVpbm%YeRJ{1s!$9kc?7a5zXLEC--KoX_Ls+c4y{2>wn{CA+Cy%kp!5rk3X zKS$;dpa(m0;rOMq3#T{z%)65Yecda*h79v=Q|z8=oYUxN;yviGaVlmKWX)B6BYLI3 zyVQwS7MJEvcBI9^`~tgz_HXf+I!r#`d9{y}_`Lcxndb4>>;2bYa4VQItW~{EbvqO3 zNQK3vi|}f+V?)E96Fr}LdGDPBg_BXXPx3`fgQww#Se9Jpk@yIy@dNR7*}yHQ`Th8C z(L}n8HbI7p|A(Nwdt#om3c}y}cv}Q|Ti{R?!SjC_Ss7u4PbAXh9zUN*kyTzvJUr}4 uFp6U+!EOc|M263grz%!Nb`_z7fFWb6+)AEHjfRL4hcXC7hN3`8sN_%bsn7HP delta 1497 zcmYjQ&u`pR5Z-5dZLins?63S%8{{Mk)TP^%Xwybv396E`phB`VEmhN&;P{zlmyI1g zJ3(DJ${`1k5aRHTv?$!#10d9YpoabEH?EEJ3kTnmdo-nlmPgS9ISR6dDj>-A3Pxt)zLiXVL~%}6BW&lHcGeDr$uI2o(K z0X7M+ns+;$CJX7d7f0+AhF{^OVugRIzD&;W@6?(x0Ks`!QIY?yez3O{8;O>vNtWs~ z_l2^XOL7PDHyM(N^VFdEL~Wa2WvH1b0yW_k60KbjmIap89)P`pB-bv&vv|KiOSBAL ziB|fjtB{3N2JdI-&^>jZ>>6?Tpb}RTga4vUP7Nn=VkUZ$Pc%AmFS{?VWSr3@HU=y& zrgFF*ITEY!s{YpAG=$RJItyLuxl!C5Y0%b=?RDHJdSha<=DCbc%r!R7&UJH*Iy{6a z+cmp8_`VwfKylvqYf96pYg z5F2$lF?Iv|s0^UU%DC(e26Fh8)^=Mr|3!D5< z?!8pVKO!{$yI3fF1X~fF!7f4%Z}QR7t|P-TrjDg8{&^DoQqkKTr@=efGq(=&3+RB0}+T!jJtr#v<;W>ho_ zNisn<3zpOGQH?h$Hq7YlN{#IB&nuIp#lNrY?tO^aNV8kmaXZ_7t^cQV&A{D!;jwj0 z^8uV3%cE^090`Wg!mtND!2}2KdhLJRx`X>doe8ukfW$UL3m;bp$Y=a%b(pmIAJt!H v-o=Ch!qFdi23?$1F`(=^S~n5a5LyUr{^#K3;bR8THCQGr6_yUGWRd>>in~IC diff --git a/gestaoRaul/comandas/htmx_views.py b/gestaoRaul/comandas/htmx_views.py index 2aea7a9..9bd6182 100644 --- a/gestaoRaul/comandas/htmx_views.py +++ b/gestaoRaul/comandas/htmx_views.py @@ -13,7 +13,7 @@ import asyncio import websockets async def enviar_mensagem(msg): - uri = "ws://localhost:8765" # Substitua pela URI do seu servidor WebSocket + uri = "ws://192.168.1.150:8765" async with websockets.connect(uri) as websocket: await websocket.send(msg) print(f"> Enviado: {msg}") @@ -66,7 +66,17 @@ def addProduct(request, product_id, comanda_id): order.save() msg = JsonResponse({ 'type': 'broadcast', - 'message': f'

{product.name}

{obs}

{comanda.name} - {comanda.mesa.name}

Atendente: {comanda.user.first_name}

{order.queue}

', + 'message': f""" +
+

{product.name}

+ +

{comanda.name} - {comanda.mesa.name}

+

Atendente: {comanda.user.first_name}

+

{order.queue}

+
+ """, 'local':'cozinha', 'tipo':'add', 'id':order.id, @@ -83,6 +93,15 @@ def editOrders(request, productComanda_id, obs): order = Order.objects.get(productComanda=productComanda_id) order.obs = obs order.save() + msg = JsonResponse({ + 'type': 'broadcast', + 'message': obs, + 'local':'cozinha', + 'tipo':'edit', + 'id':order.id, + 'speak': f'Pedido alterado! {order.id_product.name}, é {obs}.' + }) + asyncio.run(enviar_mensagem(msg)) return JsonResponse({'status': 'ok'}) @@ -95,8 +114,23 @@ def removeProductComanda(request, productComanda_id): comanda = Comanda.objects.get(id= product_comanda.comanda.id) parcial = Payments.objects.filter(comanda=comanda) consumo = ProductComanda.objects.filter(comanda=comanda) - product_comanda.delete() valores = somar(consumo,comanda) + if product_comanda.product.cuisine == True: + order = Order.objects.get(productComanda=product_comanda) + product_comanda.delete() + msg = JsonResponse({ + 'type': 'broadcast', + 'message': 'Atenção! Pedido cancelado', + 'local':'cozinha', + 'tipo':'delete', + 'id':order.id, + 'speak': f'Pedido cancelado! {order.id_product.name}.' + }) + asyncio.run(enviar_mensagem(msg)) + # order.delete() + else: + product_comanda.delete() + return render(request, "htmx_components/comandas/htmx_list_products_in_comanda.html",{'config':config, 'valores': valores,'parcials':parcial,'consumo': consumo, 'comanda':comanda}) @group_required(groupName='Garçom') diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 8417e5c7551fb31f402c10797d2f35e5d95b25cb..92eceff492c76f7eb6e73e0aaf63f69ff4339ef8 100644 GIT binary patch delta 5909 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 hr>=KM$J8AB{}P9zzcCI=;AOxgP4xf( delta 2589 zcmYjS3vd(H72SP%cULRzO2)_te=uuX_FBf4cUM~dXk82c5cr2Fb!5xHN4UDA2|U+qA=PV3umo zBN)^|!T$9t8fmvyp&7EKTOK3q*VJ&(F#1P3OI0r4ahP&^(l7R{bM*8n;ANUmN@dHjNNxJoS24S|%8Rm{%^kpn@OxRk-ROQ_r??v|>hccg2$>Js`Ivr+8D-Ivgd%y)?J zjCWCvDZh&f9E&_GBUMwphsdd>ydD@A3Fdi-o@y%V37$cSp2PYcqGBQS2NS$Q3uap7A(1jifhCb;xZEa_>&0&HAA9pf@G^(Sku^% zsBPitdsJ<)#0!LLZmEsSwRLh$d|pSjHeps3Fzbb`xR1@M6sW9pOlzXOqZ-l~^ZWu; zl%|{N8s$2}*e5j<+?`HMb|4y`$Pj@G$ zP@ra}LaY&CeboLGmQue=p+fy4g(cL!6c$sx=1DMzf>>@MCS7*=2d2b?5F=a z%$r|fJPhG3W4@Ys6aS~0sU?n!j;)s)8S`=@XaUA;vtzy+%CL4F$>xG?I7H){HxQ3= zHo-!3@eOp8CF{C6h}A7H%`AKgZt$%oR43=!=E`*Lb9$vCQb;@{);k6rPuj=q%Y<9P z8rv<~YW_aIi5Iw?TsGUsDsTkKnb(*Ix{AI@w!#5=4P8Tfs1K;KR4>)p6VFAy#W=Ya z+_?8=uoJ|@m;8j;)h8Xdyp|BBF zy$oB3S6qcMmMu_{St+N>@P~9Q5{MF~tR&rOGU$(J!LSx0#SyUK)5B28^JSLLk$N}0a0D{2d&HtQTeK}rUl{=>-Z=uZBwGz-Pd7$Maw%t? zZo~p1zorE=ohYkGQdU2$)>-{57=sWZ$E&Lc>UrBfD<`CLZXG41YDS?HYi%#@59$V?&ncZ2osGHO-~>3KtVo-cDf7?D^0c{-m0`Sg z4Deg!dnq$RBPAn#U5y%=PICVSyY@gOf?wmRJy6aQ-nx=Ed_g$M?v)pkfYdAA#GE9+;3Gh=%dV=TORQLl^Lw*U%o^{XX2l z>+i!V{HuO+0&jjD72&~gn9me#SMa5AE9nGjb>a4sRH~_F#{|5d$&9#;_fJ`Q#D(J% g;LcP7F)eDX64|R>rf_>vD%N9TaTY&9f<(!zYFkCH!D~4y#lN z=0;E?E1fw}a-bhWBtdgr=Lt$;R(JxI@so)&Wqxp(;VK?a*N2?tJHUBxjUYAKvIhpc z^X%GPkliMzxSdYx=81#_4lOd61ZO$8PRF5@aLWJi$-f3^L8k9DfM$+cG**lP)b^Hm^&_p2}Y zO|ddD9=dzv8&IJ$_0B)rXeb@`I~}-z_pOIw3tw0Zx9gMwTLiv07U-8Eqq)K&zOx=w zHn^IjqDB{zsNd@Og=~JXgjIXryP!@TkL`U?$2Wul3g;lm)LiCvJS(U%@Q)y)Fn*p{ JMI1UiKLMbalePc= delta 692 zcmZ`$%}(1u5XNzAVk4^#kW%ww5QrZW6e_9+!~qV7a_EHvr(7b}-h>sFZOz&s&OE|g z`U)JYO6{TQwUv6P)Ke?J1n>sz1d&9kx`%IPzWMofX1~_H)U3p^%rSYK-S6EGAFbcY zi>WKIzr7tLfghbGBEtuz<+O||_Fg2x1^@ZS zv$~`#;vW?!rih&;c!_y=_lQzG6LezcBou0wWl$p5A=gNOr9SYuTa<-=$zYa3^8~7d zTMZWQu3VdSi5b-;ZVg?{DX&Qr?^OrSw6L=x9nTtQ!YU;WG%Fn*b8*f>Sf@Z=u^9Ko zbsX@dP$7?Dl7jRI*dQ31m)ttK`kYe7eckIW6VX#0nsijv2wBACfd9z;U!x)WzM@nV(1s=Z)+@n`ybJqzsCJu+IFBM&!o$k((GCUmjAwb26k3o#DzA z)R!_md$6CUh4g<6=J7}6zI5|2(-Q{eJ*$d0=H4UuppLu% diff --git a/gestaoRaul/orders/templates/orders.html b/gestaoRaul/orders/templates/orders.html index d6c1740..7cfd379 100644 --- a/gestaoRaul/orders/templates/orders.html +++ b/gestaoRaul/orders/templates/orders.html @@ -41,7 +41,7 @@
{% for order in orders %} {% if order.preparing == None and order.productComanda != Null %} -
{% endif %} {% endfor %} -
{% for order in orders %} {% if order.finished == None and order.preparing != None %} -
{% for order in orders %} {% if order.delivered == None and order.finished != None %} -
{% for order in orders %} {% if order.delivered != None %} -
Enviado: {message}") diff --git a/gestaoRaul/templates/base.html b/gestaoRaul/templates/base.html index 4b4167f..a4d9638 100644 --- a/gestaoRaul/templates/base.html +++ b/gestaoRaul/templates/base.html @@ -26,6 +26,7 @@

+
    @@ -52,7 +53,7 @@
- {{ user.first_name }} {{ user.last_name }} +
{{user.first_name}} {{user.last_name}}
diff --git a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html index 68e17aa..d5d487b 100644 --- a/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html +++ b/gestaoRaul/templates/htmx_components/orders/htmx_list_orders_fila.html @@ -1,17 +1,10 @@ - -
{% for order in orders %} {% if order.preparing == None and order.productComanda != Null %} -

{{order.id_product.name}}

-

{{order.obs}}

+

{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

@@ -36,7 +29,7 @@ {% for order in orders %} {% if order.finished == None and order.preparing != None %} -

{{order.id_product.name}}

-

{{order.obs}}

+

{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

@@ -59,7 +52,7 @@
{% for order in orders %} {% if order.delivered == None and order.finished != None %} -

{{order.id_product.name}}

-

{{order.obs}}

+

{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

@@ -83,7 +76,7 @@ {% for order in orders %} {% if order.delivered != None %} -

{{order.id_product.name}}

-

{{order.obs}}

+

{{order.obs}}

{{order.id_comanda.name}} - {{order.id_comanda.mesa.name}}

Atendente: {{order.id_comanda.user.first_name}}

{{order.queue|date:"D"}} {{order.queue|date:"d/m/Y - H:i"}}

diff --git a/gestaoRaul/templates/static/base.js b/gestaoRaul/templates/static/base.js index 702ee59..a33130c 100644 --- a/gestaoRaul/templates/static/base.js +++ b/gestaoRaul/templates/static/base.js @@ -1,5 +1,36 @@ +function verificarCookieNotificacao() { + console.log('cookie notificacao verificado'); + if (document.cookie.indexOf('notificacao=') === -1) { + document.cookie = 'notificacao=true; expires=Fri, 31 Dec 9999 23:59:59 GMT; path=/'; + var iconNotify = document.getElementById('icon-notify'); + iconNotify.style.backgroundColor = 'green'; + console.log('cookie notificacao criado'); + }else{ + let valorAtual = document.cookie.replace(/(?:(?:^|.*;\s*)notificacao\s*\=\s*([^;]*).*$)|^.*$/, "$1"); + var iconNotify = document.getElementById('icon-notify'); + iconNotify.style.backgroundColor = valorAtual === 'true' ? 'green' : 'red'; + } +} +verificarCookieNotificacao(); -const websocket = new WebSocket('ws://localhost:8765'); +function cookieNotificacao() { + if (document.cookie.indexOf('notificacao=') !== -1) { + let valorAtual = document.cookie.replace(/(?:(?:^|.*;\s*)notificacao\s*\=\s*([^;]*).*$)|^.*$/, "$1"); + var iconNotify = document.getElementById('icon-notify'); + let novoValor = valorAtual === 'true' ? 'false' : 'true'; + if (novoValor === 'true') { + iconNotify.style.backgroundColor = 'green'; + }else{ + iconNotify.style.backgroundColor = 'red'; + } + document.cookie = 'notificacao=' + novoValor + '; expires=Fri, 31 Dec 9999 23:59:59 GMT; path=/'; + } else { + document.cookie = 'notificacao=true; expires=Fri, 31 Dec 9999 23:59:59 GMT; path=/'; + } +} + +const websocket = new WebSocket('ws://192.168.1.150:8765'); +const nomeUsuario = document.getElementById('user-info').textContent; websocket.addEventListener('open', (event) => { console.log('Conectado ao servidor WebSocket'); @@ -7,18 +38,66 @@ websocket.addEventListener('open', (event) => { websocket.addEventListener('message', (event) => { const data = JSON.parse(event.data); - if (data.local === 'cozinha' && data.tipo === 'add'){ - const novoElemento = document.createElement('div'); - novoElemento.innerHTML = data.message; - var fila = document.getElementById('Fila').appendChild(novoElemento); - texto = new SpeechSynthesisUtterance(data.speak); - window.speechSynthesis.speak(texto); - console.log('Mensagem recebida:', data.local); - } - else if (data.local === 'cozinha' && data.tipo === 'edit'){ - var card = document.getElementById('obs-'+data.id).innerHTML = data.message - console.log('Mensagem recebida:', data.local); + + switch (data.local) { + case 'cozinha': + if (document.getElementById('Fila') !== null && data.tipo === 'add'){ + const novoElemento = document.createElement('div'); + novoElemento.innerHTML = data.message; + var fila = document.getElementById('Fila').appendChild(novoElemento); + let valorAtual = document.cookie.replace(/(?:(?:^|.*;\s*)notificacao\s*\=\s*([^;]*).*$)|^.*$/, "$1"); + if (valorAtual === 'true') { + + texto = new SpeechSynthesisUtterance(data.speak); + window.speechSynthesis.speak(texto); + } + console.log('Mensagem recebida:', data.local); + } + else if (document.getElementById('obs-'+data.id) !== null && data.tipo === 'edit'){ + const obs = document.getElementById('obs-'+data.id) + const card = obs.parentNode; + card.style.backgroundColor = 'rgb(243, 165, 75)'; + obs.innerHTML = data.message; + let valorAtual = document.cookie.replace(/(?:(?:^|.*;\s*)notificacao\s*\=\s*([^;]*).*$)|^.*$/, "$1"); + + if (valorAtual === 'true') { + texto = new SpeechSynthesisUtterance(data.speak); + window.speechSynthesis.speak(texto); + } + console.log('Mensagem recebida:', data.local); + } + else if (document.getElementById('m-card-'+data.id) !== null && data.tipo === 'delete'){ + const card = document.getElementById('m-card-'+data.id) + card.style.backgroundColor = 'rgb(253, 69, 69)'; + // obs.innerHTML = data.message; + let valorAtual = document.cookie.replace(/(?:(?:^|.*;\s*)notificacao\s*\=\s*([^;]*).*$)|^.*$/, "$1"); + + if (valorAtual === 'true') { + texto = new SpeechSynthesisUtterance(data.speak); + window.speechSynthesis.speak(texto); + } + console.log('Mensagem recebida:', data.local); + } + + break; + case 'praca': + console.log('Código a ser executado se expressao === valor2') + break; + case 'guarita': + // Código a ser executado se expressao === valor3 + break; + case 'balcao': + // Código a ser executado se expressao === valor3 + break; + default: + console.log('Local desconhecido:', data); } + + + + + + }); websocket.addEventListener('error', (event) => { diff --git a/gestaoRaul/templates/static/orders/js/orders.js b/gestaoRaul/templates/static/orders/js/orders.js index 20dab2d..3971539 100644 --- a/gestaoRaul/templates/static/orders/js/orders.js +++ b/gestaoRaul/templates/static/orders/js/orders.js @@ -1,7 +1,7 @@ function reloadPage(){ setTimeout(function() { - location.reload();}, 4000); + location.reload();}, 3000); } function openTab(evt, etapa) { @@ -42,15 +42,13 @@ function openTab(evt, etapa) { setTimeout(function() { displayBlock(tab);}, 1000); + // reloadPage(); } displayBlock('Fila'); - - - function mostrarNotificacao(titulo,corpo,grupo) { if (Notification.permission != 'granted') { Notification.requestPermission().then(function(permission) { @@ -71,31 +69,31 @@ function openTab(evt, etapa) { } } -function notificacao(){ +// function notificacao(){ - var resposta = fetch(`/pedidos/notificacao/`, {method: 'GET', - headers: {'Content-Type': 'application/json', - },}) - .then(response => response.json()) - .then(data => { - if (data['notificacao'] == 'true'){ - document.cookie = `fila=${data['fila']}`; - mostrarNotificacao(data['titulo'], data['corpo'],'Cozinha') - texto = new SpeechSynthesisUtterance(data['corpo']+', '+data['titulo']+'.'); - window.speechSynthesis.speak(texto); - reloadPage(); +// var resposta = fetch(`/pedidos/notificacao/`, {method: 'GET', +// headers: {'Content-Type': 'application/json', +// },}) +// .then(response => response.json()) +// .then(data => { +// if (data['notificacao'] == 'true'){ +// document.cookie = `fila=${data['fila']}`; +// mostrarNotificacao(data['titulo'], data['corpo'],'Cozinha') +// texto = new SpeechSynthesisUtterance(data['corpo']+', '+data['titulo']+'.'); +// window.speechSynthesis.speak(texto); +// reloadPage(); - }else{ - console.log(data['notificacao']) - console.log('notificação foi false') - } - }) - .catch(error => { - alert('Erro verificar notificação:', error) - console.error('Erro verificar notificação:', error); - }); +// }else{ +// console.log(data['notificacao']) +// console.log('notificação foi false') +// } +// }) +// .catch(error => { +// alert('Erro verificar notificação:', error) +// console.error('Erro verificar notificação:', error); +// }); - } +// } // setInterval(()=> { diff --git a/gestaoRaul/websocket/servidor.py b/gestaoRaul/websocket/servidor.py index 7975e4a..2a82c29 100644 --- a/gestaoRaul/websocket/servidor.py +++ b/gestaoRaul/websocket/servidor.py @@ -2,70 +2,70 @@ import asyncio import websockets import json import logging +import uuid -# Configure logging + +# Configurar o registro de logs logging.basicConfig(level=logging.INFO) -connected_clients = set() # Keep track of connected clients +connected_clients = set() -async def handle_client(websocket): # Remove 'path' argument - """Handles a single client connection.""" - logging.info(f"Client connected: {websocket.remote_address}") +async def handle_client(websocket): + logging.info(f"Cliente conectado: {websocket.remote_address}") connected_clients.add(websocket) + # for client in connected_clients: + # await client.send(json.dumps({"message": "Novo cliente conectado"})) + # print(client) try: async for message in websocket: - logging.info(f"Received message from {websocket.remote_address}: {message}") - print(f"Received message from {websocket.remote_address}: {message}") + logging.info(f"Mensagem recebida de {websocket.remote_address}: {message}") + print(f"Mensagem recebida de {websocket.remote_address}: {message}") try: data = json.loads(message) - # Process the message here + # Processa a mensagem aqui await process_message(data, websocket) except json.JSONDecodeError: - logging.error(f"Invalid JSON received from {websocket.remote_address}: {message}") - await websocket.send(json.dumps({"error": "Invalid JSON format"})) + logging.error(f"JSON inválido recebido de {websocket.remote_address}: {message}") + await websocket.send(json.dumps({"error": "Formato JSON inválido"})) except Exception as e: - logging.error(f"Error processing message from {websocket.remote_address}: {e}") - await websocket.send(json.dumps({"error": "Error processing message"})) + logging.error(f"Erro ao processar mensagem de {websocket.remote_address}: {e}") + await websocket.send(json.dumps({"error": "Erro ao processar mensagem"})) except websockets.exceptions.ConnectionClosedOK: - logging.info(f"Client disconnected: {websocket.remote_address}") + logging.info(f"Cliente desconectado: {websocket.remote_address}") except websockets.exceptions.ConnectionClosedError: - logging.error(f"Client connection closed with error {websocket.remote_address}") + logging.error(f"Conexão do cliente fechada com erro {websocket.remote_address}") except Exception as e: - logging.error(f"Error during connection from {websocket.remote_address} with error {e}") + logging.error(f"Erro durante a conexão de {websocket.remote_address} com erro {e}") finally: connected_clients.remove(websocket) async def process_message(data, websocket): - """Processes the received message and takes actions.""" - # Example: check if it's a broadcast message if "type" in data and data["type"] == "broadcast" and "message" in data: await broadcast_message(data) - print("Broadcast message:", data["message"]) + print("Mensagem de Broadcast:", data["message"]) elif "type" in data and data["type"] == "echo" and "message" in data: await websocket.send(json.dumps({"response": data['message']})) elif "type" in data and data['type'] == "test": - await websocket.send(json.dumps({"response": "test is ok"})) + await websocket.send(json.dumps({"response": "teste está ok"})) else: - logging.warning(f"Unknown message type or format: {data}") - await websocket.send(json.dumps({"error": "Unknown message type"})) + logging.warning(f"Tipo de mensagem ou formato desconhecido: {data}") + await websocket.send(json.dumps({"error": "Tipo de mensagem desconhecido"})) async def broadcast_message(data): - """Broadcasts a message to all connected clients.""" if connected_clients: - logging.info(f"Broadcasting message: {data}") + logging.info(f"Enviando mensagem por broadcast: {data}") await asyncio.wait([client.send(json.dumps(data)) for client in connected_clients]) else: - logging.info("No clients connected. Message not broadcasted.") + logging.info("Nenhum cliente conectado.") async def main(): - """Starts the WebSocket server.""" - start_server = websockets.serve(handle_client, "localhost", 8765) - logging.info("WebSocket server started on ws://localhost:8765") + start_server = websockets.serve(handle_client, "192.168.1.150", 8765) + logging.info("Servidor WebSocket iniciado em ws://192.168.1.150:8765") await start_server - await asyncio.Future() # Keep the server running indefinitely + await asyncio.Future() # Mantém o servidor em execução indefinidamente if __name__ == "__main__":