Merge pull request #1406 from Bilb/feat/add-multi-part-support

feat: add multi part libsession config msg support

Author: Bilb

package.json

@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.15.2",
+  "version": "1.16.0",
   "license": "GPL-3.0",
   "author": {
     "name": "Session Foundation",
@@ -79,7 +79,7 @@
     "fs-extra": "11.3.0",
     "glob": "10.4.5",
     "image-type": "^4.1.0",
-    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.33/libsession_util_nodejs-v0.4.33.tar.gz",
+    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.5.3/libsession_util_nodejs-v0.5.3.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.15",
     "linkify-it": "^5.0.0",
     "lodash": "^4.17.21",

ts/components/SessionPasswordPrompt.tsx

@@ -41,7 +41,7 @@ const StyledContent = styled.div`
   width: 100%;
 `;
 
-// We cannot import toastutils from the password window as it is pulling the whole sending
+// We cannot import ToastUtils from the password window as it is pulling the whole sending
 // pipeline(and causing crashes on Session instances with password)
 function pushToastError(id: string, description: string) {
   toast.error(<SessionToast description={description} />, {

ts/components/basic/SessionButton.tsx

@@ -127,6 +127,7 @@ export type SessionButtonProps = {
   dataTestId?: React.SessionDataTestId;
   reference?: RefObject<HTMLButtonElement>;
   className?: string;
+  style?: React.CSSProperties;
 };
 
 export const SessionButton = (props: SessionButtonProps) => {
@@ -145,6 +146,7 @@ export const SessionButton = (props: SessionButtonProps) => {
     onClick = null,
     fontWeight,
     margin,
+    style,
   } = props;
 
   const clickHandler = (e: any) => {
@@ -175,7 +177,7 @@ export const SessionButton = (props: SessionButtonProps) => {
       ref={reference}
       data-testid={dataTestId}
       $fontWeight={fontWeight}
-      style={{ margin }}
+      style={{ ...style, margin }}
     >
       {props.children || text}
     </StyledButton>

ts/components/dialog/debug/components.tsx

@@ -6,6 +6,8 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 import useInterval from 'react-use/lib/useInterval';
 import { filesize } from 'filesize';
 
+import type { PubkeyType } from 'libsession_util_nodejs';
+import { chunk } from 'lodash';
 import { Flex } from '../../basic/Flex';
 import { SpacerXS } from '../../basic/Text';
 import { localize } from '../../../localization/localeTools';
@@ -15,14 +17,48 @@ import { SessionButton, SessionButtonColor } from '../../basic/SessionButton';
 import { ToastUtils, UserUtils } from '../../../session/utils';
 import { getLatestReleaseFromFileServer } from '../../../session/apis/file_server_api/FileServerApi';
 import { SessionSpinner } from '../../loading';
-import { setDebugMode } from '../../../state/ducks/debug';
 import { updateDebugMenuModal } from '../../../state/ducks/modalDialog';
+import { setDebugMode } from '../../../state/ducks/debug';
 import LIBSESSION_CONSTANTS from '../../../session/utils/libsession/libsession_constants';
 import { type ReleaseChannels } from '../../../updater/types';
 import { fetchLatestRelease } from '../../../session/fetch_latest_release';
 import { saveLogToDesktop } from '../../../util/logger/renderer_process_logging';
 import { DURATION } from '../../../session/constants';
 import { Errors } from '../../../types/Errors';
+import { PubKey } from '../../../session/types';
+import { ConvoHub } from '../../../session/conversations';
+import { ConversationTypeEnum } from '../../../models/types';
+import { ContactsWrapperActions } from '../../../webworker/workers/browser/libsession_worker_interface';
+import { usePolling } from '../../../hooks/usePolling';
+
+const hexRef = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
+
+function genRandomHexString(length: number) {
+  const result = [];
+
+  for (let n = 0; n < length; n++) {
+    result.push(hexRef[Math.floor(Math.random() * 16)]);
+  }
+  return result.join('');
+}
+
+async function generateOneRandomContact() {
+  const numBytes = PubKey.PUBKEY_LEN - 2;
+
+  const hexBuffer = genRandomHexString(numBytes);
+  const id: PubkeyType = `05${hexBuffer}`;
+  const created = await ConvoHub.use().getOrCreateAndWait(id, ConversationTypeEnum.PRIVATE);
+  // now() is not going to be synced on devices, instead createdAt will be used.
+  // createdAt is set to now in libsession-util itself,
+  // but we still need to mark that conversation as active
+  // for it to be inserted in the config
+  created.setKey('active_at', Date.now());
+  created.setKey('isApproved', true);
+  created.setSessionDisplayNameNoCommit(id.slice(2, 8));
+
+  await created.commit();
+  return created;
+}
 
 const CheckVersionButton = ({ channelToCheck }: { channelToCheck: ReleaseChannels }) => {
   const [loading, setLoading] = useState(false);
@@ -172,12 +208,68 @@ const ClearOldLogsButton = () => {
       onClick={() => {
         void handleDeleteAllLogs();
       }}
+      style={{ minWidth: '250px' }}
     >
       Clear old logs {filesize(logSize)}
     </SessionButton>
   );
 };
 
+const dummyContactPerClick = 500;
+
+async function fetchContactsCountAndUpdate() {
+  const count = (await ContactsWrapperActions.getAll()).length;
+  if (count && Number.isFinite(count)) {
+    return count;
+  }
+  return 0;
+}
+
+function AddDummyContactButton() {
+  const [loading, setLoading] = useState(false);
+  const [addedCount, setAddedCount] = useState(0);
+
+  const { data: contactsCount } = usePolling(
+    fetchContactsCountAndUpdate,
+    1000,
+    'AddDummyContactButton'
+  );
+
+  return (
+    <SessionButton
+      onClick={async () => {
+        if (loading) {
+          return;
+        }
+        try {
+          setLoading(true);
+          setAddedCount(0);
+          const chunkSize = 10;
+          const allIndexes = Array.from({ length: dummyContactPerClick }).map((_unused, i) => i);
+          const chunks = chunk(allIndexes, chunkSize);
+          for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
+            // eslint-disable-next-line no-await-in-loop
+            await Promise.all(chunks[chunkIndex].map(() => generateOneRandomContact()));
+            setAddedCount(Math.min(chunkIndex * chunkSize, dummyContactPerClick));
+          }
+        } finally {
+          setLoading(false);
+          setAddedCount(0);
+        }
+      }}
+      disabled={loading}
+    >
+      {loading ? (
+        <>
+          {addedCount}/{dummyContactPerClick}...
+        </>
+      ) : (
+        `Add ${dummyContactPerClick} contacts (${contactsCount})`
+      )}
+    </SessionButton>
+  );
+}
+
 export const DebugActions = () => {
   const dispatch = useDispatch();
 
@@ -246,6 +338,7 @@ export const DebugActions = () => {
         >
           Open storage profile
         </SessionButton>
+        <AddDummyContactButton />
       </Flex>
     </>
   );

ts/hooks/usePolling.ts

@@ -0,0 +1,44 @@
+import { useEffect, useState } from 'react';
+
+export function usePolling<T>(fn: () => Promise<T>, pollInterval: number, identifier: string) {
+  const [data, setData] = useState<T | null>(null);
+  const [error, setError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    let isMounted = true;
+
+    const execute = async () => {
+      if (!isMounted) {
+        return;
+      }
+
+      try {
+        const result = await fn();
+        if (isMounted) {
+          setData(result);
+          setError(null);
+        }
+      } catch (err) {
+        window.log.warn(`${identifier} polling error:`, err);
+        if (isMounted) {
+          setError(err as Error);
+        }
+      }
+    };
+
+    const voidedExecute = () => {
+      void execute();
+    };
+
+    voidedExecute();
+
+    const interval = setInterval(voidedExecute, pollInterval);
+
+    return () => {
+      isMounted = false;
+      clearInterval(interval);
+    };
+  }, [fn, pollInterval, identifier]);
+
+  return { data, error };
+}

ts/mains/main_renderer.tsx

@@ -87,6 +87,7 @@ window.globalOnlineStatus = true; // default to true as we don't get an event on
 window.getGlobalOnlineStatus = () => window.globalOnlineStatus;
 
 window.log.info('background page reloaded');
+
 window.log.info('environment:', window.getEnvironment());
 
 let newVersion = false;
@@ -154,6 +155,7 @@ Storage.onready(async () => {
     return;
   }
   first = false;
+
   // Update zoom
   window.updateZoomFactor();
 

ts/models/conversation.ts

@@ -1533,7 +1533,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
     }
 
     if (valueForced !== Boolean(this.isApproved())) {
-      window?.log?.info(`Setting ${ed25519Str(this.id)} isApproved to: ${value}`);
+      window?.log?.debug(`Setting ${ed25519Str(this.id)} isApproved to: ${value}`);
       this.set({
         isApproved: valueForced,
       });
@@ -1554,7 +1554,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
     }
     const valueForced = Boolean(value);
     if (valueForced !== Boolean(this.didApproveMe())) {
-      window?.log?.info(`Setting ${ed25519Str(this.id)} didApproveMe to: ${value}`);
+      window?.log?.debug(`Setting ${ed25519Str(this.id)} didApproveMe to: ${value}`);
       this.set({
         didApproveMe: valueForced,
       });

ts/receiver/configMessage.ts

@@ -35,8 +35,7 @@ import {
   ConfigWrapperObjectTypesMeta,
   ConfigWrapperUser,
   getGroupPubkeyFromWrapperType,
-  isBlindingWrapperType,
-  isMultiEncryptWrapperType,
+  isStaticSessionWrapper,
   isUserConfigWrapperType,
 } from '../webworker/workers/browser/libsession_worker_functions';
 // eslint-disable-next-line import/no-unresolved, import/extensions
@@ -84,13 +83,15 @@ function byUserNamespace(incomingConfigs: Array<RetrieveMessageItemWithNamespace
 }
 
 async function printDumpForDebug(prefix: string, variant: ConfigWrapperObjectTypesMeta) {
+  if (isStaticSessionWrapper(variant)) {
+    return; // nothing to print for those static wrappers
+  }
+
   if (isUserConfigWrapperType(variant)) {
     window.log.info(prefix, StringUtils.toHex(await UserGenericWrapperActions.makeDump(variant)));
     return;
   }
-  if (isMultiEncryptWrapperType(variant) || isBlindingWrapperType(variant)) {
-    return; // nothing to print for this one
-  }
+
   const metaGroupDumps = await MetaGroupWrapperActions.metaMakeDump(
     getGroupPubkeyFromWrapperType(variant)
   );
@@ -128,7 +129,6 @@ async function mergeUserConfigsWithIncomingUpdates(
           variant
         );
       }
-
       const hashesMerged = await UserGenericWrapperActions.merge(variant, toMerge);
 
       const needsDump = await UserGenericWrapperActions.needsDump(variant);