fix: fetch nts avatar expiry on start up

Author: Bilb

preload.js

@@ -67,7 +67,7 @@ window.sessionFeatureFlags = {
   showPopoverAnchors: false,
   proAvailable: !isEmpty(process.env.SESSION_PRO),
   mockUserHasPro: !isEmpty(process.env.SESSION_HAS_PRO),
-  fsTTL30s: !isEmpty(process.env.FILE_SERVER_TTL_30S),
+  fsTTL30s: !isEmpty(process.env.FILE_SERVER_TTL_30S), // Note: some stuff are init when the app start, so this flag should only be set from the env itself.
   debug: {
     debugLogging: !isEmpty(process.env.SESSION_DEBUG),
     debugLibsessionDumps: !isEmpty(process.env.SESSION_DEBUG_LIBSESSION_DUMPS),

ts/components/leftpane/ActionsPanel.tsx

@@ -61,6 +61,9 @@ import { networkDataActions } from '../../state/ducks/networkData';
 import { searchActions } from '../../state/ducks/search';
 import { LUCIDE_ICONS_UNICODE } from '../icon/lucide';
 import { AvatarMigrate } from '../../session/utils/job_runners/jobs/AvatarMigrateJob';
+import { NetworkTime } from '../../util/NetworkTime';
+import { Storage } from '../../util/storage';
+import { getFileInfoFromFileServer } from '../../session/apis/file_server_api/FileServerApi';
 
 const StyledContainerAvatar = styled.div`
   padding: var(--margins-lg);
@@ -200,10 +203,10 @@ const triggerSyncIfNeeded = async () => {
 };
 
 const triggerAvatarReUploadIfNeeded = async () => {
-  const lastTimeStampAvatarUpload =
-    (await Data.getItemById(SettingsKey.lastAvatarUploadTimestamp))?.value || 0;
+  const lastAvatarUploadExpiryMs =
+    (await Data.getItemById(SettingsKey.ntsAvatarExpiryMs))?.value || 0;
 
-  if (Date.now() - lastTimeStampAvatarUpload > DURATION.DAYS * 14) {
+  if (NetworkTime.now() > lastAvatarUploadExpiryMs) {
     window.log.info('Reuploading avatar...');
     // reupload the avatar
     await reuploadCurrentAvatarUs();
@@ -243,10 +246,22 @@ const doAppStartUp = async () => {
     void MessageQueue.use().processAllPending();
   }, 3000);
 
-  global.setTimeout(() => {
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  global.setTimeout(async () => {
     // Schedule a confSyncJob in some time to let anything incoming from the network be applied and see if there is a push needed
     // Note: this also starts periodic jobs, so we don't need to keep doing it
-    void UserSync.queueNewJobIfNeeded();
+    await UserSync.queueNewJobIfNeeded();
+
+    // on app startup, check that the avatar expiry on the file server
+    const avatarPointer = ConvoHub.use()
+      .get(UserUtils.getOurPubKeyStrFromCache())
+      .getAvatarPointer();
+    if (avatarPointer) {
+      const details = await getFileInfoFromFileServer(avatarPointer);
+      if (details?.expiryMs) {
+        await Storage.put(SettingsKey.ntsAvatarExpiryMs, details.expiryMs);
+      }
+    }
   }, 20000);
 
   global.setTimeout(() => {
@@ -328,13 +343,16 @@ export const ActionsPanel = () => {
     void SnodePool.forceRefreshRandomSnodePool();
   }, DURATION.MINUTES * 5);
 
-  useInterval(() => {
-    if (!ourPrimaryConversation) {
-      return;
-    }
-    // this won't be run every days, but if the app stays open for more than 10 days
-    void triggerAvatarReUploadIfNeeded();
-  }, DURATION.DAYS * 1);
+  useInterval(
+    () => {
+      if (!ourPrimaryConversation) {
+        return;
+      }
+      // this won't be run every days, but if the app stays open for more than 10 days
+      void triggerAvatarReUploadIfNeeded();
+    },
+    window.sessionFeatureFlags.fsTTL30s ? DURATION.SECONDS * 1 : DURATION.DAYS * 1
+  );
 
   useCheckReleasedFeatures();
 

ts/data/settings-key.ts

@@ -11,7 +11,7 @@ const settingsOpengroupPruning = 'prune-setting';
 const settingsNotification = 'notification-setting';
 const settingsAudioNotification = 'audio-notification-setting';
 const hasSyncedInitialConfigurationItem = 'hasSyncedInitialConfigurationItem';
-const lastAvatarUploadTimestamp = 'lastAvatarUploadTimestamp';
+const ntsAvatarExpiryMs = 'ntsAvatarExpiryMs';
 const hasLinkPreviewPopupBeenDisplayed = 'hasLinkPreviewPopupBeenDisplayed';
 const hasFollowSystemThemeEnabled = 'hasFollowSystemThemeEnabled';
 const hideRecoveryPassword = 'hideRecoveryPassword';
@@ -36,7 +36,7 @@ export const SettingsKey = {
   settingsNotification,
   settingsAudioNotification,
   hasSyncedInitialConfigurationItem,
-  lastAvatarUploadTimestamp,
+  ntsAvatarExpiryMs,
   hasLinkPreviewPopupBeenDisplayed,
   latestUserProfileEnvelopeTimestamp,
   latestUserGroupEnvelopeTimestamp,

ts/interactions/avatar-interactions/nts-avatar-interactions.ts

@@ -56,7 +56,11 @@ export async function reuploadCurrentAvatarUs() {
 
   const decryptedAvatarData = await blob.arrayBuffer();
 
-  return uploadAndSetOurAvatarShared({ decryptedAvatarData, ourConvo, profileKey });
+  return uploadAndSetOurAvatarShared({
+    decryptedAvatarData,
+    ourConvo,
+    profileKey,
+  });
 }
 
 export async function uploadAndSetOurAvatarShared({
@@ -80,8 +84,10 @@ export async function uploadAndSetOurAvatarShared({
     window.log.warn('failed to upload avatar to file server');
     return null;
   }
-  const { fileUrl } = avatarPointer;
+  const { fileUrl, expiresMs } = avatarPointer;
 
+  // Note: processing the avatar here doesn't change the buffer (unless the first one was uploaded as an image too big for an avatar.)
+  // so, once we have deterministic encryption of avatars, the uploaded should always have the same hash
   const { avatarFallback, mainAvatarDetails } = await processAvatarData(decryptedAvatarData);
 
   // this encrypts and save the new avatar and returns a new attachment path
@@ -111,7 +117,7 @@ export async function uploadAndSetOurAvatarShared({
     displayName,
     avatarPointer: fileUrl,
   });
-  await Storage.put(SettingsKey.lastAvatarUploadTimestamp, Date.now());
+  await Storage.put(SettingsKey.ntsAvatarExpiryMs, expiresMs);
 
   return {
     avatarPointer: ourConvo.getAvatarPointer(),

ts/session/apis/file_server_api/FileServerApi.ts

@@ -1,4 +1,6 @@
 import AbortController from 'abort-controller';
+import { isEmpty, isFinite, isNumber, isString } from 'lodash';
+
 import { BlindingActions } from '../../../webworker/workers/browser/libsession_worker_interface';
 import { OnionSending } from '../../onions/onionSend';
 import {
@@ -20,14 +22,27 @@ const RELEASE_VERSION_ENDPOINT = '/session_version';
 
 const POST_GET_FILE_ENDPOINT = '/file';
 
+function fileUrlToFileId(fullURL?: string) {
+  const prefix = `${fileServerURL}${POST_GET_FILE_ENDPOINT}/`;
+  if (!fullURL || !fullURL.startsWith(prefix)) {
+    return null;
+  }
+  const fileId = fullURL.substring(prefix.length);
+
+  if (!fileId) {
+    return null;
+  }
+  return fileId;
+}
+
 /**
  * Upload a file to the file server v2 using the onion v4 encoding
  * @param fileContent the data to send
  * @returns null or the complete URL to share this file
  */
 export const uploadFileToFsWithOnionV4 = async (
   fileContent: ArrayBuffer
-): Promise<{ fileUrl: string } | null> => {
+): Promise<{ fileUrl: string; expiresMs: number } | null> => {
   if (!fileContent || !fileContent.byteLength) {
     return null;
   }
@@ -46,12 +61,23 @@ export const uploadFileToFsWithOnionV4 = async (
   }
 
   const fileId = result?.body?.id as number | undefined;
-  if (!fileId) {
+  const expires = result?.body?.expires as number; // expires is returned as a floating point timestamp in seconds, i.e. 1754863793.186137.
+  if (
+    !fileId ||
+    !isString(fileId) ||
+    isEmpty(fileId) ||
+    !expires ||
+    !isNumber(expires) ||
+    !isFinite(expires)
+  ) {
     return null;
   }
   const fileUrl = `${fileServerURL}${POST_GET_FILE_ENDPOINT}/${fileId}`;
+  const expiresMs = Math.floor(expires * 1000);
+  console.warn('fileUrl', fileUrl);
   return {
     fileUrl,
+    expiresMs,
   };
 };
 
@@ -179,3 +205,36 @@ export const getLatestReleaseFromFileServer = async (
   }
   return [latestVersionWithV, releaseType || releaseChannel];
 };
+
+/**
+ * Fetch the expiry in ms of the corresponding file.
+ */
+export const getFileInfoFromFileServer = async (
+  fileUrl: string
+): Promise<{ expiryMs: number } | null> => {
+  const fileId = fileUrlToFileId(fileUrl);
+
+  if (!fileId) {
+    throw new Error("getFileInfoFromFileServer: fileUrl doesn't start with the file server url");
+  }
+
+  const result = await OnionSending.sendJsonViaOnionV4ToFileServer({
+    abortSignal: new AbortController().signal,
+    stringifiedBody: null,
+    endpoint: `${POST_GET_FILE_ENDPOINT}/${fileId}/info`,
+    method: 'GET',
+    timeoutMs: 10 * DURATION.SECONDS, // longer time for file upload
+    headers: {},
+  });
+
+  const fileExpirySeconds = result?.body?.expires as number | undefined;
+
+  if (!batchGlobalIsSuccess(result)) {
+    return null;
+  }
+
+  if (!fileExpirySeconds || !isNumber(fileExpirySeconds) || !isFinite(fileExpirySeconds)) {
+    return null;
+  }
+  return { expiryMs: Math.floor(fileExpirySeconds * 1000) };
+};

ts/state/ducks/metaGroups.ts

@@ -1023,6 +1023,7 @@ async function handleAvatarChangeFromUI({
   // encrypt the avatar data with the profile key
   const encryptedData = await encryptProfile(processed.mainAvatarDetails.outputBuffer, profileKey);
 
+  // TODO: we should store the expiries of the attachment somewhere in libsession I assume, and reupload as needed
   const uploadedFileDetails = await uploadFileToFsWithOnionV4(encryptedData);
   if (!uploadedFileDetails || !uploadedFileDetails.fileUrl) {
     window?.log?.warn('File upload for groupv2 to file server failed');