Singleton protection done

Connector.ts

@@ -1,5 +1,6 @@
 import * as T from './types';
 import { CONFIG } from './config';
+import { Singleton } from './helpers/classes';
 import { EventHandleError, ScenarioHandleError } from './Errors';
 import { SOCKET_EVENTS_LISTEN, SOCKET_EVENTS_EMIT } from './api/api';
 import { SPECIAL_INSTRUCTIONS_TABLE, SPECIAL_INSTRUCTIONS } from './constants/events';
@@ -15,8 +16,7 @@ import { asyncStoragePlugin } from './asyncStorage/asyncStorage';
 import { localStoragePlugin } from './localStorage/localStorage';
 import moment from 'moment';
 
-class Connector {
-  private static _hasInstance = false;
+class Connector extends Singleton {
   private _eventListenersTable: T.EventListenersTable = {};
   private _connectorInitiated: boolean = false;
   private _apiKey: string = "";
@@ -70,10 +70,7 @@ class Connector {
   public lastEvent: T.RemoteEvent | null = null;
 
   constructor() {
-    if (Connector._hasInstance)
-      throw new Error("Attempted to create second instance of a Singleton class!");
-
-    Connector._hasInstance = true;
+    super("Connector");
   };
 
   public addEventListener(key: string, handler: (event: T.RemoteEvent) => any) {

helpers/classes/Singleton.ts

@@ -0,0 +1,15 @@
+import { ObjectT } from "../../types";
+
+export abstract class Singleton {
+  private static _classHasInstanceTable: ObjectT<boolean> = {};
+
+  constructor(classId: string) {
+    if (classId.length < 1)
+      throw new Error("Non-empty classId required for Singleton class protection!");
+
+    if (Singleton._classHasInstanceTable[classId])
+      throw new Error("Attempted to create second instance of a Singleton class!");
+
+    Singleton._classHasInstanceTable[classId] = true;
+  }
+};

helpers/classes/index.ts

@@ -0,0 +1 @@
+export { Singleton } from "./Singleton";

services/idService.ts

@@ -1,5 +1,6 @@
-class IdService {
-  private static _hasInstance = false;
+import { Singleton } from "./../helpers/classes";
+
+class IdService extends Singleton {
   private _currentInterceptedReduxActionId = 0;
   private _currentInterceptedStorageActionId = 0;
   private _currentCapturedEventId = 0;
@@ -8,10 +9,7 @@ class IdService {
   private _currentInterceptedMobxEventId = 0;
 
   constructor() {
-    if (IdService._hasInstance)
-      throw new Error("Attempted to create second instance of a Singleton class!");
-
-    IdService._hasInstance = true;
+    super("IdService");
   }
 
   public get currentInterceptedReduxActionId() {

services/remoteSettingsService.ts

@@ -1,11 +1,11 @@
+import { Singleton } from "./../helpers/classes";
 import { validateHexId24Symbols } from "../constants/regex";
 import { codebudConsoleWarn } from "../helpers/helperFunctions";
 import { PersonalProjectsSetting, RefreshPersonalProjectsSettingCallback, RefreshRemoteSettingsCallback, RemoteSettings, RemoteSettingsListenersTable } from "../types/types";
 import { api } from './../api/api';
 import { classicApiResponseValidator } from './../helpers/apiResponseValidators';
 
-class RemoteSettingsService {
-  private static _hasInstance = false;
+class RemoteSettingsService extends Singleton {
   private _projectId: string = "";
   private _apiKey: string = "";
   private _isInit: boolean = false;
@@ -23,10 +23,7 @@ class RemoteSettingsService {
   };
 
   constructor() {
-    if (RemoteSettingsService._hasInstance)
-      throw new Error("Attempted to create second instance of a Singleton class!");
-
-    RemoteSettingsService._hasInstance = true;
+    super("RemoteSettingsService");
   }
 
   public onGotNewRemoteSettings(r: RemoteSettings) {