From 7a85d69970f7ef5302f91114f99ca23674156f7f Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Tue, 26 May 2020 11:00:50 +1000
Subject: [PATCH 1/3] Mostly strictly types Signal Data

---
 js/modules/data.d.ts | 388 ++++++++++++++++++++++++++++++++++++++++++-
 ts/window.ts         |  77 +++++++++
 2 files changed, 464 insertions(+), 1 deletion(-)
 create mode 100644 ts/window.ts

diff --git a/js/modules/data.d.ts b/js/modules/data.d.ts
index 29e42df98..e9543b99b 100644
--- a/js/modules/data.d.ts
+++ b/js/modules/data.d.ts
@@ -1,3 +1,389 @@
+import { ConversationType } from '../../ts/state/ducks/conversations';
+import { Mesasge } from '../../ts/types/Message';
+
+type IdentityKey = {
+  id: string;
+  publicKey: ArrayBuffer;
+  firstUse: boolean;
+  verified: number;
+  nonblockingApproval: boolean;
+} | null;
+
+type PreKey = {
+  id: string;
+  publicKey: string;
+  privateKey: string;
+  recipient: string;
+} | null;
+
+type PairingAuthorisation = {
+  primaryDevicePubKey: string;
+  secondaryDevicePubKey: string;
+  requestSignature: string;
+  grantSignature: string | null;
+} | null;
+
+type PairingAuthorisationInit = {
+  requestSignature: string;
+  grantSignature: string;
+};
+
+type GuardNode = {
+  ed25519PubKey: string;
+};
+
+type SwarmNode = {
+  address: string;
+  ip: string;
+  port: string;
+  pubkey_ed25519: string;
+  pubkey_x25519: string;
+};
+
+type StorageItem = {
+  id: string;
+  value: any;
+};
+
+type SessionDataInfo = {
+  id: string;
+  number: string;
+  deviceId: number;
+  record: string;
+};
+
+type ServerToken = {
+  serverUrl: string;
+  token: string;
+};
+
+// Basic
 export function searchMessages(query: string): Promise<Array<any>>;
 export function searchConversations(query: string): Promise<Array<any>>;
-export function getPrimaryDeviceFor(pubKey: string): Promise<string | null>;
+export function shutdown(): Promise<void>;
+export function close(): Promise<void>;
+export function removeDB(): Promise<void>;
+export function removeIndexedDBFiles(): Promise<void>;
+export function getPasswordHash(): Promise<string | null>;
+
+// Identity Keys
+export function createOrUpdateIdentityKey(data: any): Promise<void>;
+export function getIdentityKeyById(id: string): Promise<IdentityKey>;
+export function bulkAddIdentityKeys(array: Array<IdentityKey>): Promise<void>;
+export function removeIdentityKeyById(id: string): Promise<void>;
+export function removeAllIdentityKeys(): Promise<void>;
+
+// Pre Keys
+export function createOrUpdatePreKey(data: PreKey): Promise<void>;
+export function getPreKeyById(id: string): Promise<PreKey>;
+export function getPreKeyByRecipient(recipient: string): Promise<PreKey>;
+export function bulkAddPreKeys(data: Array<PreKey>): Promise<void>;
+export function removePreKeyById(id: string): Promise<void>;
+export function getAllPreKeys(): Promise<Array<PreKey>>;
+
+// Signed Pre Keys
+export function createOrUpdateSignedPreKey(data: PreKey): Promise<void>;
+export function getSignedPreKeyById(id: string): Promise<PreKey>;
+export function getAllSignedPreKeys(recipient: string): Promise<PreKey>;
+export function bulkAddSignedPreKeys(array: Array<PreKey>): Promise<void>;
+export function removeSignedPreKeyById(id: string): Promise<void>;
+export function removeAllSignedPreKeys(): Promise<void>;
+
+// Contact Pre Key
+export function createOrUpdateContactPreKey(data: PreKey): Promise<void>;
+export function getContactPreKeyById(id: string): Promise<PreKey>;
+export function getContactPreKeyByIdentityKey(key: string): Promise<PreKey>;
+export function getContactPreKeys(
+  keyId: string,
+  identityKeyString: string
+): Promise<Array<PreKey>>;
+export function getAllContactPreKeys(): Promise<Array<PreKey>>;
+export function bulkAddContactPreKeys(array: Array<PreKey>): Promise<void>;
+export function removeContactPreKeyByIdentityKey(id: string): Promise<void>;
+export function removeAllContactPreKeys(): Promise<void>;
+
+// Contact Signed Pre Key
+export function createOrUpdateContactSignedPreKey(data: PreKey): Promise<void>;
+export function getContactSignedPreKeyByIdid(string): Promise<PreKey>;
+export function getContactSignedPreKeyByIdentityKey(
+  key: string
+): Promise<PreKey>;
+export function getContactSignedPreKeys(
+  keyId: string,
+  identityKeyString: string
+): Promise<Array<PreKey>>;
+export function bulkAddContactSignedPreKeys(
+  array: Array<PreKey>
+): Promise<void>;
+export function removeContactSignedPreKeyByIdentityKey(
+  id: string
+): Promise<void>;
+export function removeAllContactSignedPreKeys(): Promise<void>;
+
+// Authorisations & Linking
+export function createOrUpdatePairingAuthorisation(
+  data: PairingAuthorisationInit
+): Promise<PairingAuthorisation>;
+export function removePairingAuthorisationForSecondaryPubKey(
+  pubKey: string
+): Promise<void>;
+export function getGrantAuthorisationsForPrimaryPubKey(
+  pubKey: string
+): Promise<Array<PairingAuthorisation>>;
+export function getGrantAuthorisationForSecondaryPubKey(
+  pubKey: string
+): Promise<PairingAuthorisation>;
+export function getAuthorisationForSecondaryPubKey(
+  pubKey: string
+): PairingAuthorisation;
+export function getSecondaryDevicesFor(
+  primaryDevicePubKey: string
+): Array<string>;
+export function getPrimaryDeviceFor(
+  secondaryDevicePubKey: string
+): string | null;
+export function getPairedDevicesFor(pubKey: string): Array<string>;
+
+// Guard Nodes
+export function getGuardNodes(): Promise<GuardNode>;
+export function updateGuardNodes(nodes: Array<string>): Promise<void>;
+
+// Storage Items
+export function createOrUpdateItem(data: StorageItem): Promise<void>;
+export function getItemById(id: string): Promise<StorageItem>;
+export function getAlItems(): Promise<Array<StorageItem>>;
+export function bulkAddItems(array: Array<StorageItem>): Promise<void>;
+export function removeItemById(id: string): Promise<void>;
+export function removeAllItems(): Promise<void>;
+
+// Sessions
+export function createOrUpdateSession(data: SessionDataInfo): Promise<void>;
+export function getAllSessions(): Promise<Array<SessionDataInfo>>;
+export function getSessionById(id: string): Promise<SessionDataInfo>;
+export function getSessionsByNumber(number: string): Promise<SessionDataInfo>;
+export function bulkAddSessions(array: Array<SessionDataInfo>): Promise<void>;
+export function removeSessionById(id: string): Promise<void>;
+export function removeSessionsByNumber(number: string): Promise<void>;
+export function removeAllSessions(): Promise<void>;
+
+// Conversations
+export function getConversationCount(): Promise<number>;
+export function saveConversation(data: ConversationType): Promise<void>;
+export function saveConversations(data: Array<ConversationType>): Promise<void>;
+export function updateConversation(data: ConversationType): Promise<void>;
+export function removeConversation(id: string): Promise<void>;
+
+export function getAllConversations({
+  ConversationCollection,
+}: {
+  ConversationCollection: any;
+}): Promise<Array<ConversationCollection>>;
+
+export function getAllConversationIds(): Promise<Array<string>>;
+export function getAllPrivateConversations(): Promise<Array<string>>;
+export function getAllPublicConversations(): Promise<Array<string>>;
+export function getPublicConversationsByServer(
+  server: string,
+  { ConversationCollection }: { ConversationCollection: any }
+): Promise<ConversationCollection>;
+export function getPubkeysInPublicConversation(
+  id: string
+): Promise<Array<string>>;
+export function savePublicServerToken(data: ServerToken): Promise<void>;
+export function getPublicServerTokenByServerUrl(
+  serverUrl: string
+): Promise<string>;
+export function getAllGroupsInvolvingId(
+  id: string,
+  { ConversationCollection }: { ConversationCollection: any }
+): Promise<Array<ConversationCollection>>;
+
+// Returns conversation row
+// TODO: Make strict return types for search
+export function searchConversations(query: string): Promise<any>;
+export function searchMessages(query: string): Promise<any>;
+export function searchMessagesInConversation(
+  query: string,
+  conversationId: string,
+  { limit }?: { limit: any }
+): Promise<any>;
+export function getMessageCount(): Promise<number>;
+export function saveMessage(
+  data: Mesasge,
+  { forceSave, Message }?: { forceSave: any; Message: any }
+): Promise<string>;
+export function cleanSeenMessages(): Promise<void>;
+export function cleanLastHashes(): Promise<void>;
+export function saveSeenMessageHash(data: {
+  expiresAt: number;
+  hash: string;
+}): Promise<void>;
+
+// TODO: Strictly type the following
+export function updateLastHash(data: any): Promise<any>;
+export function saveSeenMessageHashes(data: any): Promise<any>;
+export function saveLegacyMessage(data: any): Promise<any>;
+export function saveMessages(
+  arrayOfMessages: any,
+  { forceSave }?: any
+): Promise<any>;
+export function removeMessage(id: string, { Message }?: any): Promise<any>;
+export function getUnreadByConversation(
+  conversationId: string,
+  { MessageCollection }?: any
+): Promise<any>;
+export function removeAllMessagesInConversation(
+  conversationId: string,
+  { MessageCollection }?: any
+): Promise<void>;
+
+export function getMessageBySender(
+  {
+    source,
+    sourceDevice,
+    sent_at,
+  }: { source: any; sourceDevice: any; sent_at: any },
+  { Message }: { Message: any }
+): Promise<any>;
+export function getMessageIdsFromServerIds(
+  serverIds: any,
+  conversationId: any
+): Promise<any>;
+export function getMessageById(
+  id: string,
+  { Message }: { Message: any }
+): Promise<any>;
+export function getAllMessages({
+  MessageCollection,
+}: {
+  MessageCollection: any;
+}): Promise<any>;
+export function getAllUnsentMessages({
+  MessageCollection,
+}: {
+  MessageCollection: any;
+}): Promise<any>;
+export function getAllMessageIds(): Promise<any>;
+export function getMessagesBySentAt(
+  sentAt: any,
+  { MessageCollection }: { MessageCollection: any }
+): Promise<any>;
+export function getExpiredMessages({
+  MessageCollection,
+}: {
+  MessageCollection: any;
+}): Promise<any>;
+export function getOutgoingWithoutExpiresAt({
+  MessageCollection,
+}: any): Promise<any>;
+export function getNextExpiringMessage({
+  MessageCollection,
+}: {
+  MessageCollection: any;
+}): Promise<any>;
+export function getNextExpiringMessage({
+  MessageCollection,
+}: {
+  MessageCollection: any;
+}): Promise<any>;
+export function getMessagesByConversation(
+  conversationId: any,
+  {
+    limit,
+    receivedAt,
+    MessageCollection,
+    type,
+  }: {
+    limit?: number;
+    receivedAt?: number;
+    MessageCollection: any;
+    type?: string;
+  }
+): Promise<any>;
+export function getSeenMessagesByHashList(hashes: any): Promise<any>;
+export function getLastHashBySnode(convoId: any, snode: any): Promise<any>;
+
+// Unprocessed
+export function getUnprocessedCount(): Promise<any>;
+export function getAllUnprocessed(): Promise<any>;
+export function getUnprocessedById(id: any): Promise<any>;
+export function saveUnprocessed(
+  data: any,
+  {
+    forceSave,
+  }?: {
+    forceSave: any;
+  }
+): Promise<any>;
+export function saveUnprocesseds(
+  arrayOfUnprocessed: any,
+  {
+    forceSave,
+  }?: {
+    forceSave: any;
+  }
+): Promise<void>;
+export function updateUnprocessedAttempts(
+  id: any,
+  attempts: any
+): Promise<void>;
+export function updateUnprocessedWithData(id: any, data: any): Promise<void>;
+export function removeUnprocessed(id: any): Promise<void>;
+export function removeAllUnprocessed(): Promise<void>;
+
+// Attachment Downloads
+export function getNextAttachmentDownloadJobs(limit: any): Promise<any>;
+export function saveAttachmentDownloadJob(job: any): Promise<void>;
+export function setAttachmentDownloadJobPending(
+  id: any,
+  pending: any
+): Promise<void>;
+export function resetAttachmentDownloadPending(): Promise<void>;
+export function removeAttachmentDownloadJob(id: any): Promise<void>;
+export function removeAllAttachmentDownloadJobs(): Promise<void>;
+
+// Other
+export function removeAll(): Promise<void>;
+export function removeAllConfiguration(): Promise<void>;
+export function removeAllConversations(): Promise<void>;
+export function removeAllPrivateConversations(): Promise<void>;
+export function removeOtherData(): Promise<void>;
+export function cleanupOrphanedAttachments(): Promise<void>;
+
+// Getters
+export function getMessagesNeedingUpgrade(
+  limit: any,
+  {
+    maxVersion,
+  }: {
+    maxVersion?: number;
+  }
+): Promise<any>;
+export function getLegacyMessagesNeedingUpgrade(
+  limit: any,
+  {
+    maxVersion,
+  }: {
+    maxVersion?: number;
+  }
+): Promise<any>;
+export function getMessagesWithVisualMediaAttachments(
+  conversationId: any,
+  {
+    limit,
+  }: {
+    limit: any;
+  }
+): Promise<any>;
+export function getMessagesWithFileAttachments(
+  conversationId: any,
+  {
+    limit,
+  }: {
+    limit: any;
+  }
+): Promise<any>;
+
+// Sender Keys
+export function getSenderKeys(groupId: any, senderIdentity: any): Promise<any>;
+export function createOrUpdateSenderKeys(data: any): Promise<void>;
diff --git a/ts/window.ts b/ts/window.ts
new file mode 100644
index 000000000..2490690a4
--- /dev/null
+++ b/ts/window.ts
@@ -0,0 +1,77 @@
+declare global {
+  interface Window {
+    seedNodeList: any;
+
+    WebAPI: any;
+    LokiSnodeAPI: any;
+    SenderKeyAPI: any;
+    LokiMessageAPI: any;
+    StubMessageAPI: any;
+    StubAppDotNetApi: any;
+    LokiPublicChatAPI: any;
+    LokiAppDotNetServerAPI: any;
+    LokiFileServerAPI: any;
+    LokiRssAPI: any;
+  }
+}
+
+// window.WebAPI = initializeWebAPI();
+// const LokiSnodeAPI = require('./js/modules/loki_snode_api');
+// window.SenderKeyAPI = require('./js/modules/loki_sender_key_api');
+// window.lokiSnodeAPI
+// window.LokiMessageAPI = require('./js/modules/loki_message_api');
+// window.StubMessageAPI = require('./integration_test/stubs/stub_message_api');
+// window.StubAppDotNetApi = require('./integration_test/stubs/stub_app_dot_net_api');
+// window.LokiPublicChatAPI = require('./js/modules/loki_public_chat_api');
+// window.LokiAppDotNetServerAPI = require('./js/modules/loki_app_dot_net_api');
+// window.LokiFileServerAPI = require('./js/modules/loki_file_server_api');
+// window.LokiRssAPI = require('./js/modules/loki_rss_api');
+
+export const exporttts = {
+  // APIs
+  WebAPI: window.WebAPI,
+
+  // Utilities
+  Events: () => window.Events,
+  Signal: () => window.Signal,
+  Whisper: () => window.Whisper,
+  ConversationController: () => window.ConversationController,
+  passwordUtil: () => window.passwordUtil,
+
+  // Values
+  CONSTANTS: () => window.CONSTANTS,
+  versionInfo: () => window.versionInfo,
+  mnemonic: () => window.mnemonic,
+  lokiFeatureFlags: () => window.lokiFeatureFlags,
+
+  // Getters
+  getAccountManager: () => window.getAccountManager,
+  getConversations: () => window.getConversations,
+  getFriendsFromContacts: () => window.getFriendsFromContacts,
+  getSettingValue: () => window.getSettingValue,
+
+  // Setters
+  setPassword: () => window.setPassword,
+  setSettingValue: () => window.setSettingValue,
+
+  // UI Events
+  pushToast: () => window.pushToast,
+  confirmationDialog: () => window.confirmationDialog,
+
+  showQRDialog: () => window.showQRDialog,
+  showSeedDialog: () => window.showSeedDialog,
+  showPasswordDialog: () => window.showPasswordDialog,
+  showEditProfileDialog: () => window.showEditProfileDialog,
+
+  toggleTheme: () => window.toggleTheme,
+  toggleMenuBar: () => window.toggleMenuBar,
+  toggleSpellCheck: () => window.toggleSpellCheck,
+  toggleLinkPreview: () => window.toggleLinkPreview,
+  toggleMediaPermissions: () => window.toggleMediaPermissions,
+
+  // Actions
+  clearLocalData: () => window.clearLocalData,
+  deleteAccount: () => window.deleteAccount,
+  resetDatabase: () => window.resetDatabase,
+  attemptConnection: () => window.attemptConnection,
+};

From 729fa594b84d864a8edbb56fb4a26dd9663037a0 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Thu, 28 May 2020 12:14:49 +1000
Subject: [PATCH 2/3] Updated window exports

---
 js/modules/data.d.ts |   8 +-
 ts/global.d.ts       |   1 +
 ts/window.ts         | 193 ++++++++++++++++++++++++++-----------------
 3 files changed, 123 insertions(+), 79 deletions(-)

diff --git a/js/modules/data.d.ts b/js/modules/data.d.ts
index e9543b99b..e154cbf3c 100644
--- a/js/modules/data.d.ts
+++ b/js/modules/data.d.ts
@@ -135,14 +135,14 @@ export function getGrantAuthorisationForSecondaryPubKey(
 ): Promise<PairingAuthorisation>;
 export function getAuthorisationForSecondaryPubKey(
   pubKey: string
-): PairingAuthorisation;
+): Promise<PairingAuthorisation>;
 export function getSecondaryDevicesFor(
   primaryDevicePubKey: string
-): Array<string>;
+): Promise<Array<string>>;
 export function getPrimaryDeviceFor(
   secondaryDevicePubKey: string
-): string | null;
-export function getPairedDevicesFor(pubKey: string): Array<string>;
+): Promise<string | null>;
+export function getPairedDevicesFor(pubKey: string): Promise<Array<string>>;
 
 // Guard Nodes
 export function getGuardNodes(): Promise<GuardNode>;
diff --git a/ts/global.d.ts b/ts/global.d.ts
index 34564325a..39e55c39f 100644
--- a/ts/global.d.ts
+++ b/ts/global.d.ts
@@ -1,3 +1,4 @@
+// TODO: Delete this and depend on window.ts instead
 interface Window {
   CONSTANTS: any;
   versionInfo: any;
diff --git a/ts/window.ts b/ts/window.ts
index 2490690a4..aeb19ec5d 100644
--- a/ts/window.ts
+++ b/ts/window.ts
@@ -1,77 +1,120 @@
-declare global {
-  interface Window {
-    seedNodeList: any;
-
-    WebAPI: any;
-    LokiSnodeAPI: any;
-    SenderKeyAPI: any;
-    LokiMessageAPI: any;
-    StubMessageAPI: any;
-    StubAppDotNetApi: any;
-    LokiPublicChatAPI: any;
-    LokiAppDotNetServerAPI: any;
-    LokiFileServerAPI: any;
-    LokiRssAPI: any;
-  }
+import { LocalizerType } from './types/Util';
+
+interface Window {
+  seedNodeList: any;
+
+  WebAPI: any;
+  LokiSnodeAPI: any;
+  SenderKeyAPI: any;
+  LokiMessageAPI: any;
+  StubMessageAPI: any;
+  StubAppDotNetApi: any;
+  LokiPublicChatAPI: any;
+  LokiAppDotNetServerAPI: any;
+  LokiFileServerAPI: any;
+  LokiRssAPI: any;
+
+  CONSTANTS: any;
+  versionInfo: any;
+
+  Events: any;
+  Lodash: any;
+  clearLocalData: any;
+  getAccountManager: any;
+  getConversations: any;
+  getFriendsFromContacts: any;
+  mnemonic: any;
+  clipboard: any;
+  attemptConnection: any;
+
+  passwordUtil: any;
+  userConfig: any;
+  shortenPubkey: any;
+
+  dcodeIO: any;
+  libsignal: any;
+  libloki: any;
+  displayNameRegex: any;
+
+  Signal: any;
+  Whisper: any;
+  ConversationController: any;
+
+  onLogin: any;
+  setPassword: any;
+  textsecure: any;
+  Session: any;
+  log: any;
+  i18n: LocalizerType;
+  friends: any;
+  generateID: any;
+  storage: any;
+  pushToast: any;
+
+  confirmationDialog: any;
+  showQRDialog: any;
+  showSeedDialog: any;
+  showPasswordDialog: any;
+  showEditProfileDialog: any;
+
+  deleteAccount: any;
+
+  toggleTheme: any;
+  toggleMenuBar: any;
+  toggleSpellCheck: any;
+  toggleLinkPreview: any;
+  toggleMediaPermissions: any;
+
+  getSettingValue: any;
+  setSettingValue: any;
+  lokiFeatureFlags: any;
+
+  resetDatabase: any;
 }
 
-// window.WebAPI = initializeWebAPI();
-// const LokiSnodeAPI = require('./js/modules/loki_snode_api');
-// window.SenderKeyAPI = require('./js/modules/loki_sender_key_api');
-// window.lokiSnodeAPI
-// window.LokiMessageAPI = require('./js/modules/loki_message_api');
-// window.StubMessageAPI = require('./integration_test/stubs/stub_message_api');
-// window.StubAppDotNetApi = require('./integration_test/stubs/stub_app_dot_net_api');
-// window.LokiPublicChatAPI = require('./js/modules/loki_public_chat_api');
-// window.LokiAppDotNetServerAPI = require('./js/modules/loki_app_dot_net_api');
-// window.LokiFileServerAPI = require('./js/modules/loki_file_server_api');
-// window.LokiRssAPI = require('./js/modules/loki_rss_api');
-
-export const exporttts = {
-  // APIs
-  WebAPI: window.WebAPI,
-
-  // Utilities
-  Events: () => window.Events,
-  Signal: () => window.Signal,
-  Whisper: () => window.Whisper,
-  ConversationController: () => window.ConversationController,
-  passwordUtil: () => window.passwordUtil,
-
-  // Values
-  CONSTANTS: () => window.CONSTANTS,
-  versionInfo: () => window.versionInfo,
-  mnemonic: () => window.mnemonic,
-  lokiFeatureFlags: () => window.lokiFeatureFlags,
-
-  // Getters
-  getAccountManager: () => window.getAccountManager,
-  getConversations: () => window.getConversations,
-  getFriendsFromContacts: () => window.getFriendsFromContacts,
-  getSettingValue: () => window.getSettingValue,
-
-  // Setters
-  setPassword: () => window.setPassword,
-  setSettingValue: () => window.setSettingValue,
-
-  // UI Events
-  pushToast: () => window.pushToast,
-  confirmationDialog: () => window.confirmationDialog,
-
-  showQRDialog: () => window.showQRDialog,
-  showSeedDialog: () => window.showSeedDialog,
-  showPasswordDialog: () => window.showPasswordDialog,
-  showEditProfileDialog: () => window.showEditProfileDialog,
-
-  toggleTheme: () => window.toggleTheme,
-  toggleMenuBar: () => window.toggleMenuBar,
-  toggleSpellCheck: () => window.toggleSpellCheck,
-  toggleLinkPreview: () => window.toggleLinkPreview,
-  toggleMediaPermissions: () => window.toggleMediaPermissions,
-
-  // Actions
-  clearLocalData: () => window.clearLocalData,
-  deleteAccount: () => window.deleteAccount,
-  resetDatabase: () => window.resetDatabase,
-  attemptConnection: () => window.attemptConnection,
-};
+declare const window: Window;
+
+// Utilities
+export const WebAPI = window.WebAPI;
+export const Events = window.Events;
+export const Signal = window.Signal;
+export const Whisper = window.Whisper;
+export const ConversationController = window.ConversationController;
+export const passwordUtil = window.passwordUtil;
+
+// Values
+export const CONSTANTS = window.CONSTANTS;
+export const versionInfo = window.versionInfo;
+export const mnemonic = window.mnemonic;
+export const lokiFeatureFlags = window.lokiFeatureFlags;
+
+// Getters
+export const getAccountManager = window.getAccountManager;
+export const getConversations = window.getConversations;
+export const getFriendsFromContacts = window.getFriendsFromContacts;
+export const getSettingValue = window.getSettingValue;
+
+// Setters
+export const setPassword = window.setPassword;
+export const setSettingValue = window.setSettingValue;
+
+// UI Events
+export const pushToast = window.pushToast;
+export const confirmationDialog = window.confirmationDialog;
+
+export const showQRDialog = window.showQRDialog;
+export const showSeedDialog = window.showSeedDialog;
+export const showPasswordDialog = window.showPasswordDialog;
+export const showEditProfileDialog = window.showEditProfileDialog;
+
+export const toggleTheme = window.toggleTheme;
+export const toggleMenuBar = window.toggleMenuBar;
+export const toggleSpellCheck = window.toggleSpellCheck;
+export const toggleLinkPreview = window.toggleLinkPreview;
+export const toggleMediaPermissions = window.toggleMediaPermissions;
+
+// Actions
+export const clearLocalData = window.clearLocalData;
+export const deleteAccount = window.deleteAccount;
+export const resetDatabase = window.resetDatabase;
+export const attemptConnection = window.attemptConnection;

From 85d3c35c0cc39271fb043c08f4c60ba6303d1c06 Mon Sep 17 00:00:00 2001
From: Mikunj <mikunj@live.com.au>
Date: Thu, 28 May 2020 12:46:42 +1000
Subject: [PATCH 3/3] Fix types

---
 js/modules/data.d.ts | 109 +++++++++++++++++++++++++++----------------
 1 file changed, 69 insertions(+), 40 deletions(-)

diff --git a/js/modules/data.d.ts b/js/modules/data.d.ts
index e154cbf3c..92441555f 100644
--- a/js/modules/data.d.ts
+++ b/js/modules/data.d.ts
@@ -7,25 +7,46 @@ type IdentityKey = {
   firstUse: boolean;
   verified: number;
   nonblockingApproval: boolean;
-} | null;
+};
 
 type PreKey = {
-  id: string;
-  publicKey: string;
-  privateKey: string;
+  id: number;
+  publicKey: ArrayBuffer;
+  privateKey: ArrayBuffer;
   recipient: string;
-} | null;
+};
+
+type SignedPreKey = {
+  id: number;
+  publicKey: ArrayBuffer;
+  privateKey: ArrayBuffer;
+  created_at: number;
+  confirmed: boolean;
+  signature: ArrayBuffer;
+};
+
+type ContactPreKey = {
+  id: number;
+  identityKeyString: string;
+  publicKey: ArrayBuffer;
+  keyId: number;
+};
+
+type ContactSignedPreKey = {
+  id: number;
+  identityKeyString: string;
+  publicKey: ArrayBuffer;
+  keyId: number;
+  signature: ArrayBuffer;
+  created_at: number;
+  confirmed: boolean;
+};
 
 type PairingAuthorisation = {
   primaryDevicePubKey: string;
   secondaryDevicePubKey: string;
-  requestSignature: string;
-  grantSignature: string | null;
-} | null;
-
-type PairingAuthorisationInit = {
-  requestSignature: string;
-  grantSignature: string;
+  requestSignature: ArrayBuffer;
+  grantSignature: ArrayBuffer | null;
 };
 
 type GuardNode = {
@@ -67,53 +88,61 @@ export function removeIndexedDBFiles(): Promise<void>;
 export function getPasswordHash(): Promise<string | null>;
 
 // Identity Keys
-export function createOrUpdateIdentityKey(data: any): Promise<void>;
-export function getIdentityKeyById(id: string): Promise<IdentityKey>;
+export function createOrUpdateIdentityKey(data: IdentityKey): Promise<void>;
+export function getIdentityKeyById(id: string): Promise<IdentityKey | null>;
 export function bulkAddIdentityKeys(array: Array<IdentityKey>): Promise<void>;
 export function removeIdentityKeyById(id: string): Promise<void>;
 export function removeAllIdentityKeys(): Promise<void>;
 
 // Pre Keys
 export function createOrUpdatePreKey(data: PreKey): Promise<void>;
-export function getPreKeyById(id: string): Promise<PreKey>;
-export function getPreKeyByRecipient(recipient: string): Promise<PreKey>;
+export function getPreKeyById(id: number): Promise<PreKey | null>;
+export function getPreKeyByRecipient(recipient: string): Promise<PreKey | null>;
 export function bulkAddPreKeys(data: Array<PreKey>): Promise<void>;
-export function removePreKeyById(id: string): Promise<void>;
+export function removePreKeyById(id: number): Promise<void>;
 export function getAllPreKeys(): Promise<Array<PreKey>>;
 
 // Signed Pre Keys
-export function createOrUpdateSignedPreKey(data: PreKey): Promise<void>;
-export function getSignedPreKeyById(id: string): Promise<PreKey>;
-export function getAllSignedPreKeys(recipient: string): Promise<PreKey>;
-export function bulkAddSignedPreKeys(array: Array<PreKey>): Promise<void>;
-export function removeSignedPreKeyById(id: string): Promise<void>;
+export function createOrUpdateSignedPreKey(data: SignedPreKey): Promise<void>;
+export function getSignedPreKeyById(id: number): Promise<SignedPreKey | null>;
+export function getAllSignedPreKeys(): Promise<SignedPreKey | null>;
+export function bulkAddSignedPreKeys(array: Array<SignedPreKey>): Promise<void>;
+export function removeSignedPreKeyById(id: number): Promise<void>;
 export function removeAllSignedPreKeys(): Promise<void>;
 
 // Contact Pre Key
-export function createOrUpdateContactPreKey(data: PreKey): Promise<void>;
-export function getContactPreKeyById(id: string): Promise<PreKey>;
-export function getContactPreKeyByIdentityKey(key: string): Promise<PreKey>;
+export function createOrUpdateContactPreKey(data: ContactPreKey): Promise<void>;
+export function getContactPreKeyById(id: number): Promise<ContactPreKey | null>;
+export function getContactPreKeyByIdentityKey(
+  key: string
+): Promise<ContactPreKey | null>;
 export function getContactPreKeys(
-  keyId: string,
+  keyId: number,
   identityKeyString: string
-): Promise<Array<PreKey>>;
-export function getAllContactPreKeys(): Promise<Array<PreKey>>;
-export function bulkAddContactPreKeys(array: Array<PreKey>): Promise<void>;
-export function removeContactPreKeyByIdentityKey(id: string): Promise<void>;
+): Promise<Array<ContactPreKey>>;
+export function getAllContactPreKeys(): Promise<Array<ContactPreKey>>;
+export function bulkAddContactPreKeys(
+  array: Array<ContactPreKey>
+): Promise<void>;
+export function removeContactPreKeyByIdentityKey(id: number): Promise<void>;
 export function removeAllContactPreKeys(): Promise<void>;
 
 // Contact Signed Pre Key
-export function createOrUpdateContactSignedPreKey(data: PreKey): Promise<void>;
-export function getContactSignedPreKeyByIdid(string): Promise<PreKey>;
+export function createOrUpdateContactSignedPreKey(
+  data: ContactSignedPreKey
+): Promise<void>;
+export function getContactSignedPreKeyById(
+  id: number
+): Promise<ContactSignedPreKey | null>;
 export function getContactSignedPreKeyByIdentityKey(
   key: string
-): Promise<PreKey>;
+): Promise<ContactSignedPreKey | null>;
 export function getContactSignedPreKeys(
-  keyId: string,
+  keyId: number,
   identityKeyString: string
-): Promise<Array<PreKey>>;
+): Promise<Array<ContactSignedPreKey>>;
 export function bulkAddContactSignedPreKeys(
-  array: Array<PreKey>
+  array: Array<ContactSignedPreKey>
 ): Promise<void>;
 export function removeContactSignedPreKeyByIdentityKey(
   id: string
@@ -122,8 +151,8 @@ export function removeAllContactSignedPreKeys(): Promise<void>;
 
 // Authorisations & Linking
 export function createOrUpdatePairingAuthorisation(
-  data: PairingAuthorisationInit
-): Promise<PairingAuthorisation>;
+  data: PairingAuthorisation
+): Promise<void>;
 export function removePairingAuthorisationForSecondaryPubKey(
   pubKey: string
 ): Promise<void>;
@@ -132,10 +161,10 @@ export function getGrantAuthorisationsForPrimaryPubKey(
 ): Promise<Array<PairingAuthorisation>>;
 export function getGrantAuthorisationForSecondaryPubKey(
   pubKey: string
-): Promise<PairingAuthorisation>;
+): Promise<PairingAuthorisation | null>;
 export function getAuthorisationForSecondaryPubKey(
   pubKey: string
-): Promise<PairingAuthorisation>;
+): Promise<PairingAuthorisation | null>;
 export function getSecondaryDevicesFor(
   primaryDevicePubKey: string
 ): Promise<Array<string>>;