remove getInstance on swarmPolling

js/background.js

@@ -450,9 +450,11 @@
     }, window.CONSTANTS.NOTIFICATION_ENABLE_TIMEOUT_SECONDS * 1000);
 
     window.NewReceiver.queueAllCached();
-    window.SwarmPolling.addPubkey(window.libsession.Utils.UserUtils.getOurPubKeyStrFromCache());
+    window
+      .getSwarmPollingInstance()
+      .addPubkey(window.libsession.Utils.UserUtils.getOurPubKeyStrFromCache());
 
-    window.SwarmPolling.start();
+    window.getSwarmPollingInstance().start();
     window.libsession.Utils.AttachmentDownloads.start({
       logger: window.log,
     });

preload.js

@@ -287,7 +287,7 @@ window.Signal = Signal.setup({
   logger: window.log,
 });
 
-window.SwarmPolling = require('./ts/session/snode_api/swarmPolling').SwarmPolling.getInstance();
+window.getSwarmPollingInstance = require('./ts/session/snode_api/').getSwarmPollingInstance;
 
 const WorkerInterface = require('./js/modules/util_worker_interface');
 

ts/components/session/ActionsPanel.tsx

@@ -39,7 +39,7 @@ import {
 import { OpenGroupManagerV2 } from '../../opengroup/opengroupV2/OpenGroupManagerV2';
 import { loadDefaultRooms } from '../../opengroup/opengroupV2/ApiUtil';
 import { forceRefreshRandomSnodePool } from '../../session/snode_api/snodePool';
-import { SwarmPolling } from '../../session/snode_api/swarmPolling';
+import { getSwarmPollingInstance } from '../../session/snode_api';
 import { IMAGE_JPEG } from '../../types/MIME';
 import { FSv2 } from '../../fileserver';
 import { debounce } from 'lodash';
@@ -276,8 +276,8 @@ const doAppStartUp = () => {
 
   // TODO: Investigate the case where we reconnect
   const ourKey = UserUtils.getOurPubKeyStrFromCache();
-  SwarmPolling.getInstance().addPubkey(ourKey);
-  SwarmPolling.getInstance().start();
+  getSwarmPollingInstance().addPubkey(ourKey);
+  getSwarmPollingInstance().start();
 };
 
 /**

ts/receiver/closedGroups.ts

@@ -33,7 +33,7 @@ import { getMessageController } from '../session/messages';
 import { ClosedGroupEncryptionPairReplyMessage } from '../session/messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairReplyMessage';
 import { queueAllCachedFromSource } from './receiver';
 import { actions as conversationActions } from '../state/ducks/conversations';
-import { SwarmPolling } from '../session/snode_api/swarmPolling';
+import { getSwarmPollingInstance } from '../session/snode_api';
 import { MessageModel } from '../models/message';
 
 import { updateConfirmModal } from '../state/ducks/modalDialog';
@@ -275,7 +275,7 @@ export async function handleNewClosedGroup(
   await addClosedGroupEncryptionKeyPair(groupId, ecKeyPair.toHexKeyPair());
 
   // start polling for this new group
-  SwarmPolling.getInstance().addGroupId(PubKey.cast(groupId));
+  getSwarmPollingInstance().addGroupId(PubKey.cast(groupId));
 
   await removeFromCache(envelope);
   // trigger decrypting of all this group messages we did not decrypt successfully yet.
@@ -298,7 +298,7 @@ export async function markGroupAsLeftOrKicked(
   } else {
     groupConvo.set('left', true);
   }
-  SwarmPolling.getInstance().removePubkey(groupPublicKey);
+  getSwarmPollingInstance().removePubkey(groupPublicKey);
 }
 
 /**
@@ -903,7 +903,7 @@ export async function createClosedGroup(groupName: string, members: Array<string
     }
 
     // Subscribe to this group id
-    SwarmPolling.getInstance().addGroupId(new PubKey(groupPublicKey));
+    getSwarmPollingInstance().addGroupId(new PubKey(groupPublicKey));
   }
 
   await forceSyncConfigurationNowIfNeeded();

ts/session/group/index.ts

@@ -30,9 +30,9 @@ import { ClosedGroupEncryptionPairMessage } from '../messages/outgoing/controlMe
 import { ClosedGroupEncryptionPairRequestMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupEncryptionPairRequestMessage';
 import { ClosedGroupNameChangeMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNameChangeMessage';
 import { ClosedGroupNewMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupNewMessage';
-import { SwarmPolling } from '../snode_api/swarmPolling';
 import { ClosedGroupRemovedMembersMessage } from '../messages/outgoing/controlMessage/group/ClosedGroupRemovedMembersMessage';
 import { updateOpenGroupV2 } from '../../opengroup/opengroupV2/OpenGroupUpdate';
+import { getSwarmPollingInstance } from '../snode_api';
 
 export type GroupInfo = {
   id: string;
@@ -331,7 +331,7 @@ export async function leaveClosedGroup(groupId: string) {
 
   window?.log?.info(`We are leaving the group ${groupId}. Sending our leaving message.`);
   // sent the message to the group and once done, remove everything related to this group
-  SwarmPolling.getInstance().removePubkey(groupId);
+  getSwarmPollingInstance().removePubkey(groupId);
   await getMessageQueue().sendToGroup(ourLeavingMessage, async () => {
     window?.log?.info(
       `Leaving message sent ${groupId}. Removing everything related to this group.`

ts/session/snode_api/index.ts

@@ -2,4 +2,6 @@ import * as SnodePool from './snodePool';
 import * as SNodeAPI from './SNodeAPI';
 import * as Onions from './onions';
 
-export { SnodePool, SNodeAPI, Onions };
+import { getSwarmPollingInstance } from './swarmPolling';
+
+export { SnodePool, SNodeAPI, Onions, getSwarmPollingInstance };

ts/session/snode_api/swarmPolling.ts

@@ -41,25 +41,25 @@ export function processMessage(message: string, options: any = {}) {
   }
 }
 
+let instance: SwarmPolling | undefined;
+export const getSwarmPollingInstance = () => {
+  if (!instance) {
+    instance = new SwarmPolling();
+  }
+  return instance;
+};
+
 export class SwarmPolling {
-  private static instance: SwarmPolling;
   private pubkeys: Array<PubKey>;
   private groupPubkeys: Array<PubKey>;
   private readonly lastHashes: { [key: string]: PubkeyToHash };
 
-  private constructor() {
+  constructor() {
     this.pubkeys = [];
     this.groupPubkeys = [];
     this.lastHashes = {};
   }
 
-  public static getInstance() {
-    if (!SwarmPolling.instance) {
-      SwarmPolling.instance = new SwarmPolling();
-    }
-    return SwarmPolling.instance;
-  }
-
   public start(): void {
     this.loadGroupIds();
     void this.pollForAllKeys();