From f8cd997b13bf134a5fa38b538f93f04c5fb9de4e Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Mon, 13 Jul 2020 15:57:53 +1000
Subject: [PATCH] constants-to-ts

---
 libtextsecure/outgoing_message.js             |  8 ++--
 preload.js                                    | 44 -----------------
 stylesheets/_session_left_pane.scss           |  2 +-
 ts/components/session/SessionIdEditable.tsx   | 14 +++++-
 .../session/settings/SessionSettings.tsx      |  6 ++-
 ts/session/constants.ts                       | 13 +++++
 ts/session/index.ts                           |  3 +-
 .../outgoing/content/ContentMessage.ts        |  4 +-
 .../outgoing/content/EndSessionMessage.ts     |  3 +-
 .../content/SessionEstablishedMessage.ts      |  3 +-
 .../outgoing/content/SessionRequestMessage.ts |  3 +-
 .../outgoing/content/TypingMessage.ts         |  3 +-
 .../content/data/DeviceUnlinkMessage.ts       |  3 +-
 .../content/link/DeviceLinkRequestMessage.ts  |  3 +-
 ts/session/utils/Number.ts                    | 47 +++++++++++++++++++
 ts/session/utils/index.ts                     |  2 +
 ts/window.d.ts                                |  1 -
 17 files changed, 99 insertions(+), 63 deletions(-)
 create mode 100644 ts/session/constants.ts
 create mode 100644 ts/session/utils/Number.ts

diff --git a/libtextsecure/outgoing_message.js b/libtextsecure/outgoing_message.js
index 0ad7e73cc..68de4dfb3 100644
--- a/libtextsecure/outgoing_message.js
+++ b/libtextsecure/outgoing_message.js
@@ -15,13 +15,13 @@ const NUM_SEND_CONNECTIONS = 3;
 const getTTLForType = type => {
   switch (type) {
     case 'pairing-request':
-      return window.CONSTANTS.TTL_DEFAULT_PAIRING_REQUEST;
+      return window.libsession.Constants.TTL_DEFAULT.PAIRING_REQUEST;
     case 'device-unpairing':
-      return window.CONSTANTS.TTL_DEFAULT_DEVICE_UNPAIRING;
+      return window.libsession.Constants.TTL_DEFAULT.DEVICE_UNPAIRING;
     case 'onlineBroadcast':
-      return window.CONSTANTS.TTL_DEFAULT_ONLINE_BROADCAST;
+      return window.libsession.Constants.TTL_DEFAULT.ONLINE_BROADCAST;
     default:
-      return window.CONSTANTS.TTL_DEFAULT_REGULAR_MESSAGE;
+      return window.libsession.Constants.TTL_DEFAULT.REGULAR_MESSAGE;
   }
 };
 
diff --git a/preload.js b/preload.js
index db2fb75a6..0a45db23f 100644
--- a/preload.js
+++ b/preload.js
@@ -75,44 +75,6 @@ window.isBeforeVersion = (toCheck, baseVersion) => {
   }
 };
 
-window.timeAsMs = (value, unit) => {
-  // Converts a time to milliseconds
-  // Valid units: second, minute, hour, day
-  const unitAsSingular = unit.replace(new RegExp('s?$'), '');
-
-  switch (unitAsSingular) {
-    case 'second':
-      return value * 1000;
-    case 'minute':
-      return value * 60 * 1000;
-    case 'hour':
-      return value * 60 * 60 * 1000;
-    case 'day':
-      return value * 24 * 60 * 60 * 1000;
-    default:
-      return value;
-  }
-};
-
-window.msAsUnit = (value, unit) => {
-  // Converts milliseconds to your preferred unit
-  // Valid units: second(s), minute(s), hour(s), day(s)
-  const unitAsSingular = unit.replace(new RegExp('s?$'), '');
-
-  switch (unitAsSingular) {
-    case 'second':
-      return value / 1000;
-    case 'minute':
-      return value / 60 / 1000;
-    case 'hour':
-      return value / 60 / 60 / 1000;
-    case 'day':
-      return value / 24 / 60 / 60 / 1000;
-    default:
-      return value;
-  }
-};
-
 // eslint-disable-next-line func-names
 window.CONSTANTS = new (function() {
   this.MAX_LOGIN_TRIES = 3;
@@ -129,12 +91,6 @@ window.CONSTANTS = new (function() {
   this.NOTIFICATION_ENABLE_TIMEOUT_SECONDS = 10;
   this.SESSION_ID_LENGTH = 66;
 
-  // TTL Defaults
-  this.TTL_DEFAULT_PAIRING_REQUEST = window.timeAsMs(2, 'minutes');
-  this.TTL_DEFAULT_DEVICE_UNPAIRING = window.timeAsMs(4, 'days');
-  this.TTL_DEFAULT_ONLINE_BROADCAST = window.timeAsMs(1, 'minute');
-  this.TTL_DEFAULT_REGULAR_MESSAGE = window.timeAsMs(2, 'days');
-
   // Loki Name System (LNS)
   this.LNS_DEFAULT_LOOKUP_TIMEOUT = 6000;
   // Minimum nodes version for LNS lookup
diff --git a/stylesheets/_session_left_pane.scss b/stylesheets/_session_left_pane.scss
index a5ed85e82..ab1341ba7 100644
--- a/stylesheets/_session_left_pane.scss
+++ b/stylesheets/_session_left_pane.scss
@@ -242,7 +242,7 @@ $session-compose-margin: 20px;
     align-items: center;
     overflow-y: auto;
     overflow-x: hidden;
-    
+
     .session-icon .exit {
       padding: 13px;
     }
diff --git a/ts/components/session/SessionIdEditable.tsx b/ts/components/session/SessionIdEditable.tsx
index e2a6cd134..36dbd1843 100644
--- a/ts/components/session/SessionIdEditable.tsx
+++ b/ts/components/session/SessionIdEditable.tsx
@@ -29,7 +29,14 @@ export class SessionIdEditable extends React.PureComponent<Props> {
   }
 
   public render() {
-    const { placeholder, editable, text, value, maxLength, isGroup } = this.props;
+    const {
+      placeholder,
+      editable,
+      text,
+      value,
+      maxLength,
+      isGroup,
+    } = this.props;
 
     return (
       <div
@@ -40,7 +47,10 @@ export class SessionIdEditable extends React.PureComponent<Props> {
       >
         <textarea
           className={classNames(
-            isGroup ? 'group-id-editable-textarea' : 'session-id-editable-textarea')}
+            isGroup
+              ? 'group-id-editable-textarea'
+              : 'session-id-editable-textarea'
+          )}
           ref={this.inputRef}
           placeholder={placeholder}
           disabled={!editable}
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 1a173a5a5..815859e9c 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -10,6 +10,8 @@ import {
 import { UserUtil } from '../../../util';
 import { MultiDeviceProtocol } from '../../../session/protocols';
 import { PubKey } from '../../../session/types';
+import { Constants } from '../../../session';
+import { NumberUtils } from '../../../session/utils';
 
 export enum SessionSettingCategory {
   Appearance = 'appearance',
@@ -455,8 +457,8 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
           step: 6,
           min: 12,
           max: 96,
-          defaultValue: window.msAsUnit(
-            window.CONSTANTS.TTL_DEFAULT_REGULAR_MESSAGE,
+          defaultValue: NumberUtils.msAsUnit(
+            Constants.TTL_DEFAULT.REGULAR_MESSAGE,
             'hour'
           ),
           info: (value: number) => `${value} Hours`,
diff --git a/ts/session/constants.ts b/ts/session/constants.ts
new file mode 100644
index 000000000..98d6cea20
--- /dev/null
+++ b/ts/session/constants.ts
@@ -0,0 +1,13 @@
+import { NumberUtils } from './utils';
+
+// Default TTL
+export const TTL_DEFAULT = {
+  PAIRING_REQUEST:      NumberUtils.timeAsMs(2, 'minutes'),
+  DEVICE_UNPAIRING:     NumberUtils.timeAsMs(4, 'days'),
+  SESSION_REQUEST:      NumberUtils.timeAsMs(4, 'days'),
+  END_SESSION_MESSAGE:  NumberUtils.timeAsMs(4, 'days'),
+  TYPING_MESSAGE:       NumberUtils.timeAsMs(1, 'minute'),
+  ONLINE_BROADCAST:     NumberUtils.timeAsMs(1, 'minute'),
+  SESSION_ESTABLISHED:  NumberUtils.timeAsMs(5, 'minutes'),
+  REGULAR_MESSAGE:      NumberUtils.timeAsMs(2, 'days'),
+};
diff --git a/ts/session/index.ts b/ts/session/index.ts
index f53c4d63d..1cfe7c1b6 100644
--- a/ts/session/index.ts
+++ b/ts/session/index.ts
@@ -2,7 +2,8 @@ import * as Messages from './messages';
 import * as Protocols from './protocols';
 import * as Types from './types';
 import * as Utils from './utils';
+import * as Constants from './constants';
 
 export * from './instance';
 
-export { Messages, Utils, Protocols, Types };
+export { Messages, Utils, Protocols, Types, Constants };
diff --git a/ts/session/messages/outgoing/content/ContentMessage.ts b/ts/session/messages/outgoing/content/ContentMessage.ts
index 5eab1bc3e..abe7b97a1 100644
--- a/ts/session/messages/outgoing/content/ContentMessage.ts
+++ b/ts/session/messages/outgoing/content/ContentMessage.ts
@@ -1,5 +1,6 @@
 import { Message } from '../Message';
 import { SignalService } from '../../../../protobuf';
+import { Constants } from '../../..';
 
 export abstract class ContentMessage extends Message {
   public plainTextBuffer(): Uint8Array {
@@ -14,7 +15,6 @@ export abstract class ContentMessage extends Message {
    * this value can be used in all child classes
    */
   protected getDefaultTTL(): number {
-    // 1 day default for any other message
-    return 24 * 60 * 60 * 1000;
+    return Constants.TTL_DEFAULT.REGULAR_MESSAGE;
   }
 }
diff --git a/ts/session/messages/outgoing/content/EndSessionMessage.ts b/ts/session/messages/outgoing/content/EndSessionMessage.ts
index 5368dcf85..79461b775 100644
--- a/ts/session/messages/outgoing/content/EndSessionMessage.ts
+++ b/ts/session/messages/outgoing/content/EndSessionMessage.ts
@@ -1,9 +1,10 @@
 import { SessionRequestMessage } from './SessionRequestMessage';
 import { SignalService } from '../../../../protobuf';
+import { Constants } from '../../..';
 
 export class EndSessionMessage extends SessionRequestMessage {
   public ttl(): number {
-    return 4 * 24 * 60 * 60 * 1000; // 4 days
+    return Constants.TTL_DEFAULT.END_SESSION_MESSAGE;
   }
 
   protected contentProto(): SignalService.Content {
diff --git a/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts b/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts
index c5b19b66a..35a4bfacb 100644
--- a/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts
+++ b/ts/session/messages/outgoing/content/SessionEstablishedMessage.ts
@@ -2,6 +2,7 @@ import { ContentMessage } from './ContentMessage';
 import { SignalService } from '../../../../protobuf';
 import * as crypto from 'crypto';
 import { MessageParams } from '../Message';
+import { Constants } from '../../..';
 
 export class SessionEstablishedMessage extends ContentMessage {
   public readonly padding: Buffer;
@@ -18,7 +19,7 @@ export class SessionEstablishedMessage extends ContentMessage {
     this.padding = crypto.randomBytes(paddingLength);
   }
   public ttl(): number {
-    return 5 * 60 * 1000;
+    return Constants.TTL_DEFAULT.SESSION_ESTABLISHED;
   }
 
   protected contentProto(): SignalService.Content {
diff --git a/ts/session/messages/outgoing/content/SessionRequestMessage.ts b/ts/session/messages/outgoing/content/SessionRequestMessage.ts
index b7c0be756..adf73584a 100644
--- a/ts/session/messages/outgoing/content/SessionRequestMessage.ts
+++ b/ts/session/messages/outgoing/content/SessionRequestMessage.ts
@@ -1,6 +1,7 @@
 import { ContentMessage } from './ContentMessage';
 import { SignalService } from '../../../../protobuf';
 import { MessageParams } from '../Message';
+import { Constants } from '../../..';
 
 export interface PreKeyBundleType {
   identityKey: Uint8Array;
@@ -17,7 +18,7 @@ interface SessionRequestParams extends MessageParams {
 }
 
 export class SessionRequestMessage extends ContentMessage {
-  public static readonly ttl = 4 * 24 * 60 * 60 * 1000; // 4 days
+  public static readonly ttl = Constants.TTL_DEFAULT.SESSION_REQUEST;
   private readonly preKeyBundle: PreKeyBundleType;
 
   constructor(params: SessionRequestParams) {
diff --git a/ts/session/messages/outgoing/content/TypingMessage.ts b/ts/session/messages/outgoing/content/TypingMessage.ts
index 3c1f247bd..38f9c3729 100644
--- a/ts/session/messages/outgoing/content/TypingMessage.ts
+++ b/ts/session/messages/outgoing/content/TypingMessage.ts
@@ -4,6 +4,7 @@ import { TextEncoder } from 'util';
 import { MessageParams } from '../Message';
 import { StringUtils } from '../../../utils';
 import { PubKey } from '../../../types';
+import { Constants } from '../../..';
 
 interface TypingMessageParams extends MessageParams {
   isTyping: boolean;
@@ -26,7 +27,7 @@ export class TypingMessage extends ContentMessage {
   }
 
   public ttl(): number {
-    return 60 * 1000; // 1 minute for typing indicators
+    return Constants.TTL_DEFAULT.TYPING_MESSAGE;
   }
 
   protected contentProto(): SignalService.Content {
diff --git a/ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts b/ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts
index 3b6bd99e2..4cba93a08 100644
--- a/ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts
+++ b/ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts
@@ -1,9 +1,10 @@
 import { DataMessage } from './DataMessage';
 import { SignalService } from '../../../../../protobuf';
+import { Constants } from '../../../..';
 
 export class DeviceUnlinkMessage extends DataMessage {
   public ttl(): number {
-    return 4 * 24 * 60 * 60 * 1000; // 4 days for device unlinking
+    return Constants.TTL_DEFAULT.DEVICE_UNPAIRING;
   }
 
   public dataProto(): SignalService.DataMessage {
diff --git a/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts b/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts
index 945f9f00e..ab4e91ef9 100644
--- a/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts
+++ b/ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts
@@ -1,6 +1,7 @@
 import { ContentMessage } from '../ContentMessage';
 import { SignalService } from '../../../../../protobuf';
 import { MessageParams } from '../../Message';
+import { Constants } from '../../../..';
 export interface DeviceLinkMessageParams extends MessageParams {
   primaryDevicePubKey: string;
   secondaryDevicePubKey: string;
@@ -20,7 +21,7 @@ export class DeviceLinkRequestMessage extends ContentMessage {
   }
 
   public ttl(): number {
-    return 2 * 60 * 1000; // 2 minutes for pairing requests
+    return Constants.TTL_DEFAULT.PAIRING_REQUEST;
   }
 
   protected getDataMessage(): SignalService.DataMessage | undefined {
diff --git a/ts/session/utils/Number.ts b/ts/session/utils/Number.ts
new file mode 100644
index 000000000..bc4f4267f
--- /dev/null
+++ b/ts/session/utils/Number.ts
@@ -0,0 +1,47 @@
+type TimeUnit =
+  | 'second'
+  | 'seconds'
+  | 'minute'
+  | 'minutes'
+  | 'hour'
+  | 'hours'
+  | 'day'
+  | 'days';
+
+export const timeAsMs = (value: number, unit: TimeUnit) => {
+  // Converts a time to milliseconds
+  // Valid units: second, minute, hour, day
+  const unitAsSingular = unit.replace(new RegExp('s?$'), '');
+
+  switch (unitAsSingular) {
+    case 'second':
+      return value * 1000;
+    case 'minute':
+      return value * 60 * 1000;
+    case 'hour':
+      return value * 60 * 60 * 1000;
+    case 'day':
+      return value * 24 * 60 * 60 * 1000;
+    default:
+      return value;
+  }
+};
+
+export const msAsUnit = (value: number, unit: TimeUnit) => {
+  // Converts milliseconds to your preferred unit
+  // Valid units: second(s), minute(s), hour(s), day(s)
+  const unitAsSingular = unit.replace(new RegExp('s?$'), '');
+
+  switch (unitAsSingular) {
+    case 'second':
+      return value / 1000;
+    case 'minute':
+      return value / 60 / 1000;
+    case 'hour':
+      return value / 60 / 60 / 1000;
+    case 'day':
+      return value / 24 / 60 / 60 / 1000;
+    default:
+      return value;
+  }
+};
diff --git a/ts/session/utils/index.ts b/ts/session/utils/index.ts
index 5548d7125..d9cafc0fa 100644
--- a/ts/session/utils/index.ts
+++ b/ts/session/utils/index.ts
@@ -2,6 +2,7 @@ import * as MessageUtils from './Messages';
 import * as GroupUtils from './Groups';
 import * as SyncMessageUtils from './SyncMessage';
 import * as StringUtils from './String';
+import * as NumberUtils from './Number';
 import * as PromiseUtils from './Promise';
 import * as ProtobufUtils from './Protobuf';
 
@@ -14,6 +15,7 @@ export {
   SyncMessageUtils,
   GroupUtils,
   StringUtils,
+  NumberUtils,
   PromiseUtils,
   ProtobufUtils,
 };
diff --git a/ts/window.d.ts b/ts/window.d.ts
index e05ae8c95..5ea680b4c 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -19,7 +19,6 @@ If you import anything in global.d.ts, the type system won't work correctly.
 declare global {
   interface Window {
     CONSTANTS: any;
-    msAsUnit: any;
     ConversationController: any;
     Events: any;
     Lodash: any;