Merge pull request #444 from appwrite/fix-realtime-changes-0-14

fix: realtime event model for 0.14 events

Author: TorstenDittmann

templates/android/library/src/main/java/io/appwrite/models/RealtimeModels.kt.twig

@@ -21,7 +21,7 @@ open class RealtimeResponse(
 )
 
 data class RealtimeResponseEvent<T>(
-    val event: String,
+    val events: Collection<String>,
     val channels: Collection<String>,
     val timestamp: Long,
     var payload: T

templates/flutter/lib/src/realtime_message.dart.twig

@@ -2,25 +2,25 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 
 class RealtimeMessage {
-  final String event;
+  final List<String> events;
   final Map<String, dynamic> payload;
   final List<String> channels;
   final int timestamp;
   RealtimeMessage({
-    required this.event,
+    required this.events,
     required this.payload,
     required this.channels,
     required this.timestamp,
   });
 
   RealtimeMessage copyWith({
-    String? event,
+    List<String>? events,
     Map<String, dynamic>? payload,
     List<String>? channels,
     int? timestamp,
   }) {
     return RealtimeMessage(
-      event: event ?? this.event,
+      events: events ?? this.events,
       payload: payload ?? this.payload,
       channels: channels ?? this.channels,
       timestamp: timestamp ?? this.timestamp,
@@ -29,7 +29,7 @@ class RealtimeMessage {
 
   Map<String, dynamic> toMap() {
     return {
-      'event': event,
+      'events': events,
       'payload': payload,
       'channels': channels,
       'timestamp': timestamp,
@@ -38,7 +38,7 @@ class RealtimeMessage {
 
   factory RealtimeMessage.fromMap(Map<String, dynamic> map) {
     return RealtimeMessage(
-      event: map['event'],
+      events: List<String>.from(map['events'] ?? []),
       payload: Map<String, dynamic>.from(map['payload'] ?? <String, dynamic>{}),
       channels: List<String>.from(map['channels'] ?? []),
       timestamp: map['timestamp'],
@@ -52,23 +52,23 @@ class RealtimeMessage {
 
   @override
   String toString() {
-    return 'RealtimeMessage(event: $event, payload: $payload, channels: $channels, timestamp: $timestamp)';
+    return 'RealtimeMessage(events: $events, payload: $payload, channels: $channels, timestamp: $timestamp)';
   }
 
   @override
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
 
     return other is RealtimeMessage &&
-        other.event == event &&
+        listEquals(other.events, events) &&
         mapEquals(other.payload, payload) &&
         listEquals(other.channels, channels) &&
         other.timestamp == timestamp;
   }
 
   @override
   int get hashCode {
-    return event.hashCode ^
+    return events.hashCode ^
         payload.hashCode ^
         channels.hashCode ^
         timestamp.hashCode;

templates/swift/Sources/Models/RealtimeModels.swift.twig

@@ -22,18 +22,18 @@ public class RealtimeCallback {
 }
 
 public class RealtimeResponseEvent {
-    public let event: String?
+    public let events: [String]?
     public let channels: [String]?
     public let timestamp: Int64?
     public var payload: [String: Any]?
 
     init(
-        event: String,
+        events: [String],
         channels: [String],
         timestamp: Int64,
         payload: [String: Any]
     ) {
-        self.event = event
+        self.events = events
         self.channels = channels
         self.timestamp = timestamp
         self.payload = payload

templates/swift/Sources/Services/Realtime.swift.twig

@@ -192,6 +192,9 @@ extension Realtime: WebSocketClientDelegate {
         guard let channels = data["channels"] as? Array<String> else {
             return
         }
+        guard let events = data["events"] as? Array<String> else {
+            return
+        }
         guard let payload = data["payload"] as? [String: Any] else {
             return
         }
@@ -204,7 +207,7 @@ extension Realtime: WebSocketClientDelegate {
         for subscription in activeSubscriptions {
             if channels.contains(where: { subscription.value.channels.contains($0) }) {
                 let response = RealtimeResponseEvent(
-                    event: data["event"] as! String,
+                    events: events,
                     channels: channels,
                     timestamp: data["timestamp"] as! Int64,
                     payload: payload

templates/web/src/sdk.ts.twig

@@ -37,7 +37,7 @@ type RealtimeRequest = {
 }
 
 export type RealtimeResponseEvent<T extends unknown> = {
-    event: string;
+    events: string[];
     channels: string[];
     timestamp: number;
     payload: T;