fix: add libsession nodejs with expiretimer and resolve issues

2 years ago · adf5574318
parent 5d2d901aa0
commit adf5574318
9 changed files with 35 additions and 40 deletions
--- a/package.json
+++ b/package.json
@ -102,7 +102,7 @@
    "glob": "7.1.2",
    "image-type": "^4.1.0",
    "ip2country": "1.0.1",
-    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz",
+    "libsession_util_nodejs": "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.0/libsession_util_nodejs-v0.2.0.tar.gz",
    "libsodium-wrappers-sumo": "^0.7.9",
    "linkify-it": "3.0.2",
    "lodash": "^4.17.21",
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@ -1226,7 +1226,7 @@ function insertContactIntoContactWrapper(
    const dbApprovedMe = !!contact.didApproveMe || false;
    const dbBlocked = blockedNumbers.includes(contact.id);
    const priority = contact.priority || CONVERSATION_PRIORITIES.default;
-    // const expirationTimerSeconds = contact.expireTimer || 0;
+    const expirationTimerSeconds = contact.expireTimer || 0;

    const wrapperContact = getContactInfoFromDBValues({
      id: contact.id,
@ -1239,8 +1239,7 @@ function insertContactIntoContactWrapper(
      dbProfileUrl: contact.avatarPointer || undefined,
      priority,
      dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000),
-
-      // expirationTimerSeconds,
+      expirationTimerSeconds, //FIXME WILL add expirationMode here
    });

    try {
@ -1265,7 +1264,7 @@ function insertContactIntoContactWrapper(
            dbProfileUrl: undefined,
            priority: CONVERSATION_PRIORITIES.default,
            dbCreatedAtSeconds: Math.floor(Date.now() / 1000),
-            // expirationTimerSeconds: 0,
+            expirationTimerSeconds: 0, //FIXME WILL add expirationMode here
          })
        );
      } catch (e) {
@ -1379,7 +1378,7 @@ function insertCommunityIntoWrapper(
 function insertLegacyGroupIntoWrapper(
  legacyGroup: Pick<
    ConversationAttributes,
-    'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' // | 'expireTimer'
+    'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' | 'expireTimer'
  > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
  userGroupConfigWrapper: UserGroupsWrapperNode,
  volatileInfoConfigWrapper: ConvoInfoVolatileWrapperNode,
@ -1388,7 +1387,7 @@ function insertLegacyGroupIntoWrapper(
  const {
    priority,
    id,
-    // expireTimer,
+    expireTimer,
    groupAdmins,
    members,
    displayNameInProfile,
@ -1403,7 +1402,7 @@ function insertLegacyGroupIntoWrapper(
  const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
    id,
    priority,
-    // expireTimer,
+    expireTimer, //FIXME WILL add expirationMode here
    groupAdmins,
    members,
    displayNameInProfile,
@ -1631,7 +1630,7 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
      const ourDbProfileUrl = ourConversation.avatarPointer || '';
      const ourDbProfileKey = fromHexToArray(ourConversation.profileKey || '');
      const ourConvoPriority = ourConversation.priority;
-      // const ourConvoExpire = ourConversation.expireTimer || 0;
+      const ourConvoExpire = ourConversation.expireTimer || 0;
      if (ourDbProfileUrl && !isEmpty(ourDbProfileKey)) {
        userProfileWrapper.setUserInfo(
          ourDbName,
@ -1639,8 +1638,8 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
          {
            url: ourDbProfileUrl,
            key: ourDbProfileKey,
-          }
-          // ourConvoExpire
+          },
+          ourConvoExpire
        );
      }

--- a/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
+++ b/ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
@ -124,7 +124,7 @@ export function isOpenGroupV2(conversationId: string) {
 * @returns A map of conversationIds to roomInfos for all valid open group conversations or undefined
 */
 export async function getAllValidOpenGroupV2ConversationRoomInfos() {
-  const inWrapperCommunities = SessionUtilUserGroups.getAllCommunitiesCached();
+  const inWrapperCommunities = await SessionUtilUserGroups.getAllCommunitiesNotCached();

  const inWrapperIds = inWrapperCommunities.map(m =>
    getOpenGroupV2ConversationId(m.baseUrl, m.roomCasePreserved)
--- a/ts/session/utils/libsession/libsession_utils_contacts.ts
+++ b/ts/session/utils/libsession/libsession_utils_contacts.ts
@ -57,8 +57,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
  const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
  const dbBlocked = !!foundConvo.isBlocked() || false;
  const priority = foundConvo.get('priority') || 0;
-  // expiration timer is not tracked currently but will be once disappearing message is merged into userconfig
-  // const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;
+  const expirationTimerSeconds = foundConvo.get('expireTimer') || 0;

  const wrapperContact = getContactInfoFromDBValues({
    id,
@ -71,7 +70,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
    dbProfileUrl,
    priority,
    dbCreatedAtSeconds: 0, // just give 0, now() will be used internally by the wrapper if the contact does not exist yet.
-    // expirationTimerSeconds,
+    expirationTimerSeconds, //FIXME WILL add expirationMode here
  });
  try {
    window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact));
--- a/ts/session/utils/libsession/libsession_utils_user_groups.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_groups.ts
@ -113,7 +113,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
        priority: foundConvo.get('priority'),
        members: foundConvo.get('members') || [],
        groupAdmins: foundConvo.get('groupAdmins') || [],
-        // expireTimer: foundConvo.get('expireTimer'),
+        expireTimer: foundConvo.get('expireTimer'), //FIXME WILL add expirationMode here
        displayNameInProfile: foundConvo.get('displayNameInProfile'),
        encPubkeyHex: encryptionKeyPair?.publicHex || '',
        encSeckeyHex: encryptionKeyPair?.privateHex || '',
--- a/ts/session/utils/libsession/libsession_utils_user_profile.ts
+++ b/ts/session/utils/libsession/libsession_utils_user_profile.ts
@ -26,7 +26,7 @@ async function insertUserProfileIntoWrapper(convoId: string) {
      { url: dbProfileUrl, key: dbProfileKey }
    )} `
  );
-  // const expirySeconds = ourConvo.get('expireTimer') || 0;
+  const expirySeconds = ourConvo.get('expireTimer') || 0;
  if (dbProfileUrl && !isEmpty(dbProfileKey)) {
    await UserConfigWrapperActions.setUserInfo(
      dbName,
@ -34,11 +34,11 @@ async function insertUserProfileIntoWrapper(convoId: string) {
      {
        url: dbProfileUrl,
        key: dbProfileKey,
-      }
-      // expirySeconds
+      },
+      expirySeconds
    );
  } else {
-    await UserConfigWrapperActions.setUserInfo(dbName, priority, null); // expirySeconds
+    await UserConfigWrapperActions.setUserInfo(dbName, priority, null, expirySeconds);
  }
 }

--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@ -116,8 +116,8 @@ export function getContactInfoFromDBValues({
  dbProfileUrl,
  dbProfileKey,
  dbCreatedAtSeconds,
-}: // expirationTimerSeconds,
-{
+  expirationTimerSeconds, //FIXME WILL add expirationMode here
+}: {
  id: string;
  dbApproved: boolean;
  dbApprovedMe: boolean;
@ -128,7 +128,7 @@ export function getContactInfoFromDBValues({
  dbCreatedAtSeconds: number;
  dbProfileUrl: string | undefined;
  dbProfileKey: string | undefined;
-  // expirationTimerSeconds: number | undefined;
+  expirationTimerSeconds: number | undefined;
 }): ContactInfoSet {
  const wrapperContact: ContactInfoSet = {
    id,
@ -139,14 +139,11 @@ export function getContactInfoFromDBValues({
    nickname: dbNickname,
    name: dbName,
    createdAtSeconds: dbCreatedAtSeconds,
-    // expirationTimerSeconds:
-    //   !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
-    //     ? expirationTimerSeconds
-    //     : 0, // TODOLATER add the expiration mode handling
-    // expirationMode:
-    //   !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
-    //     ? 'disappearAfterSend'
-    //     : 'off',
+    expirationTimerSeconds:
+      !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
+        ? expirationTimerSeconds
+        : 0,
+    expirationMode: 'off', //FIXME WILL add expirationMode here
  };

  if (
@ -202,14 +199,14 @@ export function getLegacyGroupInfoFromDBValues({
  priority,
  members: maybeMembers,
  displayNameInProfile,
-  // expireTimer,
+  expireTimer,
  encPubkeyHex,
  encSeckeyHex,
  groupAdmins: maybeAdmins,
  lastJoinedTimestamp,
 }: Pick<
  ConversationAttributes,
-  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' //| 'expireTimer'
+  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' | 'expireTimer'
 > & {
  encPubkeyHex: string;
  encSeckeyHex: string;
@ -227,7 +224,7 @@ export function getLegacyGroupInfoFromDBValues({
  });
  const legacyGroup: LegacyGroupInfo = {
    pubkeyHex: id,
-    // disappearingTimerSeconds: !expireTimer ? 0 : expireTimer,
+    disappearingTimerSeconds: !expireTimer ? 0 : expireTimer, //FIXME WILL add expirationMode here
    name: displayNameInProfile || '',
    priority: priority || 0,
    members: wrappedMembers,
--- a/ts/webworker/workers/browser/libsession_worker_interface.ts
+++ b/ts/webworker/workers/browser/libsession_worker_interface.ts
@ -104,8 +104,8 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
  setUserInfo: async (
    name: string,
    priority: number,
-    profilePic: { url: string; key: Uint8Array } | null
-    // expireSeconds: number
+    profilePic: { url: string; key: Uint8Array } | null,
+    expireSeconds: number
  ) =>
    callLibSessionWorker([
      'UserConfig',
@ -113,7 +113,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
      name,
      priority,
      profilePic,
-      // expireSeconds,
+      expireSeconds,
    ]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>,
 };

--- a/yarn.lock
+++ b/yarn.lock
@ -5155,9 +5155,9 @@ levn@~0.3.0:
    prelude-ls "~1.1.2"
    type-check "~0.3.2"

-"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz":
-  version "0.1.20"
-  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz#4ff8331e4efb1725cf8bba0ef1af7496ebd8533d"
+"libsession_util_nodejs@https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.0/libsession_util_nodejs-v0.2.0.tar.gz":
+  version "0.2.0"
+  resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.0/libsession_util_nodejs-v0.2.0.tar.gz#0019ca2e3296b1e151dcd09923823c271dd2c0a0"
  dependencies:
    cmake-js "^7.2.1"
    node-addon-api "^6.1.0"