temporary fix for websockets

This commit is contained in:
j3d1 2023-11-22 23:55:00 +01:00
parent e45a1f271e
commit e2c0ce0a5e
5 changed files with 36 additions and 20 deletions

View file

@ -19,12 +19,16 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'core.settings')
django_asgi_app = get_asgi_application() django_asgi_app = get_asgi_application()
websocket_asgi_app = AllowedHostsOriginValidator( # websocket_asgi_app = AllowedHostsOriginValidator(
#AuthMiddlewareStack( # AuthMiddlewareStack(
URLRouter( # URLRouter(
websocket_urlpatterns # websocket_urlpatterns
) # )
#) # )
# )
websocket_asgi_app = URLRouter(
websocket_urlpatterns
) )
application = ProtocolTypeRouter({ application = ProtocolTypeRouter({

View file

@ -184,7 +184,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
CHANNEL_LAYERS = { CHANNEL_LAYERS = {
'default': { 'default': {
'BACKEND': 'asgi_redis.RedisChannelLayer', 'BACKEND': 'channels_redis.core.RedisChannelLayer',
'CONFIG': { 'CONFIG': {
'hosts': [('localhost', 6379)], 'hosts': [('localhost', 6379)],
}, },

View file

@ -1,4 +1,6 @@
import json from json.decoder import JSONDecodeError
from json import loads as json_loads
from json import dumps as json_dumps
from channels.generic.websocket import AsyncWebsocketConsumer from channels.generic.websocket import AsyncWebsocketConsumer
@ -6,12 +8,12 @@ from channels.generic.websocket import AsyncWebsocketConsumer
class NotifyConsumer(AsyncWebsocketConsumer): class NotifyConsumer(AsyncWebsocketConsumer):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(args, kwargs) super().__init__(args, kwargs)
self.room_group_name = None self.room_group_name = "general"
self.event_slug = None # self.event_slug = None
async def connect(self): async def connect(self):
self.event_slug = self.scope["url_route"]["kwargs"]["event_slug"] # self.event_slug = self.scope["url_route"]["kwargs"]["event_slug"]
self.room_group_name = f"chat_{self.event_slug}" # self.room_group_name = f"chat_{self.event_slug}"
# Join room group # Join room group
await self.channel_layer.group_add(self.room_group_name, self.channel_name) await self.channel_layer.group_add(self.room_group_name, self.channel_name)
@ -24,17 +26,25 @@ class NotifyConsumer(AsyncWebsocketConsumer):
# Receive message from WebSocket # Receive message from WebSocket
async def receive(self, text_data): async def receive(self, text_data):
text_data_json = json.loads(text_data) try:
message = text_data_json["message"] text_data_json = json_loads(text_data)
message = text_data_json["message"]
# Send message to room group # Send message to room group
await self.channel_layer.group_send( await self.channel_layer.group_send(
self.room_group_name, {"type": "chat.message", "message": message} self.room_group_name, {"type": "chat.message", "message": message}
) )
except JSONDecodeError:
await self.send(text_data=json_dumps({"message": "error", "error": "malformed json"}))
except KeyError as e:
await self.send(text_data=json_dumps({"message": "error", "error": f"missing key: {str(e)}"}))
except Exception as e:
await self.send(text_data=json_dumps({"message": "error", "error": "unknown error"}))
raise e
# Receive message from room group # Receive message from room group
async def chat_message(self, event): async def chat_message(self, event):
message = event["message"] message = event["message"]
# Send message to WebSocket # Send message to WebSocket
await self.send(text_data=json.dumps({"message": message})) await self.send(text_data=json_dumps({"message": message}))

View file

@ -3,6 +3,6 @@ from django.urls import path
from .consumers import NotifyConsumer from .consumers import NotifyConsumer
websocket_urlpatterns = [ websocket_urlpatterns = [
path('ws/notify/<str:event_slug>/', NotifyConsumer.as_asgi()), path('ws/notify/', NotifyConsumer.as_asgi()),
] ]

View file

@ -14,6 +14,7 @@ coreschema==0.0.4
coverage==7.3.2 coverage==7.3.2
Django==4.2.7 Django==4.2.7
django-extensions==3.2.3 django-extensions==3.2.3
django-mysql==4.12.0
django-soft-delete==0.9.21 django-soft-delete==0.9.21
djangorestframework==3.14.0 djangorestframework==3.14.0
drf-yasg==1.21.7 drf-yasg==1.21.7
@ -26,6 +27,7 @@ Jinja2==3.1.2
MarkupSafe==2.1.3 MarkupSafe==2.1.3
msgpack==1.0.7 msgpack==1.0.7
msgpack-python==0.5.6 msgpack-python==0.5.6
mysqlclient==2.2.0
openapi-codec==1.3.2 openapi-codec==1.3.2
packaging==23.2 packaging==23.2
Pillow==10.1.0 Pillow==10.1.0