fix: some changes on stream

push-protocol · Sep 29, 2023 · 92a2202 · 92a2202
1 parent c4d2cff
commit 92a2202
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 57 deletions.
diff --git a/packages/restapi/src/lib/pushNotification/alias.ts b/packages/restapi/src/lib/pushNotification/alias.ts
@@ -1,10 +1,8 @@
 import { ENV } from '../constants';
-import { SignerType } from '../types';
 import { AliasOptions } from './PushNotificationTypes';
 
 import * as PUSH_ALIAS from '../alias';
 
-import { PushNotificationBaseClass } from './pushNotificationBase';
 
 export class Alias {
   private env: ENV

diff --git a/packages/restapi/src/lib/pushNotification/delegate.ts b/packages/restapi/src/lib/pushNotification/delegate.ts
@@ -1,4 +1,4 @@
-import Constants, { ENV } from '../constants';
+import  { ENV } from '../constants';
 import { SignerType } from '../types';
 import { ChannelInfoOptions } from './PushNotificationTypes';
 import CONFIG, * as config from '../config';

diff --git a/packages/restapi/src/lib/pushNotification/notification.ts b/packages/restapi/src/lib/pushNotification/notification.ts
@@ -1,26 +1,15 @@
 import Constants, { ENV } from '../constants';
 import {
   SignerType,
-  ProgressHookType,
-  ProgressHookTypeFunction,
 } from '../types';
 import {
-  ChannelInfoOptions,
   SubscribeUnsubscribeOptions,
   SubscriptionOptions,
-  AliasOptions,
   FeedType,
   FeedsOptions,
-  ChannelSearchOptions,
-  NotificationOptions,
-  CreateChannelOptions,
-  NotificationSettings,
 } from './PushNotificationTypes';
-import CONFIG, * as config from '../config';
 import * as PUSH_USER from '../user';
-import * as PUSH_PAYLOAD from '../payloads';
 import * as PUSH_CHANNEL from '../channels';
-import * as PUSH_ALIAS from '../alias';
 
 import {
   getCAIPDetails,

diff --git a/packages/restapi/src/lib/pushapi/PushAPI.ts b/packages/restapi/src/lib/pushapi/PushAPI.ts
@@ -47,24 +47,10 @@ export class PushAPI {
     this.pgpPublicKey = pgpPublicKey;
     this.progressHook = progressHook;
     // Instantiate the notification classes
-    this.channel = new Channel(
-      this.signer,
-      this.env,
-      this.account
-    )
-    this.alias = new Alias(
-      this.env
-    )
-    this.delegate = new Delegate(
-      this.signer,
-      this.env,
-      this.account
-    )
-    this.notification = new Notification(
-      this.signer,
-      this.env,
-      this.account
-    )
+    this.channel = new Channel(this.signer, this.env, this.account);
+    this.alias = new Alias(this.env);
+    this.delegate = new Delegate(this.signer, this.env, this.account);
+    this.notification = new Notification(this.signer, this.env, this.account);
     // Initialize the instances of the four classes
     this.chat = new Chat(
       this.account,
@@ -98,16 +84,29 @@ export class PushAPI {
       // Default options
       const defaultOptions: PushAPIInitializeProps = {
         env: ENV.STAGING,
-        version: Constants.ENC_TYPE_V3,
-        autoUpgrade: true,
+        chatOptions: {
+          version: Constants.ENC_TYPE_V3,
+          autoUpgrade: true,
+        },
         account: null,
+        streamOptions: {
+          socketEnabled: true, // Default value
+        },
       };
 
       // Settings object
       // Default options are overwritten by the options passed in the initialize method
       const settings = {
         ...defaultOptions,
         ...options,
+        chatOptions: {
+          ...defaultOptions.chatOptions,
+          ...(options?.chatOptions ?? {}),
+        },
+        streamOptions: {
+          ...defaultOptions.streamOptions,
+          ...(options?.streamOptions ?? {}),
+        },
       };
 
       // Get account
@@ -135,8 +134,8 @@ export class PushAPI {
         decryptedPGPPrivateKey = await PUSH_CHAT.decryptPGPKey({
           encryptedPGPPrivateKey: user.encryptedPrivateKey,
           signer: signer,
-          toUpgrade: settings.autoUpgrade,
-          additionalMeta: settings.versionMeta,
+          toUpgrade: settings.chatOptions.autoUpgrade,
+          additionalMeta: settings.chatOptions.versionMeta,
           progressHook: settings.progressHook,
           env: settings.env,
         });
@@ -146,8 +145,8 @@ export class PushAPI {
           env: settings.env,
           account: derivedAccount,
           signer,
-          version: settings.version,
-          additionalMeta: settings.versionMeta,
+          version: settings.chatOptions.version,
+          additionalMeta: settings.chatOptions.versionMeta,
           origin: settings.origin,
           progressHook: settings.progressHook,
         });
@@ -165,17 +164,19 @@ export class PushAPI {
         settings.progressHook
       );
 
-      const streamInstance = await PushStream.initialize(
-        api.account,
-        decryptedPGPPrivateKey,
-        signer,
-        settings.progressHook,
-        settings.streamOptions
-      );
-      if (streamInstance) {
-        api.stream = streamInstance;
-      } else {
-        throw new Error('Failed to initialize PushStream.');
+      if (settings.streamOptions.socketEnabled) {
+        const streamInstance = await PushStream.initialize(
+          api.account,
+          decryptedPGPPrivateKey,
+          signer,
+          settings.progressHook,
+          settings.streamOptions
+        );
+        if (streamInstance) {
+          api.stream = streamInstance;
+        } else {
+          throw new Error('Failed to initialize PushStream.');
+        }
       }
 
       return api;

diff --git a/packages/restapi/src/lib/pushapi/pushAPITypes.ts b/packages/restapi/src/lib/pushapi/pushAPITypes.ts
@@ -1,5 +1,5 @@
-import Constants, { ENV } from '../constants';
-import { PushStreamInitializeProps } from '../pushstream/pushStreamTypes';
+import { ENV } from '../constants';
+import { PushChatInitializeProps, PushStreamInitializeProps } from '../pushstream/pushStreamTypes';
 import { ChatStatus, ProgressHookType, Rules } from '../types';
 
 export enum ChatListType {
@@ -10,9 +10,7 @@ export interface PushAPIInitializeProps {
   env?: ENV;
   progressHook?: (progress: ProgressHookType) => void;
   account?: string | null;
-  version?: typeof Constants.ENC_TYPE_V1 | typeof Constants.ENC_TYPE_V3;
-  versionMeta?: { NFTPGP_V1?: { password: string } };
-  autoUpgrade?: boolean;
+  chatOptions?:  PushChatInitializeProps;
   origin?: string;
   streamOptions?: PushStreamInitializeProps;
 }

diff --git a/packages/restapi/src/lib/pushstream/DataModifier.ts b/packages/restapi/src/lib/pushstream/DataModifier.ts
@@ -10,7 +10,6 @@ import {
   GroupEventType,
   LeaveGroupEvent,
   JoinGroupEvent,
-  ProposedEventNames,
   RequestEvent,
   RemoveEvent,
 } from './pushStreamTypes';

diff --git a/packages/restapi/src/lib/pushstream/PushStream.ts b/packages/restapi/src/lib/pushstream/PushStream.ts
@@ -190,6 +190,8 @@ export class PushStream extends EventEmitter {
         data = await this.chatInstance.decrypt([data]);
       }
 
+      console.log(data);
+
       const modifiedData = DataModifier.handleChatEvent(data[0], this.raw);
       modifiedData.event = this.convertToProposedName(modifiedData.event);
       this.handleToField(modifiedData);

diff --git a/packages/restapi/src/lib/pushstream/pushStreamTypes.ts b/packages/restapi/src/lib/pushstream/pushStreamTypes.ts
@@ -1,5 +1,5 @@
-import { ENV } from "../constants";
 import { Rules } from "../types";
+import Constants, { ENV } from '../constants';
 
 export type PushStreamInitializeProps = {
   listen?: STREAM[];
@@ -13,8 +13,15 @@ export type PushStreamInitializeProps = {
   };
   raw?: boolean;
   env?: ENV;
+  socketEnabled?: boolean;
 };
 
+export type PushChatInitializeProps = {
+  version?: typeof Constants.ENC_TYPE_V1 | typeof Constants.ENC_TYPE_V3;
+  versionMeta?: { NFTPGP_V1?: { password: string } };
+  autoUpgrade?: boolean;
+}
+
 export enum STREAM {
   PROFILE = 'STREAM.PROFILE',
   ENCRYPTION = 'STREAM.ENCRYPTION',

diff --git a/packages/restapi/tests/lib/pushstream/initialize.test.ts b/packages/restapi/tests/lib/pushstream/initialize.test.ts
@@ -183,7 +183,7 @@ describe.only('PushStream.initialize functionality', () => {
          accounts: [signer2.address, signer3.address, signer4.address],
        });
 
-       const w2wRejectRequest = await user2.chat.group.join(
+      const w2wRejectRequest = await user2.chat.group.join(
          createdGroup.chatId
        );