keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

fix: add libsession nodejs with expiretimer and resolve issues

Browse Source
pull/2784/head
Audric Ackermann 2 years ago
parent 5d2d901aa0
commit adf5574318
9 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape Escape View File

@ -102,7 +102,7 @@
"glob": "7.1.2", "glob": "7.1.2",
"image-type": "^4.1.0", "image-type": "^4.1.0",
"ip2country": "1.0.1", "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", "libsodium-wrappers-sumo": "^0.7.9",
"linkify-it": "3.0.2", "linkify-it": "3.0.2",
"lodash": "^4.17.21", "lodash": "^4.17.21",

19
ts/node/migration/sessionMigrations.ts
Unescape Escape View File

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

2
ts/session/apis/open_group_api/utils/OpenGroupUtils.ts
Unescape Escape View File

@ -124,7 +124,7 @@ export function isOpenGroupV2(conversationId: string) {
* @returns A map of conversationIds to roomInfos for all valid open group conversations or undefined * @returns A map of conversationIds to roomInfos for all valid open group conversations or undefined
*/ */
export async function getAllValidOpenGroupV2ConversationRoomInfos() { export async function getAllValidOpenGroupV2ConversationRoomInfos() {
const inWrapperCommunities = SessionUtilUserGroups.getAllCommunitiesCached(); const inWrapperCommunities = await SessionUtilUserGroups.getAllCommunitiesNotCached();
const inWrapperIds = inWrapperCommunities.map(m => const inWrapperIds = inWrapperCommunities.map(m =>
getOpenGroupV2ConversationId(m.baseUrl, m.roomCasePreserved) getOpenGroupV2ConversationId(m.baseUrl, m.roomCasePreserved)

5
ts/session/utils/libsession/libsession_utils_contacts.ts
Unescape Escape View File

@ -57,8 +57,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
const dbApprovedMe = !!foundConvo.get('didApproveMe') || false; const dbApprovedMe = !!foundConvo.get('didApproveMe') || false;
const dbBlocked = !!foundConvo.isBlocked() || false; const dbBlocked = !!foundConvo.isBlocked() || false;
const priority = foundConvo.get('priority') || 0; 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({ const wrapperContact = getContactInfoFromDBValues({
id, id,
@ -71,7 +70,7 @@ async function insertContactFromDBIntoWrapperAndRefresh(id: string): Promise<voi
dbProfileUrl, dbProfileUrl,
priority, priority,
dbCreatedAtSeconds: 0, // just give 0, now() will be used internally by the wrapper if the contact does not exist yet. 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 { try {
window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact)); window.log.debug('inserting into contact wrapper: ', JSON.stringify(wrapperContact));

2
ts/session/utils/libsession/libsession_utils_user_groups.ts
Unescape Escape View File

@ -113,7 +113,7 @@ async function insertGroupsFromDBIntoWrapperAndRefresh(convoId: string): Promise
priority: foundConvo.get('priority'), priority: foundConvo.get('priority'),
members: foundConvo.get('members') || [], members: foundConvo.get('members') || [],
groupAdmins: foundConvo.get('groupAdmins') || [], groupAdmins: foundConvo.get('groupAdmins') || [],
// expireTimer: foundConvo.get('expireTimer'), expireTimer: foundConvo.get('expireTimer'), //FIXME WILL add expirationMode here
displayNameInProfile: foundConvo.get('displayNameInProfile'), displayNameInProfile: foundConvo.get('displayNameInProfile'),
encPubkeyHex: encryptionKeyPair?.publicHex || '', encPubkeyHex: encryptionKeyPair?.publicHex || '',
encSeckeyHex: encryptionKeyPair?.privateHex || '', encSeckeyHex: encryptionKeyPair?.privateHex || '',

8
ts/session/utils/libsession/libsession_utils_user_profile.ts
Unescape Escape View File

@ -26,7 +26,7 @@ async function insertUserProfileIntoWrapper(convoId: string) {
{ url: dbProfileUrl, key: dbProfileKey } { url: dbProfileUrl, key: dbProfileKey }
)} ` )} `
); );
// const expirySeconds = ourConvo.get('expireTimer') || 0; const expirySeconds = ourConvo.get('expireTimer') || 0;
if (dbProfileUrl && !isEmpty(dbProfileKey)) { if (dbProfileUrl && !isEmpty(dbProfileKey)) {
await UserConfigWrapperActions.setUserInfo( await UserConfigWrapperActions.setUserInfo(
dbName, dbName,
@ -34,11 +34,11 @@ async function insertUserProfileIntoWrapper(convoId: string) {
{ {
url: dbProfileUrl, url: dbProfileUrl,
key: dbProfileKey, key: dbProfileKey,
} },
// expirySeconds expirySeconds
); );
} else { } else {
await UserConfigWrapperActions.setUserInfo(dbName, priority, null); // expirySeconds await UserConfigWrapperActions.setUserInfo(dbName, priority, null, expirySeconds);
} }
} }

25
ts/types/sqlSharedTypes.ts
Unescape Escape View File

@ -116,8 +116,8 @@ export function getContactInfoFromDBValues({
dbProfileUrl, dbProfileUrl,
dbProfileKey, dbProfileKey,
dbCreatedAtSeconds, dbCreatedAtSeconds,
}: // expirationTimerSeconds, expirationTimerSeconds, //FIXME WILL add expirationMode here
{ }: {
id: string; id: string;
dbApproved: boolean; dbApproved: boolean;
dbApprovedMe: boolean; dbApprovedMe: boolean;
@ -128,7 +128,7 @@ export function getContactInfoFromDBValues({
dbCreatedAtSeconds: number; dbCreatedAtSeconds: number;
dbProfileUrl: string | undefined; dbProfileUrl: string | undefined;
dbProfileKey: string | undefined; dbProfileKey: string | undefined;
// expirationTimerSeconds: number | undefined; expirationTimerSeconds: number | undefined;
}): ContactInfoSet { }): ContactInfoSet {
const wrapperContact: ContactInfoSet = { const wrapperContact: ContactInfoSet = {
id, id,
@ -139,14 +139,11 @@ export function getContactInfoFromDBValues({
nickname: dbNickname, nickname: dbNickname,
name: dbName, name: dbName,
createdAtSeconds: dbCreatedAtSeconds, createdAtSeconds: dbCreatedAtSeconds,
// expirationTimerSeconds: expirationTimerSeconds:
// !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0 !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
// ? expirationTimerSeconds ? expirationTimerSeconds
// : 0, // TODOLATER add the expiration mode handling : 0,
// expirationMode: expirationMode: 'off', //FIXME WILL add expirationMode here
// !!expirationTimerSeconds && isFinite(expirationTimerSeconds) && expirationTimerSeconds > 0
// ? 'disappearAfterSend'
// : 'off',
}; };
if ( if (
@ -202,14 +199,14 @@ export function getLegacyGroupInfoFromDBValues({
priority, priority,
members: maybeMembers, members: maybeMembers,
displayNameInProfile, displayNameInProfile,
// expireTimer, expireTimer,
encPubkeyHex, encPubkeyHex,
encSeckeyHex, encSeckeyHex,
groupAdmins: maybeAdmins, groupAdmins: maybeAdmins,
lastJoinedTimestamp, lastJoinedTimestamp,
}: Pick< }: Pick<
ConversationAttributes, ConversationAttributes,
'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' //| 'expireTimer' 'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' | 'expireTimer'
> & { > & {
encPubkeyHex: string; encPubkeyHex: string;
encSeckeyHex: string; encSeckeyHex: string;
@ -227,7 +224,7 @@ export function getLegacyGroupInfoFromDBValues({
}); });
const legacyGroup: LegacyGroupInfo = { const legacyGroup: LegacyGroupInfo = {
pubkeyHex: id, pubkeyHex: id,
// disappearingTimerSeconds: !expireTimer ? 0 : expireTimer, disappearingTimerSeconds: !expireTimer ? 0 : expireTimer, //FIXME WILL add expirationMode here
name: displayNameInProfile || '', name: displayNameInProfile || '',
priority: priority || 0, priority: priority || 0,
members: wrappedMembers, members: wrappedMembers,

6
ts/webworker/workers/browser/libsession_worker_interface.ts
Unescape Escape View File

@ -104,8 +104,8 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
setUserInfo: async ( setUserInfo: async (
name: string, name: string,
priority: number, priority: number,
profilePic: { url: string; key: Uint8Array } | null profilePic: { url: string; key: Uint8Array } | null,
// expireSeconds: number expireSeconds: number
) => ) =>
callLibSessionWorker([ callLibSessionWorker([
'UserConfig', 'UserConfig',
@ -113,7 +113,7 @@ export const UserConfigWrapperActions: UserConfigWrapperActionsCalls = {
name, name,
priority, priority,
profilePic, profilePic,
// expireSeconds, expireSeconds,
]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>, ]) as Promise<ReturnType<UserConfigWrapperActionsCalls['setUserInfo']>>,
}; };

6
yarn.lock
Unescape Escape View File

@ -5155,9 +5155,9 @@ levn@~0.3.0:
prelude-ls "~1.1.2" prelude-ls "~1.1.2"
type-check "~0.3.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": "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.1.20" version "0.2.0"
resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.1.20/libsession_util_nodejs-v0.1.20.tar.gz#4ff8331e4efb1725cf8bba0ef1af7496ebd8533d" resolved "https://github.com/oxen-io/libsession-util-nodejs/releases/download/v0.2.0/libsession_util_nodejs-v0.2.0.tar.gz#0019ca2e3296b1e151dcd09923823c271dd2c0a0"
dependencies: dependencies:
cmake-js "^7.2.1" cmake-js "^7.2.1"
node-addon-api "^6.1.0" node-addon-api "^6.1.0"

Write Preview
Loading…
Cancel
Save