switch to dedicated server (#1646)

ts/components/session/ActionsPanel.tsx

@@ -8,6 +8,7 @@ import { UserUtils } from '../../session/utils';
 import { syncConfigurationIfNeeded } from '../../session/utils/syncUtils';
 import { DAYS, MINUTES } from '../../session/utils/Number';
 import {
+  createOrUpdateItem,
   generateAttachmentKeyIfEmpty,
   getItemById,
   hasSyncedInitialConfigurationItem,
@@ -45,6 +46,20 @@ export enum SectionType {
   Moon,
 }
 
+const showUnstableAttachmentsDialogIfNeeded = async () => {
+  const alreadyShown = (await getItemById('showUnstableAttachmentsDialog'))?.value;
+
+  if (!alreadyShown) {
+    window.confirmationDialog({
+      title: 'File server update',
+      message:
+        "We're upgrading the way files are stored. File transfer may be unstable for the next 24-48 hours.",
+    });
+
+    await createOrUpdateItem({ id: 'showUnstableAttachmentsDialog', value: true });
+  }
+};
+
 const Section = (props: { type: SectionType; avatarPath?: string }) => {
   const ourNumber = useSelector(getOurNumber);
   const unreadMessageCount = useSelector(getUnreadMessageCount);
@@ -158,6 +173,7 @@ const doAppStartUp = (dispatch: Dispatch<any>) => {
     void OnionPaths.getInstance().buildNewOnionPaths();
   }
 
+  void showUnstableAttachmentsDialogIfNeeded();
   // init the messageQueue. In the constructor, we add all not send messages
   // this call does nothing except calling the constructor, which will continue sending message in the pipeline
   void getMessageQueue().processAllPending();

ts/fileserver/FileServerApiV2.ts

@@ -4,9 +4,14 @@ import { parseStatusCodeFromOnionRequest } from '../opengroup/opengroupV2/OpenGr
 import { fromArrayBufferToBase64, fromBase64ToArrayBuffer } from '../session/utils/String';
 
 // tslint:disable-next-line: no-http-string
-export const fileServerV2URL = 'http://88.99.175.227';
-export const fileServerV2PubKey =
+export const oldFileServerV2URL = 'http://88.99.175.227';
+export const oldFileServerV2PubKey =
   '7cb31905b55cd5580c686911debf672577b3fb0bff81df4ce2d5c4cb3a7aaa69';
+// tslint:disable-next-line: no-http-string
+export const fileServerV2URL = 'http://filev2.getsession.org';
+
+export const fileServerV2PubKey =
+  'da21e1d886c6fbaea313f75298bd64aab03a97ce985b46bb2dad9f2089c8ee59';
 
 export type FileServerV2Request = {
   method: 'GET' | 'POST' | 'DELETE' | 'PUT';
@@ -14,6 +19,7 @@ export type FileServerV2Request = {
   // queryParams are used for post or get, but not the same way
   queryParams?: Record<string, any>;
   headers?: Record<string, string>;
+  isOldV2server?: boolean; // to remove in a few days
 };
 
 const FILES_ENDPOINT = 'files';
@@ -67,7 +73,8 @@ export const uploadFileToFsV2 = async (
  * @returns the data as an Uint8Array or null
  */
 export const downloadFileFromFSv2 = async (
-  fileIdOrCompleteUrl: string
+  fileIdOrCompleteUrl: string,
+  isOldV2server: boolean
 ): Promise<ArrayBuffer | null> => {
   let fileId = fileIdOrCompleteUrl;
   if (!fileIdOrCompleteUrl) {
@@ -75,13 +82,19 @@ export const downloadFileFromFSv2 = async (
     return null;
   }
 
-  const completeUrlPrefix = `${fileServerV2URL}/${FILES_ENDPOINT}/`;
-  if (fileIdOrCompleteUrl.startsWith(completeUrlPrefix)) {
-    fileId = fileId.substr(completeUrlPrefix.length);
+  const oldCompleteUrlPrefix = `${oldFileServerV2URL}/${FILES_ENDPOINT}/`;
+  const newCompleteUrlPrefix = `${fileServerV2URL}/${FILES_ENDPOINT}/`;
+
+  if (fileIdOrCompleteUrl.startsWith(newCompleteUrlPrefix)) {
+    fileId = fileId.substr(newCompleteUrlPrefix.length);
+  } else if (fileIdOrCompleteUrl.startsWith(oldCompleteUrlPrefix)) {
+    fileId = fileId.substr(oldCompleteUrlPrefix.length);
   }
+
   const request: FileServerV2Request = {
     method: 'GET',
     endpoint: `${FILES_ENDPOINT}/${fileId}`,
+    isOldV2server,
   };
 
   const result = await sendApiV2Request(request);
@@ -119,7 +132,11 @@ export const buildUrl = (request: FileServerV2Request | OpenGroupV2Request): URL
   if (isOpenGroupV2Request(request)) {
     rawURL = `${request.server}/${request.endpoint}`;
   } else {
-    rawURL = `${fileServerV2URL}/${request.endpoint}`;
+    if (request.isOldV2server) {
+      rawURL = `${oldFileServerV2URL}/${request.endpoint}`;
+    } else {
+      rawURL = `${fileServerV2URL}/${request.endpoint}`;
+    }
   }
 
   if (request.method === 'GET') {

ts/opengroup/opengroupV2/OpenGroupAPIV2.ts

@@ -57,7 +57,7 @@ const getDestinationPubKey = async (
     }
   } else {
     // this is a fileServer call
-    return FSv2.fileServerV2PubKey;
+    return request.isOldV2server ? FSv2.oldFileServerV2PubKey : FSv2.fileServerV2PubKey;
   }
 };
 

ts/receiver/attachments.ts

@@ -23,18 +23,19 @@ export async function downloadAttachment(attachment: any) {
     serverUrl
   );
   // is it an attachment hosted on the file server v2 ?
+  const defaultFsOldV2 = _.startsWith(serverUrl, FSv2.oldFileServerV2URL);
   const defaultFsV2 = _.startsWith(serverUrl, FSv2.fileServerV2URL);
 
   let res: ArrayBuffer | null = null;
 
-  if (defaultFsV2) {
+  if (defaultFsV2 || defaultFsOldV2) {
     let attachmentId = attachment.id;
     if (!attachmentId) {
       // try to get the fileId from the end of the URL
       attachmentId = attachment.url;
     }
     window.log.info('Download v2 file server attachment');
-    res = await FSv2.downloadFileFromFSv2(attachmentId);
+    res = await FSv2.downloadFileFromFSv2(attachmentId, defaultFsOldV2);
   } else if (!defaultFileserver) {
     // TODO: we need attachments to remember which API should be used to retrieve them
     const serverAPI = await window.lokiPublicChatAPI.findOrCreateServer(serverUrl);