Chat scalability changes v1 (#87)

* Scalability changes: modify update group methods (#67) * feat: add getGroupInfo function * chore: add deprecation notice to getGroupByName * feat: add getGroupMemberCount function * feat: add getGroupMembers functions * feat: add getAllGroupMembers function * feat: add getGroupMemberStatus function * feat: ad getGroupMembersPublicKeys function * feat: add getAllGroupMembersPublicKeys function * feat: add updateGroupConfig, updateGroupMembers, updateGroupProfile * feat: add addMembers, removeMembers, addAdmins, removeAdmins * fix: only show group requests for members and not creator * Revert "fix: only show group requests for members and not creator" This reverts commit 0268196. * chore: add ConnectedUser extends User --------- Co-authored-by: Gbogboade Ayomide <[email protected]> * Scalability changes: add pgpv2 encryption in approve request (#68) * feat: add getGroupInfo function * chore: add deprecation notice to getGroupByName * feat: add getGroupMemberCount function * feat: add getGroupMembers functions * feat: add getAllGroupMembers function * feat: add getGroupMemberStatus function * feat: ad getGroupMembersPublicKeys function * feat: add getAllGroupMembersPublicKeys function * feat: add updateGroupConfig, updateGroupMembers, updateGroupProfile * feat: add addMembers, removeMembers, addAdmins, removeAdmins * fix: only show group requests for members and not creator * Revert "fix: only show group requests for members and not creator" This reverts commit 0268196. * chore: add ConnectedUser extends User * feat: add scalability changes to approve request --------- Co-authored-by: Gbogboade Ayomide <[email protected]> * Implement scalability changes in encryption and decryption of messages (#70) * feat: implement scalability changes for send message * chore: remove unused code for update group profile * chore: add scalability changes for decrypt --------- Co-authored-by: Gbogboade Ayomide <[email protected]> * Remove the user property from the ConnectedUser class (#75) * feat: add scalability changes fo updarte group * chore: add fromUser constructor for ConnectedUser --------- Co-authored-by: Gbogboade Ayomide <[email protected]> Co-authored-by: Madhur Gupta <[email protected]> * Update example app to incorporate scalability changes (#80) * feat: add update group info screen * feat: implement group scalability changes in example app * feat: disconnect socket when account logs out --------- Co-authored-by: Gbogboade Ayomide <[email protected]> Co-authored-by: Madhur Gupta <[email protected]>
push-protocol · Dec 22, 2023 · 782b30c · 782b30c
1 parent 94214aa
commit 782b30c
Show file tree

Hide file tree

Showing 83 changed files with 1,485 additions and 778 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/example/lib/test_functions/chat/__chats.dart b/example/lib/test_functions/chat/__chats.dart
@@ -24,3 +24,6 @@ export 'get_all_group_members.dart';
 export 'get_group_member_status.dart';
 export 'get_group_members_public_keys.dart';
 export 'get_all_group_members_public_keys.dart';
+export 'update_group_config.dart';
+export 'update_group_profile.dart';
+export 'update_group_members.dart';
diff --git a/example/lib/test_functions/chat/create_group_public.dart b/example/lib/test_functions/chat/create_group_public.dart
@@ -4,7 +4,7 @@ import 'package:ethers/signers/wallet.dart' as ether;
 
 import '../../models/signer.dart';
 
-void testCreateGroupPublic() async {
+Future testCreateGroupPublic() async {
   final ethersWallet = ether.Wallet.fromPrivateKey(
       "c41b72d56258e50595baa969eb0949c5cee9926ac55f7bad21fe327236772e0c");
 
@@ -23,6 +23,6 @@ void testCreateGroupPublic() async {
 
   print(result);
   if (result != null) {
-    print('testCreateGroup response: ${result}');
+    print('testCreateGroup response: ${result.chatId}');
   }
 }
diff --git a/example/lib/test_functions/chat/fetch_chats.dart b/example/lib/test_functions/chat/fetch_chats.dart
@@ -25,10 +25,10 @@ testAES() {
 
 testSign() async {
   try {
-    final result = await signMessageWithPGP(
-        message: 'message',
-        publicKey: '',
-        privateKeyArmored: 'privateKeyArmored');
+    final result = await signMessageWithPGPCore(
+      message: 'message',
+      privateKeyArmored: 'privateKeyArmored',
+    );
 
     print('testSign: result $result');
   } catch (e) {

diff --git a/example/lib/test_functions/chat/send.dart b/example/lib/test_functions/chat/send.dart
@@ -31,10 +31,10 @@ void testSend() async {
   print('pgpPrivateKey: $pgpPrivateKey');
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     messageContent: 'Testing send() from Dart SDK for w2w chat',
-    receiverAddress: '0x69e666767Ba3a661369e1e2F572EdE7ADC926029',
+    to: '0x69e666767Ba3a661369e1e2F572EdE7ADC926029',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_composite.dart b/example/lib/test_functions/chat/send_composite.dart
@@ -28,14 +28,13 @@ Future<void> testSendComposite() async {
   }
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: CompositeMessage(content: [
       NestedContent(type: MessageType.TEXT, content: "inner message 1"),
       NestedContent(type: MessageType.TEXT, content: "inner message 2")
     ]),
-    receiverAddress:
-        '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
+    to: '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_file.dart b/example/lib/test_functions/chat/send_file.dart
@@ -28,14 +28,14 @@ Future<void> testSendFile() async {
   }
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: FileMessage(
-        content: "data:text/plain;base64,VmVuZ2VhbmNlMjM0NUAjJCU=",
-        name: "something.txt",
-        type: "text/plain"),
-    receiverAddress:
-        '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
+      content: "data:text/plain;base64,VmVuZ2VhbmNlMjM0NUAjJCU=",
+      name: "something.txt",
+      type: "text/plain",
+    ),
+    to: '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_group.dart b/example/lib/test_functions/chat/send_group.dart
@@ -31,11 +31,10 @@ Future<void> testSendToGroup() async {
   print('pgpPrivateKey: $pgpPrivateKey');
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     messageContent: 'Testing send() from Dart SDK for group chat',
-    receiverAddress:
-        '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
+    to: '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_group_meta.dart b/example/lib/test_functions/chat/send_group_meta.dart
@@ -28,14 +28,16 @@ Future<void> testSendToGroupMeta() async {
   }
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: MetaMessage(
-        info: Info(
-            affected: [ethersWallet.address!], arbitrary: {'key': 'value'}),
-        content: CHAT.META_GROUP_CREATE),
-    receiverAddress:
-        '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
+      info: Info(
+        affected: [ethersWallet.address!],
+        arbitrary: {'key': 'value'},
+      ),
+      content: CHAT.META_GROUP_CREATE,
+    ),
+    to: '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_image.dart b/example/lib/test_functions/chat/send_image.dart
@@ -28,15 +28,14 @@ Future<void> testSendImage() async {
   }
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: ImageMessage(
       name: "something.png",
       content:
           "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARMAAAC3CAMAAAAGjUrGAAAAjVBMVEX///+8AC27ACq6ACC6ACK7ACe6AB65ABu+AC+8ACi7ACX88/W3AAC4ABP77/K5ABf23eTy0NfwytLrwcjimqnXdInLVmjFQFTBI0G/CTTtvcjclKC4AA756OzPU23XeYvEMUvKSWHTaX6/FDjosLvZgZHFNE/z1dzlqLTQYHXKQV7orLrWfIrPVm/nvMFRtU1mAAADLklEQVR42u3d2XKjMBCFYbcQBuQFEydesGNDvGT3+z/eXEzNzaCpyQJKNf6/RziFpHZby2AAAAAAAAAAAAAAAAAAAAAGg8FoVtzM55fLZT6/KWaja09jWtzeLZardZrZJE9slq5Xy8XdbTG90mRG5Wax3iaRy4wx8psxJnNRsl0vNuXVxXJ/2eXDofuTxd+MGw7z3eX+ihIp9tXQyf+4YbUvriSRst5GRj7CRNu6vIZZpLJOPs7Zqu8zS1knsXxOnPT6W5k9jJ18nhs/zPo6bDaHSL4mOmx6OYDudxMjX2Umux4uzEdr5TusPfZt3Jyske8x9tSr8TOqE/m+pO5RKLMqkjZEVW/Wn+JspR323JNi/9E5aYtzj734StaZtCdbF32YS5y0yemfU6YrK+2yq6nySHaRtC3a6Q5ln0j7kr3mSJ66iEQkeVI8v4rpJBMjaufZUW2lG1ZtlX/KpSv5SenIiU1nmZhY5+h5ttId+6yyiTSRLk0Utpim57jTTOKzvsrtaSjdGuorUlLTcSYmZTZRP6OMlnHnmcRLXYXbPJfu5XNqE901yuxgAmRiDpqK2c4XYoXL8YsLkol7UVTDjiWMsZ5a9jUPlEn+qiaTtyhQJtGbmqFTx4EyiWstg2eWmkCZmFTLalxOJJSJlu1/pyhYJpGWvuy7C5aJe1eSSWWCZWIqJX2CQ8BMDjr6BUUaMJNUx3aUMpNwMh0LT+kCZuJ0ZHK0ATNRspP4GAXMJNKRSaCGkqq2UkcbcVRvz+E7YT5h3aE+oY7l9w6/i+mf0GejH6uyH0vfnv93PoL/AT34v7iJfQWewcP+kyb2Kf1YW0nVfjb2PXqwP7aJfdSefgH77T1NWc5lNHF+5weWY4XnvDgPGH5Gmai8mozzxZ5ilnPonr4s9xU0CzfutfCMHu4/8RQp3JPTxH1KnsqNe7c8oXA/m2ee5R6/Ju579OBeUN+Xwv2xvjmFe4Y9VT73UTdD4d5yX4uJ++2beAfBN354L8O3/vCuigfv7/gGEO80+b8V3vPyFPu8++ZbmHkf0D+z8I6kLxbeG/1XMrxLCwAAAAAAAAAAAAAAAABA0y/RclUO6yXgjgAAAABJRU5ErkJggg==",
     ),
-    receiverAddress:
-        '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
+    to: '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_media_embed.dart b/example/lib/test_functions/chat/send_media_embed.dart
@@ -28,14 +28,13 @@ Future<void> testSendMediaEmbed() async {
   }
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: SendMessage(
         type: MessageType.MEDIA_EMBED,
         content:
             "https://media2.giphy.com/media/p0L1rezLH2Tja/giphy.gif?cid=c918c0ff667b3vbiu4i4e5d1t9sqssx8uvy10reprq8yds23&ep=v1_gifs_trending&rid=giphy.gif&ct=g"),
-    receiverAddress:
-        '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
+    to: '83e6aaf9fb44c5929ea965d2b0c4e98fd8b6094b72f51989123f81e6cf69f298',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_reaction.dart b/example/lib/test_functions/chat/send_reaction.dart
@@ -46,11 +46,11 @@ Future<void> testSendReaction() async {
   }
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: ReactionMessage(
         content: CHAT.REACTION_THUMBSUP, reference: referenceLink),
-    receiverAddress: groupId,
+    to: groupId,
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/send_reply.dart b/example/lib/test_functions/chat/send_reply.dart
@@ -46,14 +46,14 @@ Future<void> testSendReply() async {
   }
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: ReplyMessage(
         content: NestedContent(
             type: MessageType.TEXT,
             content: "reply message sent from the Dart SDK"),
         reference: referenceLink),
-    receiverAddress: groupId,
+    to: groupId,
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/chat/update_group_config.dart b/example/lib/test_functions/chat/update_group_config.dart
@@ -0,0 +1,10 @@
+import 'package:push_restapi_dart/push_restapi_dart.dart';
+
+void testUpdateGroupConfig() async {
+  final result = await updateGroupConfig(
+      scheduleAt: DateTime.now().add(Duration(hours: 3)),
+      chatId:
+          '64434400c9a61256451f025f1f8c7b34d9651af4a03ca063126e137572fb85ca');
+
+  print(result);
+}
diff --git a/example/lib/test_functions/chat/update_group_members.dart b/example/lib/test_functions/chat/update_group_members.dart
@@ -0,0 +1,11 @@
+import 'package:push_restapi_dart/push_restapi_dart.dart';
+
+void testUpdateGroupMembers() async {
+  final result = await updateGroupMembers(
+      chatId:
+          'a279ff975a104e8b04806bee18edc2c489b619663d6b192cbb07b4bbfd616e45',
+      upsert:
+          UpsertDTO(admins: ['0x29b8276AA5bc432e03745eF275ded9074faB5970']));
+
+  print(result);
+}
diff --git a/example/lib/test_functions/chat/update_group_profile.dart b/example/lib/test_functions/chat/update_group_profile.dart
@@ -0,0 +1,12 @@
+import 'package:push_restapi_dart/push_restapi_dart.dart';
+
+void testUpdateGroupProfile() async {
+  final result = await updateGroupProfile(
+      groupImage:
+          'https://tmpfiles.org/dl/3250024/screenshot2023-11-26at8.51.05pm.png',
+      chatId:
+          '64434400c9a61256451f025f1f8c7b34d9651af4a03ca063126e137572fb85ca',
+      groupName: 'Ayo New name');
+
+  print(result);
+}
diff --git a/example/lib/test_functions/payload/send_notification.dart b/example/lib/test_functions/payload/send_notification.dart
@@ -38,7 +38,7 @@ void testSendVideoCallNotification() async {
 
   // 5. Decrypt keys in Grp
   final pgpPrivateKey = await push.decryptPGPKey(
-    encryptedPGPPrivateKey: user?.encryptedPrivateKey as String,
+    encryptedPGPPrivateKey: user.encryptedPrivateKey as String,
     wallet: push.getWallet(signer: signer),
   );
 
@@ -47,7 +47,7 @@ void testSendVideoCallNotification() async {
     senderType: 1,
     signer: signer,
     pgpPrivateKey: pgpPrivateKey,
-    pgpPublicKey: user?.publicKey,
+    pgpPublicKey: user.publicKey,
     chatId: group?.chatId,
     type: push.NOTIFICATION_TYPE.BROADCAST, // broadcast
     identityType: push.IDENTITY_TYPE.DIRECT_PAYLOAD, // direct payload

diff --git a/example/lib/test_functions/space/send_live_space_data_meta.dart b/example/lib/test_functions/space/send_live_space_data_meta.dart
@@ -48,11 +48,10 @@ Future<void> testSendLiveSpaceDataMeta() async {
       content: content);
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: metaMessage,
-    receiverAddress:
-        'spaces:cff80fae9b898b9f5d679bfa7ef4dfcb7d31b9d1c12e032f4ec6d84a575e62cb',
+    to: 'spaces:cff80fae9b898b9f5d679bfa7ef4dfcb7d31b9d1c12e032f4ec6d84a575e62cb',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/space/send_live_space_data_ua.dart b/example/lib/test_functions/space/send_live_space_data_ua.dart
@@ -48,11 +48,10 @@ Future<void> testSendLiveSpaceDataUA() async {
       content: content);
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: userActivityMessage,
-    receiverAddress:
-        'spaces:cff80fae9b898b9f5d679bfa7ef4dfcb7d31b9d1c12e032f4ec6d84a575e62cb',
+    to: 'spaces:cff80fae9b898b9f5d679bfa7ef4dfcb7d31b9d1c12e032f4ec6d84a575e62cb',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/space/send_space_reaction.dart b/example/lib/test_functions/space/send_space_reaction.dart
@@ -35,11 +35,10 @@ Future<void> testSendSpaceReaction() async {
       content: content);
 
   final options = ChatSendOptions(
-    accountAddress: ethersWallet.address,
+    account: ethersWallet.address,
     pgpPrivateKey: pgpPrivateKey,
     message: reactionMessage,
-    receiverAddress:
-        'spaces:cff80fae9b898b9f5d679bfa7ef4dfcb7d31b9d1c12e032f4ec6d84a575e62cb',
+    to: 'spaces:cff80fae9b898b9f5d679bfa7ef4dfcb7d31b9d1c12e032f4ec6d84a575e62cb',
   );
 
   final result = await send(options);

diff --git a/example/lib/test_functions/user/test_create_user.dart b/example/lib/test_functions/user/test_create_user.dart
@@ -44,7 +44,7 @@ void testCreateRandomUser() async {
       },
     );
 
-    print(result?.did);
+    print(result.did);
   } catch (e) {
     print(e);
   }

diff --git a/example/lib/views/account_provider.dart b/example/lib/views/account_provider.dart
@@ -1,6 +1,6 @@
 import '../__lib.dart';
 import 'package:push_restapi_dart/push_restapi_dart.dart';
-
+import 'package:socket_io_client/socket_io_client.dart' as io;
 import 'package:ethers/signers/wallet.dart' as ether;
 
 final accountProvider = ChangeNotifierProvider((ref) => AccountProvider(ref));
@@ -97,6 +97,7 @@ class AccountProvider extends ChangeNotifier {
     }
   }
 
+  io.Socket? pushSDKSocket;
   Future<void> creatSocketConnection() async {
     try {
       final options = SocketInputOptions(
@@ -109,26 +110,26 @@ class AccountProvider extends ChangeNotifier {
         ),
       );
 
-      final pushSDKSocket = await createSocketConnection(options);
+      pushSDKSocket = await createSocketConnection(options);
       if (pushSDKSocket == null) {
         throw Exception('PushSDKSocket Connection Failed');
       }
 
-      pushSDKSocket.connect();
+      pushSDKSocket!.connect();
 
-      pushSDKSocket.on(
+      pushSDKSocket!.on(
         EVENTS.CONNECT,
         (data) async {
           print(' NOTIFICATION EVENTS.CONNECT: $data');
         },
       );
       // To get messages in realtime
-      pushSDKSocket.on(EVENTS.CHAT_RECEIVED_MESSAGE, (message) {
+      pushSDKSocket!.on(EVENTS.CHAT_RECEIVED_MESSAGE, (message) {
         print('CHAT NOTIFICATION EVENTS.CHAT_RECEIVED_MESSAGE: $message');
         ref.read(conversationsProvider).onReceiveSocket(message);
       });
 
-      pushSDKSocket.on(EVENTS.SPACES, (groupInfo) {
+      pushSDKSocket!.on(EVENTS.SPACES, (groupInfo) {
         print('SPACES NOTIFICATION EVENTS.SPACES: $groupInfo');
 
         final type = (groupInfo as Map<String, dynamic>)['eventType'];
@@ -149,7 +150,7 @@ class AccountProvider extends ChangeNotifier {
       });
 
       // To get group creation or updation events
-      pushSDKSocket.on(EVENTS.CHAT_GROUPS, (groupInfo) {
+      pushSDKSocket!.on(EVENTS.CHAT_GROUPS, (groupInfo) {
         print('CHAT NOTIFICATION EVENTS.CHAT_GROUPS: $groupInfo');
 
         final type = (groupInfo as Map<String, dynamic>)['eventType'];
@@ -172,7 +173,7 @@ class AccountProvider extends ChangeNotifier {
       });
 
       // To get realtime updates for spaces
-      pushSDKSocket.on(
+      pushSDKSocket!.on(
         EVENTS.SPACES_MESSAGES,
         (data) async {
           final message = data as Map<String, dynamic>;
@@ -228,7 +229,7 @@ class AccountProvider extends ChangeNotifier {
         },
       );
 
-      pushSDKSocket.on(
+      pushSDKSocket!.on(
         EVENTS.DISCONNECT,
         (data) {
           print(' NOTIFICATION EVENTS.DISCONNECT: $data');
@@ -241,6 +242,11 @@ class AccountProvider extends ChangeNotifier {
 
   logOut() {
     pushWallet = null;
+    if (pushSDKSocket != null) {
+      pushSDKSocket!.close();
+      pushSDKSocket = null;
+    }
+
     notifyListeners();
   }
 }